blender
/
blender
134
398
Fork 580
Code Issues 6.3k Pull Requests 755 Projects 19 Wiki Activity

Cleanup: avoid looping over areas when refreshing the cursor 

These values are already known, pass in as arguments.
This commit is contained in:
Campbell Barton 2020-02-22 02:13:10 +11:00
parent 4653d253b3
commit 824b2c689e
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
source/blender/editors/screen/screen_edit.c
View File

@ -398,6 +398,20 @@ int screen_area_join(bContext *C, bScreen *scr, ScrArea *sa1, ScrArea *sa2)
/* ****************** EXPORTED API TO OTHER MODULES *************************** */
/* screen sets cursor based on active region */
static void region_cursor_set_ex(wmWindow *win, ScrArea *sa, ARegion *ar, bool swin_changed)
{
BLI_assert(WM_window_get_active_screen(win)->active_region == ar);
if (sa->flag & AREA_FLAG_CURSOR_UPDATE || swin_changed || (ar->type && ar->type->event_cursor)) {
sa->flag &= ~AREA_FLAG_CURSOR_UPDATE;
if (ar->gizmo_map != NULL) {
if (WM_gizmomap_cursor_set(ar->gizmo_map, win)) {
return;
}
}
ED_region_cursor_set(win, sa, ar);
}
}
static void region_cursor_set(wmWindow *win, bool swin_changed)
{
bScreen *screen = WM_window_get_active_screen(win);
@ -406,16 +420,7 @@ static void region_cursor_set(wmWindow *win, bool swin_changed)
{
for (ARegion *ar = sa->regionbase.first; ar; ar = ar->next) {
if (ar == screen->active_region) {
if (swin_changed || (sa->flag & AREA_FLAG_CURSOR_UPDATE) ||
(ar->type && ar->type->event_cursor)) {
sa->flag &= ~AREA_FLAG_CURSOR_UPDATE;
if (ar->gizmo_map != NULL) {
if (WM_gizmomap_cursor_set(ar->gizmo_map, win)) {
return;
}
}
ED_region_cursor_set(win, sa, ar);
}
region_cursor_set_ex(win, sa, ar, swin_changed);
return;
}
}
@ -753,9 +758,10 @@ void ED_screen_set_active_region(bContext *C, wmWindow *win, const int xy[2])
}
else {
/* notifier invokes freeing the buttons... causing a bit too much redraws */
if (old_ar != scr->active_region) {
region_cursor_set(win, true);
const bool swin_changed = (old_ar != scr->active_region);
region_cursor_set_ex(win, sa, scr->active_region, swin_changed);
if (old_ar != scr->active_region) {
/* this used to be a notifier, but needs to be done immediate
* because it can undo setting the right button as active due
* to delayed notifier handling */
@ -763,9 +769,6 @@ void ED_screen_set_active_region(bContext *C, wmWindow *win, const int xy[2])
UI_screen_free_active_but(C, scr);
}
}
else {
region_cursor_set(win, false);
}
}
}
}