diff options
| author | Ruslan Mustakov <r.mustakov@gmail.com> | 2018-03-19 20:48:43 +0700 |
|---|---|---|
| committer | Ruslan Mustakov <r.mustakov@gmail.com> | 2018-05-08 19:01:15 +0700 |
| commit | 863dd9aa46aff502f7425ea6045de93bf09b76a3 (patch) | |
| tree | 2019d31d5035683896d7b0436e3dd6f51b095c8e /scene/gui | |
| parent | 5cd12f6649387f91d08fd17bf3c70e732798ab58 (diff) | |
Always emit dynamic font change in update_oversampling
Fixes #15787.
The issue occurred when two (or more) separate DynamicFont instances
used the same DynamicFontAtSize instance due to having equal
properties. The first instance updated its data_at_size and emitted
"changed" signal, but the second did not because it considered the
data_at_size to be up to date, even though it has just been updated.
Diffstat (limited to 'scene/gui')
| -rw-r--r-- | scene/gui/label.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/gui/label.cpp b/scene/gui/label.cpp index f74c2372c9..f1b0d36f32 100644 --- a/scene/gui/label.cpp +++ b/scene/gui/label.cpp @@ -93,7 +93,7 @@ void Label::_notification(int p_what) { bool use_outline = get_constant("shadow_as_outline"); Point2 shadow_ofs(get_constant("shadow_offset_x"), get_constant("shadow_offset_y")); int line_spacing = get_constant("line_spacing"); - Color font_outline_modulator = get_color("font_outline_modulator"); + Color font_outline_modulate = get_color("font_outline_modulate"); style->draw(ci, Rect2(Point2(0, 0), get_size())); @@ -151,7 +151,7 @@ void Label::_notification(int p_what) { int line = 0; int line_to = lines_skipped + (lines_visible > 0 ? lines_visible : 1); - FontDrawer drawer(font, font_outline_modulator); + FontDrawer drawer(font, font_outline_modulate); while (wc) { /* handle lines not meant to be drawn quickly */ if (line >= line_to) |