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

added inactive titlebar text colour

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12221 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2001-10-30 23:27:00 +00:00
parent 25acfd4ca3
commit 6296744f45
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/univ/colschem.h
View File

@@ -61,7 +61,13 @@ public:
// the titlebar background colours for the normal and focused states // the titlebar background colours for the normal and focused states
TITLEBAR, TITLEBAR,
TITLEBAR_ACTIVE, TITLEBAR_ACTIVE,
// the titlebar text colours
TITLEBAR_TEXT, TITLEBAR_TEXT,
TITLEBAR_ACTIVE_TEXT,
// desktop background colour (only used by framebuffer ports)
DESKTOP,
MAX MAX
}; };

16
src/univ/themes/win32.cpp
View File

@@ -1296,7 +1296,10 @@ wxColour wxWin32ColourScheme::Get(wxWin32ColourScheme::StdColour col) const
case TITLEBAR: return wxColour(GetSysColor(COLOR_INACTIVECAPTION)); case TITLEBAR: return wxColour(GetSysColor(COLOR_INACTIVECAPTION));
case TITLEBAR_ACTIVE: return wxColour(GetSysColor(COLOR_ACTIVECAPTION)); 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__ #else // !__WXMSW__
// use the standard Windows colours elsewhere // use the standard Windows colours elsewhere
case WINDOW: return *wxWHITE; case WINDOW: return *wxWHITE;
@@ -1325,7 +1328,10 @@ wxColour wxWin32ColourScheme::Get(wxWin32ColourScheme::StdColour col) const
case TITLEBAR: return wxColour(0xaeaaae); case TITLEBAR: return wxColour(0xaeaaae);
case TITLEBAR_ACTIVE: return wxColour(0x820300); 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__ #endif // __WXMSW__
case MAX: case MAX:
@@ -3358,6 +3364,10 @@ void wxWin32Renderer::DrawFrameTitle(wxDC& dc,
const wxString& title, const wxString& title,
int flags) 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); wxRect r = GetFrameClientArea(rect, flags & ~wxTOPLEVEL_TITLEBAR);
r.height = FRAME_TITLEBAR_HEIGHT; r.height = FRAME_TITLEBAR_HEIGHT;
if ( flags & wxTOPLEVEL_ICON ) if ( flags & wxTOPLEVEL_ICON )
@@ -3366,7 +3376,7 @@ void wxWin32Renderer::DrawFrameTitle(wxDC& dc,
r.x += 1; r.x += 1;
dc.SetFont(m_titlebarFont); 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); dc.DrawLabel(title, wxNullBitmap, r, wxALIGN_LEFT | wxALIGN_CENTRE_VERTICAL);
} }