[Bf-blender-cvs] [5cad6afac66] master: Cleanup: rename is_in_area_actionzone

[Campbell Barton]

Commit: 5cad6afac663b05819f5e5a887ec31515a2cf16c
Author: Campbell Barton
Date:   Wed Jun 20 13:52:56 2018 +0200
Branches: master
https://developer.blender.org/rB5cad6afac663b05819f5e5a887ec31515a2cf16c

Cleanup: rename is_in_area_actionzone

===================================================================

M	source/blender/editors/screen/screen_edit.c
M	source/blender/editors/screen/screen_intern.h
M	source/blender/editors/screen/screen_ops.c

===================================================================

diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c
index 0e32ec3c34f..615f47e51c3 100644
--- a/source/blender/editors/screen/screen_edit.c
+++ b/source/blender/editors/screen/screen_edit.c
@@ -1063,7 +1063,7 @@ static void screen_cursor_set(wmWindow *win, const wmEvent *event)
 	ScrArea *sa;
 
 	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;
 
 	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) {
 			if (event->x > sa->totrct.xmin && event->x < sa->totrct.xmax)
 				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;
 		}
 		if (sa) {
@@ -1166,7 +1166,7 @@ int ED_screen_area_active(const bContext *C)
 	ScrArea *sa = CTX_wm_area(C);
 
 	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;
 
 		if (az && az->type == AZONE_REGION)
diff --git a/source/blender/editors/screen/screen_intern.h b/source/blender/editors/screen/screen_intern.h
index 436fa9bcd05..cd12f30c3bb 100644
--- a/source/blender/editors/screen/screen_intern.h
+++ b/source/blender/editors/screen/screen_intern.h
@@ -61,7 +61,7 @@ ScrEdge    *screen_find_active_scredge(bScreen *sc,
                                        const int winsize_x, const int winsize_y,
                                        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 */
 int ed_screen_context(
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index e76ef3faa59..d1510f60517 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -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);
 }
 
-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;
 
@@ -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)
 {
 	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;
 
 	/* quick escape */
@@ -817,7 +817,7 @@ static int actionzone_modal(bContext *C, wmOperator *op, const wmEvent *event)
 			if (sad->az->type == AZONE_AREA) {
 				/* once we drag outside the actionzone, register a gesture
 				 * 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));
 			}
 			else {