diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2016-11-02 22:10:30 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-02 22:10:30 +0100 |
commit | 6abe49f88d5d656dfcda81ba2a31d3bee85cfc85 (patch) | |
tree | bf6ea22049b5d1f111c336911d416a8398fdb210 | |
parent | 218c258f2a5137e66e056c1cfe51db40649fb3d6 (diff) | |
parent | 4c9b00b5085c0ab9195842f9a0cf2287d9242bbe (diff) |
Merge pull request #7004 from volzhs/fix-itemlist
Fix to fit stylebox with ItemList
-rw-r--r-- | scene/gui/item_list.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/scene/gui/item_list.cpp b/scene/gui/item_list.cpp index f69ad8fa7e..191627cadb 100644 --- a/scene/gui/item_list.cpp +++ b/scene/gui/item_list.cpp @@ -801,7 +801,10 @@ void ItemList::_notification(int p_what) { Size2 size = get_size(); float page = size.height-bg->get_minimum_size().height; - int width = size.width - mw - bg->get_minimum_size().width; + int width = size.width-bg->get_minimum_size().width; + if (!scroll_bar->is_hidden()){ + width-=mw+bg->get_margin(MARGIN_RIGHT); + } scroll_bar->set_page(page); draw_style_box(bg,Rect2(Point2(),size)); |