From 6296744f4530d59e903652747e79ddd34ad7c6ae Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Tue, 30 Oct 2001 23:27:00 +0000 Subject: [PATCH] added inactive titlebar text colour git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12221 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/univ/colschem.h | 6 ++++++ src/univ/themes/win32.cpp | 16 +++++++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/include/wx/univ/colschem.h b/include/wx/univ/colschem.h index 2b29bbe79a..69ca4d89f0 100644 --- a/include/wx/univ/colschem.h +++ b/include/wx/univ/colschem.h @@ -61,7 +61,13 @@ public: // the titlebar background colours for the normal and focused states TITLEBAR, TITLEBAR_ACTIVE, + + // the titlebar text colours TITLEBAR_TEXT, + TITLEBAR_ACTIVE_TEXT, + + // desktop background colour (only used by framebuffer ports) + DESKTOP, MAX }; diff --git a/src/univ/themes/win32.cpp b/src/univ/themes/win32.cpp index dc1a5005a6..540676b5ea 100644 --- a/src/univ/themes/win32.cpp +++ b/src/univ/themes/win32.cpp @@ -1296,7 +1296,10 @@ wxColour wxWin32ColourScheme::Get(wxWin32ColourScheme::StdColour col) const case TITLEBAR: return wxColour(GetSysColor(COLOR_INACTIVECAPTION)); case TITLEBAR_ACTIVE: return wxColour(GetSysColor(COLOR_ACTIVECAPTION)); - case TITLEBAR_TEXT: return wxColour(GetSysColor(COLOR_CAPTIONTEXT)); + case TITLEBAR_TEXT: return wxColour(GetSysColor(COLOR_INACTIVECAPTIONTEXT)); + case TITLEBAR_ACTIVE_TEXT: return wxColour(GetSysColor(COLOR_CAPTIONTEXT)); + + case DESKTOP: return wxColour(0x808000); #else // !__WXMSW__ // use the standard Windows colours elsewhere case WINDOW: return *wxWHITE; @@ -1325,7 +1328,10 @@ wxColour wxWin32ColourScheme::Get(wxWin32ColourScheme::StdColour col) const case TITLEBAR: return wxColour(0xaeaaae); case TITLEBAR_ACTIVE: return wxColour(0x820300); - case TITLEBAR_TEXT: return *wxWHITE; + case TITLEBAR_TEXT: return wxColour(0xc0c0c0); + case TITLEBAR_ACTIVE_TEXT:return *wxWHITE; + + case DESKTOP: return wxColour(0x808000); #endif // __WXMSW__ case MAX: @@ -3358,6 +3364,10 @@ void wxWin32Renderer::DrawFrameTitle(wxDC& dc, const wxString& title, int flags) { + wxColour col = (flags & wxTOPLEVEL_ACTIVE) ? + wxSCHEME_COLOUR(m_scheme, TITLEBAR_ACTIVE_TEXT) : + wxSCHEME_COLOUR(m_scheme, TITLEBAR_TEXT); + wxRect r = GetFrameClientArea(rect, flags & ~wxTOPLEVEL_TITLEBAR); r.height = FRAME_TITLEBAR_HEIGHT; if ( flags & wxTOPLEVEL_ICON ) @@ -3366,7 +3376,7 @@ void wxWin32Renderer::DrawFrameTitle(wxDC& dc, r.x += 1; dc.SetFont(m_titlebarFont); - dc.SetTextForeground(wxSCHEME_COLOUR(m_scheme, TITLEBAR_TEXT)); + dc.SetTextForeground(col); dc.DrawLabel(title, wxNullBitmap, r, wxALIGN_LEFT | wxALIGN_CENTRE_VERTICAL); } -- 2.45.2