diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-09-03 12:05:36 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-09-03 12:07:29 +0300 |
| commit | cc0321896210656ae3731aa44ca896437288d580 (patch) | |
| tree | f6844051b2869d8216bd659b0cd16f3f512a025d /source/blender/editors/interface | |
| parent | 4bfc236d393099a62870e911760c13f1949fb424 (diff) | |
Fix T56659: Flow UI: Checkboxes report wrong width, making layouts jump to multi-columns too soon.
Wrong handling of ideal width when splitting buttons and labels appart
for checkboxes...
Diffstat (limited to 'source/blender/editors/interface')
| -rw-r--r-- | source/blender/editors/interface/interface_layout.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c index dea0e03fea2..86f1e5e158a 100644 --- a/source/blender/editors/interface/interface_layout.c +++ b/source/blender/editors/interface/interface_layout.c @@ -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 |