FIX: issue #2787 (DISABLED and ALL-OVER together)

red · Jun 15, 2017 · d2cade5 · d2cade5
1 parent 81b42bf
commit d2cade5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/modules/view/backends/windows/events.reds b/modules/view/backends/windows/events.reds
@@ -1180,13 +1180,16 @@ process: func [
 
 			evt?: all [hover-saved <> null hover-saved <> new]
 
-			if evt? [
+			if all [evt? IsWindowEnabled hover-saved] [
 				msg/hWnd: hover-saved
 				make-event msg EVT_FLAG_AWAY EVT_OVER
 			]
-			if any [
-				evt?
-				(get-face-flags new) and FACET_FLAGS_ALL_OVER <> 0
+			if all [
+				IsWindowEnabled new
+				any [
+					evt?
+					(get-face-flags new) and FACET_FLAGS_ALL_OVER <> 0
+				]
 			][
 				msg/hWnd: new
 				make-event msg 0 EVT_OVER

diff --git a/modules/view/backends/windows/win32.reds b/modules/view/backends/windows/win32.reds
@@ -1232,6 +1232,10 @@ XFORM!: alias struct! [
 			bEnable		[logic!]
 			return:		[logic!]
 		]
+		IsWindowEnabled: "IsWindowEnabled" [
+			hWnd		[handle!]
+			return:		[logic!]
+		]
 		InvalidateRect: "InvalidateRect" [
 			hWnd		[handle!]
 			lpRect		[RECT_STRUCT]