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

Update AUI bitmaps when its colours change.

Browse Source 
Extract the bitmaps initialization in wxAuiDefaultDockArt::InitBitmaps() and
call it from SetColour() to ensure that the bitmaps are updated when the
colour scheme changes.

Closes #12532.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66313 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-12-03 12:40:28 +00:00
parent a310c91c7c
commit cae374efb9
2 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/aui/dockart.h
View File

@@ -134,6 +134,8 @@ protected:
void DrawCaptionBackground(wxDC& dc, const wxRect& rect, bool active); void DrawCaptionBackground(wxDC& dc, const wxRect& rect, bool active);
void InitBitmaps();
protected: protected:
wxPen m_border_pen; wxPen m_border_pen;

40
src/aui/dockart.cpp
View File

@@ -190,6 +190,28 @@ wxAuiDefaultDockArt::wxAuiDefaultDockArt()
m_caption_font = wxFont(8, wxDEFAULT, wxNORMAL, wxNORMAL, FALSE); m_caption_font = wxFont(8, wxDEFAULT, wxNORMAL, wxNORMAL, FALSE);
#endif #endif
// default metric values
#if defined( __WXMAC__ ) && wxOSX_USE_COCOA_OR_CARBON
SInt32 height;
GetThemeMetric( kThemeMetricSmallPaneSplitterHeight , &height );
m_sash_size = height;
#elif defined(__WXGTK__)
m_sash_size = wxRendererNative::Get().GetSplitterParams(NULL).widthSash;
#else
m_sash_size = 4;
#endif
m_caption_size = 17;
m_border_size = 1;
m_button_size = 14;
m_gripper_size = 9;
m_gradient_type = wxAUI_GRADIENT_VERTICAL;
InitBitmaps();
}
void
wxAuiDefaultDockArt::InitBitmaps ()
{
// some built in bitmaps // some built in bitmaps
#if defined( __WXMAC__ ) #if defined( __WXMAC__ )
static const unsigned char close_bits[]={ static const unsigned char close_bits[]={
@@ -256,22 +278,6 @@ wxAuiDefaultDockArt::wxAuiDefaultDockArt()
m_inactive_pin_bitmap = wxAuiBitmapFromBits(pin_bits, 16, 16, m_inactive_caption_text_colour); m_inactive_pin_bitmap = wxAuiBitmapFromBits(pin_bits, 16, 16, m_inactive_caption_text_colour);
m_active_pin_bitmap = wxAuiBitmapFromBits(pin_bits, 16, 16, m_active_caption_text_colour); m_active_pin_bitmap = wxAuiBitmapFromBits(pin_bits, 16, 16, m_active_caption_text_colour);
// default metric values
#if defined( __WXMAC__ ) && wxOSX_USE_COCOA_OR_CARBON
SInt32 height;
GetThemeMetric( kThemeMetricSmallPaneSplitterHeight , &height );
m_sash_size = height;
#elif defined(__WXGTK__)
m_sash_size = wxRendererNative::Get().GetSplitterParams(NULL).widthSash;
#else
m_sash_size = 4;
#endif
m_caption_size = 17;
m_border_size = 1;
m_button_size = 14;
m_gripper_size = 9;
m_gradient_type = wxAUI_GRADIENT_VERTICAL;
} }
int wxAuiDefaultDockArt::GetMetric(int id) int wxAuiDefaultDockArt::GetMetric(int id)
@@ -344,6 +350,8 @@ void wxAuiDefaultDockArt::SetColour(int id, const wxColor& colour)
break; break;
default: wxFAIL_MSG(wxT("Invalid Metric Ordinal")); break; default: wxFAIL_MSG(wxT("Invalid Metric Ordinal")); break;
} }
InitBitmaps();
} }
void wxAuiDefaultDockArt::SetFont(int id, const wxFont& font) void wxAuiDefaultDockArt::SetFont(int id, const wxFont& font)