Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: rename is_in_area_actionzone

Browse Source
This commit is contained in:
Campbell Barton
2018-06-20 13:52:56 +02:00
parent daaf315bf2
commit 5cad6afac6
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1063,7 +1063,7 @@ static void screen_cursor_set(wmWindow *win, const wmEvent *event)
ScrArea *sa; ScrArea *sa;
for (sa = win->screen->areabase.first; sa; sa = sa->next) for (sa = win->screen->areabase.first; sa; sa = sa->next)
if ((az = is_in_area_actionzone(sa, &event->x))) if ((az = ED_area_actionzone_find_xy(sa, &event->x)))
break; break;
if (sa) { if (sa) {
@@ -1106,7 +1106,7 @@ void ED_screen_set_subwinactive(bContext *C, const wmEvent *event)
for (sa = scr->areabase.first; sa; sa = sa->next) { for (sa = scr->areabase.first; sa; sa = sa->next) {
if (event->x > sa->totrct.xmin && event->x < sa->totrct.xmax) if (event->x > sa->totrct.xmin && event->x < sa->totrct.xmax)
if (event->y > sa->totrct.ymin && event->y < sa->totrct.ymax) if (event->y > sa->totrct.ymin && event->y < sa->totrct.ymax)
if (NULL == is_in_area_actionzone(sa, &event->x)) if (NULL == ED_area_actionzone_find_xy(sa, &event->x))
break; break;
} }
if (sa) { if (sa) {
@@ -1166,7 +1166,7 @@ int ED_screen_area_active(const bContext *C)
ScrArea *sa = CTX_wm_area(C); ScrArea *sa = CTX_wm_area(C);
if (win && sc && sa) { if (win && sc && sa) {
AZone *az = is_in_area_actionzone(sa, &win->eventstate->x); AZone *az = ED_area_actionzone_find_xy(sa, &win->eventstate->x);
ARegion *ar; ARegion *ar;
if (az && az->type == AZONE_REGION) if (az && az->type == AZONE_REGION)

2
source/blender/editors/screen/screen_intern.h
View File

@@ -61,7 +61,7 @@ ScrEdge *screen_find_active_scredge(bScreen *sc,
const int winsize_x, const int winsize_y, const int winsize_x, const int winsize_y,
const int mx, const int my); const int mx, const int my);
struct AZone *is_in_area_actionzone(ScrArea *sa, const int xy[2]); struct AZone *ED_area_actionzone_find_xy(ScrArea *sa, const int xy[2]);
/* screen_context.c */ /* screen_context.c */
int ed_screen_context( int ed_screen_context(

6
source/blender/editors/screen/screen_ops.c
View File

@@ -665,7 +665,7 @@ static void fullscreen_click_rcti_init(rcti *rect, const short x1, const short y
BLI_rcti_init(rect, x, x + icon_size, y, y + icon_size); BLI_rcti_init(rect, x, x + icon_size, y, y + icon_size);
} }
AZone *is_in_area_actionzone(ScrArea *sa, const int xy[2]) AZone *ED_area_actionzone_find_xy(ScrArea *sa, const int xy[2])
{ {
AZone *az = NULL; AZone *az = NULL;
@@ -760,7 +760,7 @@ static void actionzone_apply(bContext *C, wmOperator *op, int type)
static int actionzone_invoke(bContext *C, wmOperator *op, const wmEvent *event) static int actionzone_invoke(bContext *C, wmOperator *op, const wmEvent *event)
{ {
ScrArea *sa = CTX_wm_area(C); ScrArea *sa = CTX_wm_area(C);
AZone *az = is_in_area_actionzone(sa, &event->x); AZone *az = ED_area_actionzone_find_xy(sa, &event->x);
sActionzoneData *sad; sActionzoneData *sad;
/* quick escape */ /* quick escape */
@@ -817,7 +817,7 @@ static int actionzone_modal(bContext *C, wmOperator *op, const wmEvent *event)
if (sad->az->type == AZONE_AREA) { if (sad->az->type == AZONE_AREA) {
/* once we drag outside the actionzone, register a gesture /* once we drag outside the actionzone, register a gesture
* check we're not on an edge so join finds the other area */ * check we're not on an edge so join finds the other area */
is_gesture = ((is_in_area_actionzone(sad->sa1, &event->x) != sad->az) && is_gesture = ((ED_area_actionzone_find_xy(sad->sa1, &event->x) != sad->az) &&
(screen_find_active_scredge(sc, winsize_x, winsize_y, event->x, event->y) == NULL)); (screen_find_active_scredge(sc, winsize_x, winsize_y, event->x, event->y) == NULL));
} }
else { else {