griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T56659: Flow UI: Checkboxes report wrong width, making layouts jump to multi-columns too soon.

Browse Source 
Wrong handling of ideal width when splitting buttons and labels appart
for checkboxes...
This commit is contained in:
Bastien Montagne
2018-09-03 11:05:36 +02:00
parent 4bfc236d39
commit cc03218962
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/editors/interface/interface_layout.c
View File

@@ -1647,7 +1647,6 @@ void uiItemFullR(uiLayout *layout, PointerRNA *ptr, PropertyRNA *prop, int index
uiLayout *layout_split;
#ifdef UI_PROP_SEP_ICON_WIDTH_EXCEPTION
if (type == PROP_BOOLEAN && (icon == ICON_NONE) && !icon_only) {
w = UI_UNIT_X;
layout_split = uiLayoutRow(layout_row ? layout_row : layout, true);
}
else
@@ -1702,6 +1701,12 @@ void uiItemFullR(uiLayout *layout, PointerRNA *ptr, PropertyRNA *prop, int index
else {
name = "";
}
#ifdef UI_PROP_SEP_ICON_WIDTH_EXCEPTION
if (type == PROP_BOOLEAN && (icon == ICON_NONE) && !icon_only) {
w = UI_UNIT_X;
}
#endif /* UI_PROP_SEP_ICON_WIDTH_EXCEPTION */
}
#ifdef UI_PROP_DECORATE