Merge pull request livecode#3536 from livecodefraser/bugfix-2670

livecodefraser · livecodefraser · commit 1ee6450604ae · 2016-01-29T15:51:21.000Z
Fix highlight on menu items on Linux
diff --git a/docs/notes/bugfix-2670.md b/docs/notes/bugfix-2670.md
@@ -0,0 +1,2 @@
+# Fix strange menu item highlight on Linux
+
diff --git a/engine/src/button.cpp b/engine/src/button.cpp
@@ -1074,7 +1074,7 @@ void MCButton::munfocus()
 {
 	if (entry != NULL)
 		entry->munfocus();
-	if (flags & F_AUTO_ARM && state & CS_ARMED)
+	if (flags & F_AUTO_ARM)
 	{
 		state &= ~CS_ARMED;
 		ishovering = False;
diff --git a/engine/src/buttondraw.cpp b/engine/src/buttondraw.cpp
@@ -299,18 +299,21 @@ void MCButton::draw(MCDC *dc, const MCRectangle& p_dirty, bool p_isolated, bool
 						}
 					}
 					else if (!(flags & F_SHOW_BORDER) && MCcurtheme && MCcurtheme->getthemeid() == LF_NATIVEGTK
-					         && state & (CS_ARMED | CS_KFOCUSED) && (!getcindex(DI_BACK, i) && !getpindex(DI_BACK,i))
+                             && (!getcindex(DI_BACK, i) && !getpindex(DI_BACK,i))
 					         && flags & MENU_ITEM_FLAGS && flags & F_AUTO_ARM)
 					{
 						// FG-2014-07-30: [[ Bugfix 9405 ]]
 						// Clear the previously drawn highlight before drawing GTK highlight
 						setforeground(dc, DI_BACK, False, False);
 						dc->fillrect(shadowrect);
 
-						MCWidgetInfo winfo;
-						winfo.type = WTHEME_TYPE_MENUITEMHIGHLIGHT;
-						getwidgetthemeinfo(winfo);
-						MCcurtheme->drawwidget(dc, winfo, shadowrect);
+                        if (state & CS_ARMED)
+                        {
+                            MCWidgetInfo winfo;
+                            winfo.type = WTHEME_TYPE_MENUITEMHIGHLIGHT;
+                            getwidgetthemeinfo(winfo);
+                            MCcurtheme->drawwidget(dc, winfo, shadowrect);
+                        }
 					}
 
 			}

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# Fix strange menu item highlight on Linux`
	`2`	`+`
Original file line number	Diff line number	Diff line change
`@@ -1074,7 +1074,7 @@ void MCButton::munfocus()`
`1074`	`1074`	`{`
`1075`	`1075`	`if (entry != NULL)`
`1076`	`1076`	`entry->munfocus();`
`1077`		`- if (flags & F_AUTO_ARM && state & CS_ARMED)`
	`1077`	`+ if (flags & F_AUTO_ARM)`
`1078`	`1078`	`{`
`1079`	`1079`	`state &= ~CS_ARMED;`
`1080`	`1080`	`ishovering = False;`
Original file line number	Diff line number	Diff line change
`@@ -299,18 +299,21 @@ void MCButton::draw(MCDC *dc, const MCRectangle& p_dirty, bool p_isolated, bool`
`299`	`299`	`}`
`300`	`300`	`}`
`301`	`301`	`else if (!(flags & F_SHOW_BORDER) && MCcurtheme && MCcurtheme->getthemeid() == LF_NATIVEGTK`
`302`		`- && state & (CS_ARMED \| CS_KFOCUSED) && (!getcindex(DI_BACK, i) && !getpindex(DI_BACK,i))`
	`302`	`+ && (!getcindex(DI_BACK, i) && !getpindex(DI_BACK,i))`
`303`	`303`	`&& flags & MENU_ITEM_FLAGS && flags & F_AUTO_ARM)`
`304`	`304`	`{`
`305`	`305`	`// FG-2014-07-30: [[ Bugfix 9405 ]]`
`306`	`306`	`// Clear the previously drawn highlight before drawing GTK highlight`
`307`	`307`	`setforeground(dc, DI_BACK, False, False);`
`308`	`308`	`dc->fillrect(shadowrect);`
`309`	`309`
`310`		`- MCWidgetInfo winfo;`
`311`		`- winfo.type = WTHEME_TYPE_MENUITEMHIGHLIGHT;`
`312`		`- getwidgetthemeinfo(winfo);`
`313`		`- MCcurtheme->drawwidget(dc, winfo, shadowrect);`
	`310`	`+ if (state & CS_ARMED)`
	`311`	`+ {`
	`312`	`+ MCWidgetInfo winfo;`
	`313`	`+ winfo.type = WTHEME_TYPE_MENUITEMHIGHLIGHT;`
	`314`	`+ getwidgetthemeinfo(winfo);`
	`315`	`+ MCcurtheme->drawwidget(dc, winfo, shadowrect);`
	`316`	`+ }`
`314`	`317`	`}`
`315`	`318`
`316`	`319`	`}`