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

Change AUI bar on msw to use wxSYS_COLOUR_GRAYTEXT for disabled buttons

Browse Source
This commit is contained in:
mimi89999
2020-04-15 16:18:44 +02:00
parent 697bd07441
commit bc886c1e09
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/aui/barartmsw.cpp
View File

@@ -105,12 +105,6 @@ void wxAuiMSWToolBarArt::DrawLabel(
wxAuiGenericToolBarArt::DrawLabel(dc, wnd, item, rect); wxAuiGenericToolBarArt::DrawLabel(dc, wnd, item, rect);
} }
static const unsigned char
DISABLED_TEXT_GREY_HUE = wxColour::AlphaBlend(0, 255, 0.4);
const wxColour DISABLED_TEXT_COLOR(DISABLED_TEXT_GREY_HUE,
DISABLED_TEXT_GREY_HUE,
DISABLED_TEXT_GREY_HUE);
void wxAuiMSWToolBarArt::DrawButton( void wxAuiMSWToolBarArt::DrawButton(
wxDC& dc, wxDC& dc,
wxWindow* wnd, wxWindow* wnd,
@@ -200,9 +194,10 @@ void wxAuiMSWToolBarArt::DrawButton(
dc.DrawBitmap(bmp, bmpX, bmpY, true); dc.DrawBitmap(bmp, bmpX, bmpY, true);
// set the item's text color based on if it is disabled // set the item's text color based on if it is disabled
dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_CAPTIONTEXT));
if ( item.GetState() & wxAUI_BUTTON_STATE_DISABLED ) if ( item.GetState() & wxAUI_BUTTON_STATE_DISABLED )
dc.SetTextForeground(DISABLED_TEXT_COLOR); dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT));
else
dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_CAPTIONTEXT));
if ( (m_flags & wxAUI_TB_TEXT) && !item.GetLabel().empty() ) if ( (m_flags & wxAUI_TB_TEXT) && !item.GetLabel().empty() )
{ {
@@ -322,9 +317,10 @@ void wxAuiMSWToolBarArt::DrawDropDownButton(
dc.DrawBitmap(bmp, bmpX, bmpY, true); dc.DrawBitmap(bmp, bmpX, bmpY, true);
// set the item's text color based on if it is disabled // set the item's text color based on if it is disabled
dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_CAPTIONTEXT));
if ( item.GetState() & wxAUI_BUTTON_STATE_DISABLED ) if ( item.GetState() & wxAUI_BUTTON_STATE_DISABLED )
dc.SetTextForeground(DISABLED_TEXT_COLOR); dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT));
else
dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_CAPTIONTEXT));
if ( (m_flags & wxAUI_TB_TEXT) && !item.GetLabel().empty() ) if ( (m_flags & wxAUI_TB_TEXT) && !item.GetLabel().empty() )
{ {