[[ Bugfix 13278 ]] Fix a button mouse focus issue

Fraser J. Gordon · Fraser J. Gordon · commit 863ece6251cd · 2014-09-16T13:50:21.000+01:00
diff --git a/docs/notes/bugfix-13278.md b/docs/notes/bugfix-13278.md
@@ -0,0 +1,2 @@
+# Fix a button focus issue
+
diff --git a/engine/src/button.cpp b/engine/src/button.cpp
@@ -1511,6 +1511,12 @@ Boolean MCButton::mup(uint2 which, bool p_release)
 		// MW-2011-08-18: [[ Layers ]] Invalidate the whole object.
 		layer_redrawall();
 	}
+    
+    // FG-2014-09-16: [[ Bugfix 13278 ]] Clear the mouse focus if this is not
+    // an auto-arming button (e.g. a button within a menu).
+    if (!(flags & F_AUTO_ARM))
+        state &= ~CS_MFOCUSED;
+    
 	return True;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1511,6 +1511,12 @@ Boolean MCButton::mup(uint2 which, bool p_release)`
`1511`	`1511`	`// MW-2011-08-18: [[ Layers ]] Invalidate the whole object.`
`1512`	`1512`	`layer_redrawall();`
`1513`	`1513`	`}`
	`1514`	`+`
	`1515`	`+ // FG-2014-09-16: [[ Bugfix 13278 ]] Clear the mouse focus if this is not`
	`1516`	`+ // an auto-arming button (e.g. a button within a menu).`
	`1517`	`+ if (!(flags & F_AUTO_ARM))`
	`1518`	`+ state &= ~CS_MFOCUSED;`
	`1519`	`+`
`1514`	`1520`	`return True;`
`1515`	`1521`	`}`
`1516`	`1522`