diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-11-09 20:41:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-09 20:41:34 +0100 |
| commit | 3aeb43f14c4c25cddd438ff05c909d993177a277 (patch) | |
| tree | 3768b21c203cd7903f3bc994c87d9c94c23b20ef /scene | |
| parent | 78f7cca69e95d266bd77a38edeaca4c6ca19e26b (diff) | |
| parent | 0c79bbeea3df1a4cfc3483dd5b949635b8f28420 (diff) | |
Merge pull request #33495 from nekomatata/button-icon-override-crash
Fixed crash when using icon override in button
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/gui/button.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scene/gui/button.cpp b/scene/gui/button.cpp index 6b3e89af6c..23f2caa9fb 100644 --- a/scene/gui/button.cpp +++ b/scene/gui/button.cpp @@ -174,17 +174,17 @@ void Button::_notification(int p_what) { _size.width -= get_constant("hseparation") + icon_ofs_region; if (!clip_text) _size.width -= get_font("font")->get_string_size(xl_text).width; - float icon_width = icon->get_width() * _size.height / icon->get_height(); + float icon_width = _icon->get_width() * _size.height / _icon->get_height(); float icon_height = _size.height; if (icon_width > _size.width) { icon_width = _size.width; - icon_height = icon->get_height() * icon_width / icon->get_width(); + icon_height = icon->get_height() * icon_width / _icon->get_width(); } icon_region = Rect2(style->get_offset() + Point2(icon_ofs_region, (_size.height - icon_height) / 2), Size2(icon_width, icon_height)); } else { - icon_region = Rect2(style->get_offset() + Point2(icon_ofs_region, Math::floor((valign - _icon->get_height()) / 2.0)), icon->get_size()); + icon_region = Rect2(style->get_offset() + Point2(icon_ofs_region, Math::floor((valign - _icon->get_height()) / 2.0)), _icon->get_size()); } } @@ -221,7 +221,7 @@ void Button::_notification(int p_what) { font->draw(ci, text_ofs.floor(), xl_text, color, clip_text ? text_clip : -1); if (!_icon.is_null() && icon_region.size.width > 0) { - draw_texture_rect_region(_icon, icon_region, Rect2(Point2(), icon->get_size()), color_icon); + draw_texture_rect_region(_icon, icon_region, Rect2(Point2(), _icon->get_size()), color_icon); } } break; } |