UI: add Shift-Drag to multiselect expanded enum items too.
Differential Revision: https://developer.blender.org/D928
This commit is contained in:
parent
aaa02bd490
commit
d7e4944e5b
Notes:
blender-bot
2023-02-14 11:28:39 +01:00
Referenced by issue #43229, Knife Project fails to cut circles into a mesh Referenced by issue #43094, Invalid Collada file crash blender Referenced by issue #42989, Viewing normal map in viewport causes weird colours in UI Referenced by issue #42974, "Not Yet Implemented" Warning in Outliner Referenced by issue #42977, Weights failed to display in Wireframe mode when using Face Select Referenced by issue #42966, Py_Initialize: Unable to get the locale encoding Referenced by issue #42972, Crash when using Lasso select in Graph Editor Referenced by issue #42973, BI Viewport Render Preview Update Issue Referenced by issue #42951, Kinfe tool with Maya preset is not working right Referenced by issue #42936, Bug Referenced by issue #42878, OSL hard crash Referenced by issue #42887, Nvidia GTX 9XX not recognized in Blender (2.73)
|
@ -1721,6 +1721,9 @@ bool ui_but_is_bool(const uiBut *but)
|
|||
if (but->rnaprop && RNA_property_type(but->rnaprop) == PROP_BOOLEAN)
|
||||
return true;
|
||||
|
||||
if ((but->rnaprop && RNA_property_type(but->rnaprop) == PROP_ENUM) && (but->type == UI_BTYPE_ROW))
|
||||
return true;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
|
@ -6353,6 +6353,7 @@ static int ui_do_button(bContext *C, uiBlock *block, uiBut *but, const wmEvent *
|
|||
case UI_BTYPE_TOGGLE_N:
|
||||
case UI_BTYPE_CHECKBOX:
|
||||
case UI_BTYPE_CHECKBOX_N:
|
||||
case UI_BTYPE_ROW:
|
||||
retval = ui_do_but_TOG(C, but, data, event);
|
||||
break;
|
||||
case UI_BTYPE_SCROLL:
|
||||
|
@ -6375,7 +6376,6 @@ static int ui_do_button(bContext *C, uiBlock *block, uiBut *but, const wmEvent *
|
|||
break;
|
||||
case UI_BTYPE_ROUNDBOX:
|
||||
case UI_BTYPE_LABEL:
|
||||
case UI_BTYPE_ROW:
|
||||
case UI_BTYPE_IMAGE:
|
||||
case UI_BTYPE_PROGRESS_BAR:
|
||||
case UI_BTYPE_NODE_SOCKET:
|
||||
|
|
|
@ -362,7 +362,8 @@ ARegion *ui_tooltip_create(bContext *C, ARegion *butregion, uiBut *but)
|
|||
|
||||
/* special case enum rna buttons */
|
||||
if ((but->type & UI_BTYPE_ROW) && but->rnaprop && RNA_property_flag(but->rnaprop) & PROP_ENUM_FLAG) {
|
||||
BLI_strncpy(data->lines[data->totline], IFACE_("(Shift-click to select multiple)"), sizeof(data->lines[0]));
|
||||
BLI_strncpy(data->lines[data->totline], IFACE_("(Shift-Click/Drag to select multiple)"),
|
||||
sizeof(data->lines[0]));
|
||||
|
||||
data->format[data->totline].color_id = UI_TIP_LC_NORMAL;
|
||||
data->totline++;
|
||||
|
|
|
@ -5474,7 +5474,7 @@ void RNA_def_scene(BlenderRNA *brna)
|
|||
RNA_def_property_boolean_sdna(prop, NULL, "lay", 1);
|
||||
RNA_def_property_array(prop, 20);
|
||||
RNA_def_property_boolean_funcs(prop, NULL, "rna_Scene_layer_set");
|
||||
RNA_def_property_ui_text(prop, "Layers", "Visible layers - Shift-Click to select multiple layers");
|
||||
RNA_def_property_ui_text(prop, "Layers", "Visible layers - Shift-Click/Drag to select multiple layers");
|
||||
RNA_def_property_update(prop, NC_SCENE | ND_LAYER, "rna_Scene_layer_update");
|
||||
|
||||
/* active layer */
|
||||
|
|
Loading…
Reference in New Issue