Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksandr Zinovev <roaoao@gmail.com>2017-08-12 11:00:19 +0300
committerAleksandr Zinovev <roaoao@gmail.com>2017-08-12 11:00:19 +0300
commitb5cd89bab96603e70d9e0ca801f9608f636debdc (patch)
tree05ac40749a7db6bdafbdacf867ac5a1d81802cc0 /source/blender/editors/interface
parentccb8e78d6cf44de53e7a49386d2b95636c593894 (diff)
Fix width estimation for buttons with short labels in pie menus
Differential Revision: https://developer.blender.org/D2781 To be backported to 2.79 branch
Diffstat (limited to 'source/blender/editors/interface')
-rw-r--r--source/blender/editors/interface/interface_layout.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c
index b4de3d0c5ef..a95fe59348d 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -3406,8 +3406,9 @@ void ui_layout_add_but(uiLayout *layout, uiBut *but)
ui_item_size((uiItem *)bitem, &w, &h);
/* XXX uiBut hasn't scaled yet
* we can flag the button as not expandable, depending on its size */
- if (w <= 2 * UI_UNIT_X)
+ if (w <= 2 * UI_UNIT_X && (!but->str || but->str[0] == '\0')) {
bitem->item.flag |= UI_ITEM_MIN;
+ }
BLI_addtail(&layout->items, bitem);