diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2013-05-12 17:16:11 +0400 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2013-05-12 17:16:11 +0400 |
commit | 127c39b8a44df962b1ac20578497b387319efe87 (patch) | |
tree | 7f928e590060350708d4160b1637994ca758c025 /source/blender/editors/interface/interface_regions.c | |
parent | 5fcf9b1d2fe94798178beeea8e31f54faac31414 (diff) |
Fix for [#35224] Transform Orientation - order inconsistency
Fix turned out to remove as much "manual UI" from 3D view header as possible. Mode selector and all transform manipulators/orientations stuff are now RNA-based UI (leaving basically only edit mesh select modes with custom handlers, as they have some quite specific features).
To achieve this, four main modifications were done:
* enum-operator-generated menus are now MENU (i.e. dropdown lists) in headers too.
* All bit-flag enums expanded in ROW buttons now have a handling consistent with e.g. layers, or what we already have for transform manipulators, i.e. clicking select only one element, shift-click to select multiple ones.
* Consequently, the three RNA booleans manipulators flags are merged into a single bit-flag enum (yes, this is also an API change, though I doubt many scripts use it).
* Now the width of enum-based dropdown lists is computed from longest item name in enum, no more from a dummy place holder string (when no label/name is given).
All this allows to remove some code from 3DView/transform areas, that was actually mostly duplicating RNA/operator one.
Also done a few optimizations here and there (among others, do not pass &numitems to RNA_property_enum_items() when you do not need it, saves at least an iteration over enum items to count them).
Many thanks to Brecht for the reviews!
Diffstat (limited to 'source/blender/editors/interface/interface_regions.c')
-rw-r--r-- | source/blender/editors/interface/interface_regions.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c index 887f1cb32ad..a5f96f98949 100644 --- a/source/blender/editors/interface/interface_regions.c +++ b/source/blender/editors/interface/interface_regions.c @@ -447,7 +447,14 @@ ARegion *ui_tooltip_create(bContext *C, ARegion *butregion, uiBut *but) /* Tip */ if (but_tip.strinfo) { - BLI_strncpy(data->lines[data->totline], but_tip.strinfo, sizeof(data->lines[0])); + /* Expanded Bit-flag enums have a specific way to select multiple... */ + if ((but->type & ROW) && but->rnaprop && RNA_property_flag(but->rnaprop) & PROP_ENUM_FLAG) { + BLI_snprintf(data->lines[data->totline], sizeof(data->lines[0]), + "%s %s", but_tip.strinfo, IFACE_("(Shift-click to select multiple)")); + } + else { + BLI_strncpy(data->lines[data->totline], but_tip.strinfo, sizeof(data->lines[0])); + } data->color_id[data->totline] = UI_TIP_LC_MAIN; data->totline++; } |