diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-03-03 13:10:06 +0100 |
|---|---|---|
| committer | Yuri Sizov <yuris@humnom.net> | 2023-03-14 13:59:02 +0100 |
| commit | 7e74568709532181be3e803d64d22b8a03a45a9a (patch) | |
| tree | ae85c64d5945ee9319bcca212d6fda56a38f6c0c /scene | |
| parent | 278fc7538dbd98ff0e06410d69adca49b5326b21 (diff) | |
FBX: Disable importer when canceling FBX2glTF setup
Pretty hacky solution but it's better than an infinite loop.
All this import setup needs to be redone, it's very difficult to properly
bail out from an invalid import without triggering reimport loops.
Also fix underline not visible at default editor scale in LinkButton.
Fixes #73319.
(cherry picked from commit d81e6ee024a8c64b80ac25c96b33c749ba1db79d)
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/gui/link_button.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scene/gui/link_button.cpp b/scene/gui/link_button.cpp index e6c3ca3b5f..b579791990 100644 --- a/scene/gui/link_button.cpp +++ b/scene/gui/link_button.cpp @@ -243,11 +243,12 @@ void LinkButton::_notification(int p_what) { if (do_underline) { int underline_spacing = theme_cache.underline_spacing + text_buf->get_line_underline_position(); int y = text_buf->get_line_ascent() + underline_spacing; + int underline_thickness = MAX(1, text_buf->get_line_underline_thickness()); if (is_layout_rtl()) { - draw_line(Vector2(size.width - width, y), Vector2(size.width, y), color, text_buf->get_line_underline_thickness()); + draw_line(Vector2(size.width - width, y), Vector2(size.width, y), color, underline_thickness); } else { - draw_line(Vector2(0, y), Vector2(width, y), color, text_buf->get_line_underline_thickness()); + draw_line(Vector2(0, y), Vector2(width, y), color, underline_thickness); } } } break; |