blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

Outliner: Use operator option to decide which item to rename 

The `outliner.item_rename` operator needs to decide if it should rename the
active or the hovered item. Previously it checked if the event is a press
event, which is a hacky way of doing this and limit how the operator can be
used in the keymap.
Now use a operator option to let this be controlled on the keymap level.

Doesn't change any default behavior.
This commit is contained in:
Julian Eisel 2020-10-15 21:11:31 +02:00
parent 0a66436fe5
commit e936f04258
Notes: blender-bot 2023-02-14 10:21:10 +01:00 
Referenced by commit f40294b2d6, Fix syntax error in IC-Keymap
3 changed files with 43 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
release/scripts/presets/keyconfig/keymap_data/blender_default.py
View File

@ -773,7 +773,8 @@ def km_outliner(params):
items.extend([
("outliner.highlight_update", {"type": 'MOUSEMOVE', "value": 'ANY', "any": True}, None),
("outliner.item_rename", {"type": 'LEFTMOUSE', "value": 'DOUBLE_CLICK'}, None),
("outliner.item_rename", {"type": 'F2', "value": 'PRESS'}, None),
("outliner.item_rename", {"type": 'F2', "value": 'PRESS'},
{"properties": [("use_active", True)]}),
("outliner.item_activate", {"type": 'LEFTMOUSE', "value": 'CLICK'},
{"properties": [("extend", False), ("deselect_all", not params.legacy)]}),
("outliner.item_activate", {"type": 'LEFTMOUSE', "value": 'CLICK', "ctrl": True},

1
release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py
View File

@ -463,6 +463,7 @@ def km_outliner(params):
items.extend([
("outliner.item_rename", {"type": 'LEFTMOUSE', "value": 'DOUBLE_CLICK'}, None),
("outliner.item_rename", {"type": 'RET', "value": 'PRESS'}, None),
{"properties": [("use_active", True)]}),
("wm.search_menu", {"type": 'TAB', "value": 'PRESS'}, None),
("outliner.highlight_update", {"type": 'MOUSEMOVE', "value": 'ANY', "any": True}, None),
("outliner.item_activate", {"type": 'LEFTMOUSE', "value": 'CLICK'},

61
source/blender/editors/space_outliner/outliner_edit.c
View File

@ -363,34 +363,47 @@ void item_rename_fn(bContext *C,
do_item_rename(region, te, tselem, reports);
}
static TreeElement *outliner_item_rename_find_active(const SpaceOutliner *space_outliner,
ReportList *reports)
{
TreeElement *active_element = outliner_find_element_with_flag(&space_outliner->tree, TSE_ACTIVE);
if (!active_element) {
BKE_report(reports, RPT_WARNING, "No active item to rename");
return NULL;
}
return active_element;
}
static TreeElement *outliner_item_rename_find_hovered(const SpaceOutliner *space_outliner,
ARegion *region,
const wmEvent *event)
{
float fmval[2];
UI_view2d_region_to_view(&region->v2d, event->mval[0], event->mval[1], &fmval[0], &fmval[1]);
TreeElement *hovered = outliner_find_item_at_y(space_outliner, &space_outliner->tree, fmval[1]);
if (hovered && outliner_item_is_co_over_name(hovered, fmval[0])) {
return hovered;
}
return NULL;
}
static int outliner_item_rename(bContext *C, wmOperator *op, const wmEvent *event)
{
ARegion *region = CTX_wm_region(C);
SpaceOutliner *space_outliner = CTX_wm_space_outliner(C);
float fmval[2];
const bool use_active = RNA_boolean_get(op->ptr, "use_active");
/* Rename active element if key pressed, otherwise rename element at cursor coordinates */
if (event->val == KM_PRESS) {
TreeElement *active_element = outliner_find_element_with_flag(&space_outliner->tree,
TSE_ACTIVE);
if (active_element) {
do_item_rename(region, active_element, TREESTORE(active_element), op->reports);
}
else {
BKE_report(op->reports, RPT_WARNING, "No active item to rename");
}
TreeElement *te = use_active ? outliner_item_rename_find_active(space_outliner, op->reports) :
outliner_item_rename_find_hovered(space_outliner, region, event);
if (!te) {
return OPERATOR_CANCELLED;
}
else {
UI_view2d_region_to_view(&region->v2d, event->mval[0], event->mval[1], &fmval[0], &fmval[1]);
TreeElement *hovered = outliner_find_item_at_y(
space_outliner, &space_outliner->tree, fmval[1]);
if (hovered && outliner_item_is_co_over_name(hovered, fmval[0])) {
do_item_rename(region, hovered, TREESTORE(hovered), op->reports);
}
}
do_item_rename(region, te, TREESTORE(te), op->reports);
return OPERATOR_FINISHED;
}
@ -407,6 +420,12 @@ void OUTLINER_OT_item_rename(wmOperatorType *ot)
/* Flags. */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
RNA_def_boolean(ot->srna,
"use_active",
false,
"Use Active",
"Rename the active item, rather than the one the mouse is over");
}
/** \} */