From 1c76b22ba0d96d2d8cc74402e22b54367f461b41 Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Fri, 2 Apr 2010 05:46:05 +0000
Subject: [PATCH] Fix [#21868] Header flickering when mouse moves over region
 borders

Patch by Elia Sarti, thanks!
---
 source/blender/editors/screen/screen_edit.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c
index 435201f506e..d8531d0b4e9 100644
--- a/source/blender/editors/screen/screen_edit.c
+++ b/source/blender/editors/screen/screen_edit.c
@@ -1232,11 +1232,17 @@ void ED_screen_set_subwinactive(wmWindow *win, wmEvent *event)
 
 int ED_screen_area_active(const bContext *C)
 {
+	wmWindow *win= CTX_wm_window(C);
 	bScreen *sc= CTX_wm_screen(C);
 	ScrArea *sa= CTX_wm_area(C);
 
-	if(sc && sa) {
+	if(win && sc && sa) {
+		AZone *az= is_in_area_actionzone(sa, win->eventstate->x, win->eventstate->y);
 		ARegion *ar;
+		
+		if (az && az->type == AZONE_REGION)
+			return 1;
+		
 		for(ar= sa->regionbase.first; ar; ar= ar->next)
 			if(ar->swinid == sc->subwinactive)
 				return 1;