summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2022-08-22 17:37:38 +0200
committerGitHub <noreply@github.com>2022-08-22 17:37:38 +0200
commit99548e521dc049b609347cd1fe38262d59d1b0d6 (patch)
treec093d1021b2df3e13ee2b734b68a575f5e95a3bd
parent43ff5dd890fa647ac3e91a30a2a2198cb40db34a (diff)
parente298144a41338d80b5f0090ce8f28aef888c13dd (diff)
Merge pull request #64711 from YeldhamDev/itemlist_scroll_fix
-rw-r--r--scene/gui/item_list.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/scene/gui/item_list.cpp b/scene/gui/item_list.cpp
index d0a25972f8..e3e9499705 100644
--- a/scene/gui/item_list.cpp
+++ b/scene/gui/item_list.cpp
@@ -932,11 +932,7 @@ void ItemList::_notification(int p_what) {
scroll_bar->set_anchor_and_offset(SIDE_BOTTOM, ANCHOR_END, -bg->get_margin(SIDE_BOTTOM));
Size2 size = get_size();
-
int width = size.width - bg->get_minimum_size().width;
- if (scroll_bar->is_visible()) {
- width -= mw;
- }
draw_style_box(bg, Rect2(Point2(), size));
@@ -1095,6 +1091,10 @@ void ItemList::_notification(int p_what) {
shape_changed = false;
}
+ if (scroll_bar->is_visible()) {
+ width -= mw;
+ }
+
//ensure_selected_visible needs to be checked before we draw the list.
if (ensure_selected_visible && current >= 0 && current < items.size()) {
Rect2 r = items[current].rect_cache;