godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix ItemList selection visual when the scrollbar visibility changes

Browse Source 
(cherry picked from commit e298144a41)
This commit is contained in:
Michael Alexsander 2022-08-21 22:10:41 -03:00 committed by Rémi Verschelde
parent 6a6d595286
commit 08844b6143
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scene/gui/item_list.cpp
View File

@ -754,11 +754,7 @@ void ItemList::_notification(int p_what) {
scroll_bar->set_anchor_and_margin(MARGIN_BOTTOM, ANCHOR_END, -bg->get_margin(MARGIN_BOTTOM)); scroll_bar->set_anchor_and_margin(MARGIN_BOTTOM, ANCHOR_END, -bg->get_margin(MARGIN_BOTTOM));
Size2 size = get_size(); Size2 size = get_size();
int width = size.width - bg->get_minimum_size().width; int width = size.width - bg->get_minimum_size().width;
if (scroll_bar->is_visible()) {
width -= mw;
}
draw_style_box(bg, Rect2(Point2(), size)); draw_style_box(bg, Rect2(Point2(), size));
@ -917,6 +913,10 @@ void ItemList::_notification(int p_what) {
shape_changed = false; shape_changed = false;
} }
if (scroll_bar->is_visible()) {
width -= mw;
}
//ensure_selected_visible needs to be checked before we draw the list. //ensure_selected_visible needs to be checked before we draw the list.
if (ensure_selected_visible && current >= 0 && current < items.size()) { if (ensure_selected_visible && current >= 0 && current < items.size()) {
Rect2 r = items[current].rect_cache; Rect2 r = items[current].rect_cache;