Merge pull request livecode#3537 from livecodefraser/bugfix-14361

peter-b · peter-b · commit 5ba89ce919e1 · 2016-02-01T10:23:53.000Z
Ignore the background colour when drawing native-appearance tab panes
diff --git a/docs/notes/bugfix-14361.md b/docs/notes/bugfix-14361.md
@@ -0,0 +1 @@
+# Ignore the background color for native-appearance tab panes
diff --git a/engine/src/buttondraw.cpp b/engine/src/buttondraw.cpp
@@ -186,8 +186,11 @@ void MCButton::draw(MCDC *dc, const MCRectangle& p_dirty, bool p_isolated, bool
 			case F_RADIO:
 			case F_RECTANGLE:
 			case F_STANDARD:
-					if (MCcurtheme == NULL || !getstack() -> ismetal() || (isstdbtn && state & CS_HILITED) ||
-						!MCcurtheme -> drawmetalbackground(dc, dirty, trect, this))
+                    if ((isstdbtn && (state & CS_HILITED))
+                        || MCcurtheme == NULL
+                        || !((getstack()->ismetal() && MCcurtheme->drawmetalbackground(dc, dirty, trect, this))
+                              || (style == F_MENU && menumode == WM_TOP_LEVEL && MCcurtheme->iswidgetsupported(WTHEME_TYPE_TABPANE))))
+
 				{
 					if (isstdbtn && noback)
 					{

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Ignore the background color for native-appearance tab panes`
Original file line number	Diff line number	Diff line change
`@@ -186,8 +186,11 @@ void MCButton::draw(MCDC *dc, const MCRectangle& p_dirty, bool p_isolated, bool`
`186`	`186`	`case F_RADIO:`
`187`	`187`	`case F_RECTANGLE:`
`188`	`188`	`case F_STANDARD:`
`189`		`- if (MCcurtheme == NULL \|\| !getstack() -> ismetal() \|\| (isstdbtn && state & CS_HILITED) \|\|`
`190`		`- !MCcurtheme -> drawmetalbackground(dc, dirty, trect, this))`
	`189`	`+ if ((isstdbtn && (state & CS_HILITED))`
	`190`	`+ \|\| MCcurtheme == NULL`
	`191`	`+ \|\| !((getstack()->ismetal() && MCcurtheme->drawmetalbackground(dc, dirty, trect, this))`
	`192`	`+ \|\| (style == F_MENU && menumode == WM_TOP_LEVEL && MCcurtheme->iswidgetsupported(WTHEME_TYPE_TABPANE))))`
	`193`	`+`
`191`	`194`	`{`
`192`	`195`	`if (isstdbtn && noback)`
`193`	`196`	`{`