[[ Bug 20839 ]] Replace stipple effect with 50% opacity for disabled motif button text / icons

livecodeian · livecodeian · commit 39b35df00bb3 · 2018-07-02T13:16:33.000+01:00
diff --git a/engine/src/buttondraw.cpp b/engine/src/buttondraw.cpp
@@ -109,6 +109,7 @@ void MCButton::draw(MCDC *dc, const MCRectangle& p_dirty, bool p_isolated, bool
 	bool t_isvista = MCmajorosversion >= 0x0600 && MCcurtheme != NULL;
 
 	bool t_themed_menu = false;
+	bool t_use_alpha_layer = false;
 
 	if (entry != NULL)
 	{
@@ -352,7 +353,9 @@ void MCButton::draw(MCDC *dc, const MCRectangle& p_dirty, bool p_isolated, bool
 			if (MClook == LF_MOTIF)
 			{
 				setforeground(dc, DI_FORE, False);
-				dc->setfillstyle(FillStippled, nil, 0, 0);
+				dc->setopacity(127);
+				dc->begin(false);
+				t_use_alpha_layer = true;
 			}
 			else if (IsMacLF())
 			{
@@ -576,6 +579,9 @@ void MCButton::draw(MCDC *dc, const MCRectangle& p_dirty, bool p_isolated, bool
 				MCStringRef t_name = MCNameGetString(getname());
                 drawdirectionaltext(dc, rect.x + leftmargin, starty, t_name, m_font);
 			}
+			
+			if (t_use_alpha_layer)
+				dc->end();
 
 			// MW-2012-01-27: [[ Bug 9432 ]] Native GTK handles focus borders itself
 			//   so don't render the win95-style one.
@@ -1608,7 +1614,7 @@ void MCButton::drawtabs(MCDC *dc, MCRectangle &srect)
 			{
 			case LF_MOTIF:
 				setforeground(dc, DI_FORE, False);
-				dc->setfillstyle(FillStippled, nil, 0, 0);
+				dc->setopacity(127);
 				break;
 			case LF_MAC:
 				dc->setforeground(dc->getgray());

Original file line number	Diff line number	Diff line change
`@@ -109,6 +109,7 @@ void MCButton::draw(MCDC *dc, const MCRectangle& p_dirty, bool p_isolated, bool`
`109`	`109`	`bool t_isvista = MCmajorosversion >= 0x0600 && MCcurtheme != NULL;`
`110`	`110`
`111`	`111`	`bool t_themed_menu = false;`
	`112`	`+ bool t_use_alpha_layer = false;`
`112`	`113`
`113`	`114`	`if (entry != NULL)`
`114`	`115`	`{`
`@@ -352,7 +353,9 @@ void MCButton::draw(MCDC *dc, const MCRectangle& p_dirty, bool p_isolated, bool`
`352`	`353`	`if (MClook == LF_MOTIF)`
`353`	`354`	`{`
`354`	`355`	`setforeground(dc, DI_FORE, False);`
`355`		`- dc->setfillstyle(FillStippled, nil, 0, 0);`
	`356`	`+ dc->setopacity(127);`
	`357`	`+ dc->begin(false);`
	`358`	`+ t_use_alpha_layer = true;`
`356`	`359`	`}`
`357`	`360`	`else if (IsMacLF())`
`358`	`361`	`{`
`@@ -576,6 +579,9 @@ void MCButton::draw(MCDC *dc, const MCRectangle& p_dirty, bool p_isolated, bool`
`576`	`579`	`MCStringRef t_name = MCNameGetString(getname());`
`577`	`580`	`drawdirectionaltext(dc, rect.x + leftmargin, starty, t_name, m_font);`
`578`	`581`	`}`
	`582`	`+`
	`583`	`+ if (t_use_alpha_layer)`
	`584`	`+ dc->end();`
`579`	`585`
`580`	`586`	`// MW-2012-01-27: [[ Bug 9432 ]] Native GTK handles focus borders itself`
`581`	`587`	`// so don't render the win95-style one.`
`@@ -1608,7 +1614,7 @@ void MCButton::drawtabs(MCDC *dc, MCRectangle &srect)`
`1608`	`1614`	`{`
`1609`	`1615`	`case LF_MOTIF:`
`1610`	`1616`	`setforeground(dc, DI_FORE, False);`
`1611`		`- dc->setfillstyle(FillStippled, nil, 0, 0);`
	`1617`	`+ dc->setopacity(127);`
`1612`	`1618`	`break;`
`1613`	`1619`	`case LF_MAC:`
`1614`	`1620`	`dc->setforeground(dc->getgray());`