blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 756 Projects 19 Wiki Activity

Cleanup: Refactor lookup for hovered Outliner element for renaming 

* Use existing and optimized lookup function, rather than own duplicated logic.
* Move low-level coordinate check into general function, alongside similar
  ones.
This commit is contained in:
Julian Eisel 2020-10-15 20:23:13 +02:00
parent 5129e2e042
commit d4f94d8a31
3 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -363,25 +363,6 @@ void item_rename_fn(bContext *C,
do_item_rename(region, te, tselem, reports);
}
static void do_outliner_item_rename(ReportList *reports,
ARegion *region,
TreeElement *te,
const float mval[2])
{
if (mval[1] > te->ys && mval[1] < te->ys + UI_UNIT_Y) {
TreeStoreElem *tselem = TREESTORE(te);
/* click on name */
if (mval[0] > te->xs + UI_UNIT_X * 2 && mval[0] < te->xend) {
do_item_rename(region, te, tselem, reports);
}
}
LISTBASE_FOREACH (TreeElement *, te_child, &te->subtree) {
do_outliner_item_rename(reports, region, te_child, mval);
}
}
static int outliner_item_rename(bContext *C, wmOperator *op, const wmEvent *event)
{
ARegion *region = CTX_wm_region(C);
@ -403,8 +384,11 @@ static int outliner_item_rename(bContext *C, wmOperator *op, const wmEvent *even
else {
UI_view2d_region_to_view(&region->v2d, event->mval[0], event->mval[1], &fmval[0], &fmval[1]);
LISTBASE_FOREACH (TreeElement *, te, &space_outliner->tree) {
do_outliner_item_rename(op->reports, region, te, fmval);
TreeElement *hovered = outliner_find_item_at_y(
space_outliner, &space_outliner->tree, fmval[1]);
if (outliner_item_is_co_over_name(hovered, fmval[0])) {
do_item_rename(region, hovered, TREESTORE(hovered), op->reports);
}
}

1
source/blender/editors/space_outliner/outliner_intern.h
View File

@ -286,6 +286,7 @@ void outliner_item_select(struct bContext *C,
const short select_flag);
bool outliner_item_is_co_over_name_icons(const TreeElement *te, float view_co_x);
bool outliner_item_is_co_over_name(const TreeElement *te, float view_co_x);
bool outliner_item_is_co_within_close_toggle(const TreeElement *te, float view_co_x);
bool outliner_is_co_within_mode_column(SpaceOutliner *space_outliner, const float view_mval[2]);

6
source/blender/editors/space_outliner/outliner_utils.c
View File

@ -429,6 +429,12 @@ bool outliner_item_is_co_over_name_icons(const TreeElement *te, float view_co_x)
return outside_left && (view_co_x < te->xend);
}
/* Find if x coordinate is over element name. */
bool outliner_item_is_co_over_name(const TreeElement *te, float view_co_x)
{
return (view_co_x > (te->xs + UI_UNIT_X * 2)) && (view_co_x < te->xend);
}
/* Find if x coordinate is over element disclosure toggle */
bool outliner_item_is_co_within_close_toggle(const TreeElement *te, float view_co_x)
{