diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2020-07-10 21:04:23 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-10 21:04:23 +0200 |
commit | dcd11faad3802679a43b27155f1b6bc59aa39b60 (patch) | |
tree | b91a7bcb89881e80a105710cd274993c98378029 /scene/resources/font.h | |
parent | 4d2e50eca6f661c0cfb84a2f0b9c9ccd701a9576 (diff) | |
parent | 26fcf2b04ca48566cee6cf32a2a40e8ea1e40eb4 (diff) | |
download | redot-engine-dcd11faad3802679a43b27155f1b6bc59aa39b60.tar.gz |
Merge pull request #40253 from madmiraal/add-override-keywords
Add override keywords.
Diffstat (limited to 'scene/resources/font.h')
-rw-r--r-- | scene/resources/font.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/scene/resources/font.h b/scene/resources/font.h index 14312308bb..e6b296800b 100644 --- a/scene/resources/font.h +++ b/scene/resources/font.h @@ -160,13 +160,13 @@ public: Error create_from_fnt(const String &p_file); void set_height(float p_height); - float get_height() const; + float get_height() const override; void set_ascent(float p_ascent); - float get_ascent() const; - float get_descent() const; - float get_underline_position() const; - float get_underline_thickness() const; + float get_ascent() const override; + float get_descent() const override; + float get_underline_position() const override; + float get_underline_thickness() const override; void add_texture(const Ref<Texture2D> &p_texture); void add_char(CharType p_char, int p_texture_idx, const Rect2 &p_rect, const Size2 &p_align, float p_advance = -1); @@ -182,7 +182,7 @@ public: int get_kerning_pair(CharType p_A, CharType p_B) const; Vector<KerningPairKey> get_kerning_pair_keys() const; - Size2 get_char_size(CharType p_char, CharType p_next = 0) const; + Size2 get_char_size(CharType p_char, CharType p_next = 0) const override; void set_fallback(const Ref<BitmapFont> &p_fallback); Ref<BitmapFont> get_fallback() const; @@ -190,9 +190,9 @@ public: void clear(); void set_distance_field_hint(bool p_distance_field); - bool is_distance_field_hint() const; + bool is_distance_field_hint() const override; - float draw_char(RID p_canvas_item, const Point2 &p_pos, CharType p_char, CharType p_next = 0, const Color &p_modulate = Color(1, 1, 1), bool p_outline = false) const; + float draw_char(RID p_canvas_item, const Point2 &p_pos, CharType p_char, CharType p_next = 0, const Color &p_modulate = Color(1, 1, 1), bool p_outline = false) const override; BitmapFont(); ~BitmapFont(); |