summaryrefslogtreecommitdiff
path: root/SharedGraphics/Font.h
diff options
context:
space:
mode:
authorAndreas Kling <awesomekling@gmail.com>2019-07-03 21:17:35 +0200
committerAndreas Kling <awesomekling@gmail.com>2019-07-03 21:20:13 +0200
commit27f699ef0c8c2dce0f1dff19eef25f02e3da397e (patch)
tree52f95be1d05ba2a621d3bb8ac9129341f8d9973b /SharedGraphics/Font.h
parentc4c4bbc5ba5119e9ccc8ded948b26e7c4851a909 (diff)
downloadserenity-27f699ef0c8c2dce0f1dff19eef25f02e3da397e.zip
AK: Rename the common integer typedefs to make it obvious what they are.
These types can be picked up by including <AK/Types.h>: * u8, u16, u32, u64 (unsigned) * i8, i16, i32, i64 (signed)
Diffstat (limited to 'SharedGraphics/Font.h')
-rw-r--r--SharedGraphics/Font.h30
1 files changed, 15 insertions, 15 deletions
diff --git a/SharedGraphics/Font.h b/SharedGraphics/Font.h
index a63b035b8b..83ae396dcb 100644
--- a/SharedGraphics/Font.h
+++ b/SharedGraphics/Font.h
@@ -54,13 +54,13 @@ public:
~Font();
- GlyphBitmap glyph_bitmap(char ch) const { return GlyphBitmap(&m_rows[(byte)ch * m_glyph_height], { glyph_width(ch), m_glyph_height }); }
+ GlyphBitmap glyph_bitmap(char ch) const { return GlyphBitmap(&m_rows[(u8)ch * m_glyph_height], { glyph_width(ch), m_glyph_height }); }
- byte glyph_width(char ch) const { return m_fixed_width ? m_glyph_width : m_glyph_widths[(byte)ch]; }
- byte glyph_height() const { return m_glyph_height; }
- byte min_glyph_width() const { return m_min_glyph_width; }
- byte max_glyph_width() const { return m_max_glyph_width; }
- byte glyph_spacing() const { return m_fixed_width ? 0 : 1; }
+ u8 glyph_width(char ch) const { return m_fixed_width ? m_glyph_width : m_glyph_widths[(u8)ch]; }
+ u8 glyph_height() const { return m_glyph_height; }
+ u8 min_glyph_width() const { return m_min_glyph_width; }
+ u8 max_glyph_width() const { return m_max_glyph_width; }
+ u8 glyph_spacing() const { return m_fixed_width ? 0 : 1; }
int width(const StringView& string) const;
String name() const { return m_name; }
@@ -69,27 +69,27 @@ public:
bool is_fixed_width() const { return m_fixed_width; }
void set_fixed_width(bool b) { m_fixed_width = b; }
- void set_glyph_width(char ch, byte width)
+ void set_glyph_width(char ch, u8 width)
{
ASSERT(m_glyph_widths);
- m_glyph_widths[(byte)ch] = width;
+ m_glyph_widths[(u8)ch] = width;
}
private:
- Font(const StringView& name, unsigned* rows, byte* widths, bool is_fixed_width, byte glyph_width, byte glyph_height);
+ Font(const StringView& name, unsigned* rows, u8* widths, bool is_fixed_width, u8 glyph_width, u8 glyph_height);
- static RefPtr<Font> load_from_memory(const byte*);
+ static RefPtr<Font> load_from_memory(const u8*);
String m_name;
unsigned* m_rows { nullptr };
- byte* m_glyph_widths { nullptr };
+ u8* m_glyph_widths { nullptr };
MappedFile m_mapped_file;
- byte m_glyph_width { 0 };
- byte m_glyph_height { 0 };
- byte m_min_glyph_width { 0 };
- byte m_max_glyph_width { 0 };
+ u8 m_glyph_width { 0 };
+ u8 m_glyph_height { 0 };
+ u8 m_min_glyph_width { 0 };
+ u8 m_max_glyph_width { 0 };
bool m_fixed_width { false };
};