Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use subtler grey for emulated toolbar toggle on OS X

Browse Source 
Use a lighter shade of gray to avoid problems with user icons and to
match the look of OS X 10.10's rendering of selected toolbar items.

Fixes #16645.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@78075 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2014-10-26 11:44:47 +00:00
parent 9adb6da2c9
commit 0f3a84fc72
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/osx/cocoa/toolbar.mm
View File

@@ -568,9 +568,12 @@ void wxToolBarTool::UpdateImages()
m_alternateBitmap = wxBitmap( w, h );
wxMemoryDC dc;
dc.SelectObject( m_alternateBitmap );
dc.SetPen(*wxGREY_PEN);
dc.SetBrush(*wxGREY_BRUSH);
dc.SelectObject(m_alternateBitmap);
// This color corresponds to OS X Yosemite's rendering of selected toolbar items
// See also http://trac.wxwidgets.org/ticket/16645
wxColour grey(0xB9, 0xB9, 0xB9);
dc.SetPen(grey);
dc.SetBrush(grey);
dc.DrawRoundedRectangle( 0, 0, w, h, 3 );
dc.DrawBitmap( m_bmpNormal, 0, 0, true );
dc.SelectObject( wxNullBitmap );