X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cedd7b22f4efca68479ec4bb79a9ce5f80164a3b..d2e66707deb10dea6f92e3e4092f8a43ef942a5d:/src/aui/dockart.cpp diff --git a/src/aui/dockart.cpp b/src/aui/dockart.cpp index 2a0fc70cd9..17f7083874 100644 --- a/src/aui/dockart.cpp +++ b/src/aui/dockart.cpp @@ -35,14 +35,19 @@ #endif #ifdef __WXMAC__ -#include "wx/mac/private.h" +#include "wx/osx/private.h" #include "wx/graphics.h" +#include "wx/dcgraph.h" #endif #ifdef __WXGTK__ #include -#include "wx/gtk/win_gtk.h" #include "wx/renderer.h" +#if GTK_CHECK_VERSION(2,0,0) + #include "wx/gtk/private/gtk2-compat.h" +#else + #define gtk_widget_is_drawable GTK_WIDGET_DRAWABLE +#endif #endif @@ -54,59 +59,6 @@ // with custom dock art (probably by writing a new stand-alone class derived // from the wxAuiDockArt base class). The active dock art class can be set via // wxAuiManager::SetDockArt() - - -// wxAuiBlendColour is used by wxAuiStepColour -double wxAuiBlendColour(double fg, double bg, double alpha) -{ - double result = bg + (alpha * (fg - bg)); - if (result < 0.0) - result = 0.0; - if (result > 255) - result = 255; - return result; -} - -// wxAuiStepColour() it a utility function that simply darkens -// or lightens a color, based on the specified percentage -// ialpha of 0 would be completely black, 100 completely white -// an ialpha of 100 returns the same colour -wxColor wxAuiStepColour(const wxColor& c, int ialpha) -{ - if (ialpha == 100) - return c; - - double r = c.Red(), g = c.Green(), b = c.Blue(); - double bg; - - // ialpha is 0..200 where 0 is completely black - // and 200 is completely white and 100 is the same - // convert that to normal alpha 0.0 - 1.0 - ialpha = wxMin(ialpha, 200); - ialpha = wxMax(ialpha, 0); - double alpha = ((double)(ialpha - 100.0))/100.0; - - if (ialpha > 100) - { - // blend with white - bg = 255.0; - alpha = 1.0 - alpha; // 0 = transparent fg; 1 = opaque fg - } - else - { - // blend with black - bg = 0.0; - alpha = 1.0 + alpha; // 0 = transparent fg; 1 = opaque fg - } - - r = wxAuiBlendColour(r, bg, alpha); - g = wxAuiBlendColour(g, bg, alpha); - b = wxAuiBlendColour(b, bg, alpha); - - return wxColour((unsigned char)r, (unsigned char)g, (unsigned char)b); -} - - wxColor wxAuiLightContrastColour(const wxColour& c) { int amount = 120; @@ -116,7 +68,7 @@ wxColor wxAuiLightContrastColour(const wxColour& c) if (c.Red() < 128 && c.Green() < 128 && c.Blue() < 128) amount = 160; - return wxAuiStepColour(c, amount); + return c.ChangeLightness(amount); } // wxAuiBitmapFromBits() is a utility function that creates a @@ -199,10 +151,8 @@ wxString wxAuiChopText(wxDC& dc, const wxString& text, int max_size) wxAuiDefaultDockArt::wxAuiDefaultDockArt() { -#ifdef __WXMAC__ - wxBrush toolbarbrush; - toolbarbrush.MacSetTheme( kThemeBrushToolbarBackground ); - wxColor base_colour = toolbarbrush.GetColour(); +#if defined( __WXMAC__ ) && wxOSX_USE_COCOA_OR_CARBON + wxColor base_colour = wxColour( wxMacCreateCGColorFromHITheme(kThemeBrushToolbarBackground)); #else wxColor base_colour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE); #endif @@ -213,32 +163,27 @@ wxAuiDefaultDockArt::wxAuiDefaultDockArt() (255-base_colour.Green()) + (255-base_colour.Blue()) < 60) { - base_colour = wxAuiStepColour(base_colour, 92); + base_colour = base_colour.ChangeLightness(92); } m_base_colour = base_colour; - wxColor darker1_colour = wxAuiStepColour(base_colour, 85); - wxColor darker2_colour = wxAuiStepColour(base_colour, 75); - wxColor darker3_colour = wxAuiStepColour(base_colour, 60); - //wxColor darker4_colour = wxAuiStepColour(base_colour, 50); - wxColor darker5_colour = wxAuiStepColour(base_colour, 40); + wxColor darker1_colour = base_colour.ChangeLightness(85); + wxColor darker2_colour = base_colour.ChangeLightness(75); + wxColor darker3_colour = base_colour.ChangeLightness(60); + //wxColor darker4_colour = base_colour.ChangeLightness(50); + wxColor darker5_colour = base_colour.ChangeLightness(40); m_active_caption_colour = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT); m_active_caption_gradient_colour = wxAuiLightContrastColour(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT)); m_active_caption_text_colour = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT); m_inactive_caption_colour = darker1_colour; - m_inactive_caption_gradient_colour = wxAuiStepColour(base_colour, 97); + m_inactive_caption_gradient_colour = base_colour.ChangeLightness(97); m_inactive_caption_text_colour = *wxBLACK; -#ifdef __WXMAC__ - m_sash_brush = toolbarbrush; - m_background_brush = toolbarbrush; - m_gripper_brush = toolbarbrush; -#else m_sash_brush = wxBrush(base_colour); m_background_brush = wxBrush(base_colour); m_gripper_brush = wxBrush(base_colour); -#endif + m_border_pen = wxPen(darker2_colour); m_gripper_pen1 = wxPen(darker5_colour); m_gripper_pen2 = wxPen(darker3_colour); @@ -250,35 +195,64 @@ wxAuiDefaultDockArt::wxAuiDefaultDockArt() m_caption_font = wxFont(8, wxDEFAULT, wxNORMAL, wxNORMAL, FALSE); #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 #if defined( __WXMAC__ ) - static unsigned char close_bits[]={ + static const unsigned char close_bits[]={ 0xFF, 0xFF, 0xFF, 0xFF, 0x0F, 0xFE, 0x03, 0xF8, 0x01, 0xF0, 0x19, 0xF3, 0xB8, 0xE3, 0xF0, 0xE1, 0xE0, 0xE0, 0xF0, 0xE1, 0xB8, 0xE3, 0x19, 0xF3, 0x01, 0xF0, 0x03, 0xF8, 0x0F, 0xFE, 0xFF, 0xFF }; #elif defined(__WXGTK__) - static unsigned char close_bits[]={ + static const unsigned char close_bits[]={ 0xff, 0xff, 0xff, 0xff, 0x07, 0xf0, 0xfb, 0xef, 0xdb, 0xed, 0x8b, 0xe8, 0x1b, 0xec, 0x3b, 0xee, 0x1b, 0xec, 0x8b, 0xe8, 0xdb, 0xed, 0xfb, 0xef, 0x07, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; #else - static unsigned char close_bits[]={ - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe7, 0xf3, 0xcf, 0xf9, - 0x9f, 0xfc, 0x3f, 0xfe, 0x3f, 0xfe, 0x9f, 0xfc, 0xcf, 0xf9, 0xe7, 0xf3, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; + static const unsigned char close_bits[]={ + // reduced height, symmetric + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xcf, 0xf3, 0x9f, 0xf9, + 0x3f, 0xfc, 0x7f, 0xfe, 0x3f, 0xfc, 0x9f, 0xf9, 0xcf, 0xf3, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; + /* + // same height as maximize/restore + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe7, 0xe7, 0xcf, 0xf3, 0x9f, 0xf9, + 0x3f, 0xfc, 0x7f, 0xfe, 0x3f, 0xfc, 0x9f, 0xf9, 0xcf, 0xf3, 0xe7, 0xe7, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; + */ #endif - static unsigned char maximize_bits[] = { + static const unsigned char maximize_bits[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x07, 0xf0, 0xf7, 0xf7, 0x07, 0xf0, 0xf7, 0xf7, 0xf7, 0xf7, 0xf7, 0xf7, 0xf7, 0xf7, 0xf7, 0xf7, 0x07, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; - static unsigned char restore_bits[]={ + static const unsigned char restore_bits[]={ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0xf0, 0x1f, 0xf0, 0xdf, 0xf7, 0x07, 0xf4, 0x07, 0xf4, 0xf7, 0xf5, 0xf7, 0xf1, 0xf7, 0xfd, 0xf7, 0xfd, 0x07, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; - static unsigned char pin_bits[]={ + static const unsigned char pin_bits[]={ 0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0xfc,0xdf,0xfc,0xdf,0xfc, 0xdf,0xfc,0xdf,0xfc,0xdf,0xfc,0x0f,0xf8,0x7f,0xff,0x7f,0xff, 0x7f,0xff,0xff,0xff,0xff,0xff,0xff,0xff}; @@ -309,22 +283,6 @@ wxAuiDefaultDockArt::wxAuiDefaultDockArt() 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); - - // default metric values -#if defined(__WXMAC__) - 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) @@ -392,11 +350,13 @@ void wxAuiDefaultDockArt::SetColour(int id, const wxColor& colour) case wxAUI_DOCKART_BORDER_COLOUR: m_border_pen.SetColour(colour); break; case wxAUI_DOCKART_GRIPPER_COLOUR: m_gripper_brush.SetColour(colour); - m_gripper_pen1.SetColour(wxAuiStepColour(colour, 40)); - m_gripper_pen2.SetColour(wxAuiStepColour(colour, 60)); + m_gripper_pen1.SetColour(colour.ChangeLightness(40)); + m_gripper_pen2.SetColour(colour.ChangeLightness(60)); break; default: wxFAIL_MSG(wxT("Invalid Metric Ordinal")); break; } + + InitBitmaps(); } void wxAuiDefaultDockArt::SetFont(int id, const wxFont& font) @@ -414,18 +374,14 @@ wxFont wxAuiDefaultDockArt::GetFont(int id) void wxAuiDefaultDockArt::DrawSash(wxDC& dc, wxWindow *window, int orientation, const wxRect& rect) { -#if defined(__WXMAC__) +#if defined( __WXMAC__ ) && wxOSX_USE_COCOA_OR_CARBON + wxUnusedVar(window); + wxUnusedVar(orientation); + HIRect splitterRect = CGRectMake( rect.x , rect.y , rect.width , rect.height ); CGContextRef cgContext ; -#if wxMAC_USE_CORE_GRAPHICS - cgContext = (CGContextRef) dc.GetGraphicsContext()->GetNativeContext() ; -#else - Rect bounds ; - GetPortBounds( (CGrafPtr) dc.m_macPort , &bounds ) ; - QDBeginCGContext( (CGrafPtr) dc.m_macPort , &cgContext ) ; - CGContextTranslateCTM( cgContext , 0 , bounds.bottom - bounds.top ) ; - CGContextScaleCTM( cgContext , 1 , -1 ) ; -#endif + wxGCDCImpl *impl = (wxGCDCImpl*) dc.GetImpl(); + cgContext = (CGContextRef) impl->GetGraphicsContext()->GetNativeContext() ; HIThemeSplitterDrawInfo drawInfo ; drawInfo.version = 0 ; @@ -433,11 +389,6 @@ void wxAuiDefaultDockArt::DrawSash(wxDC& dc, wxWindow *window, int orientation, drawInfo.adornment = kHIThemeSplitterAdornmentNone ; HIThemeDrawPaneSplitter( &splitterRect , &drawInfo , cgContext , kHIThemeOrientationNormal ) ; -#if wxMAC_USE_CORE_GRAPHICS -#else - QDEndCGContext( (CGrafPtr) dc.m_macPort , &cgContext ) ; -#endif - #elif defined(__WXGTK__) // clear out the rectangle first dc.SetPen(*wxTRANSPARENT_PEN); @@ -464,12 +415,12 @@ void wxAuiDefaultDockArt::DrawSash(wxDC& dc, wxWindow *window, int orientation, if (!window) return; if (!window->m_wxwindow) return; - if (!GTK_PIZZA(window->m_wxwindow)->bin_window) return; + if (!gtk_widget_is_drawable(window->m_wxwindow)) return; gtk_paint_handle ( - window->m_wxwindow->style, - GTK_PIZZA(window->m_wxwindow)->bin_window, + gtk_widget_get_style(window->m_wxwindow), + window->GTKGetDrawingWindow(), // flags & wxCONTROL_CURRENT ? GTK_STATE_PRELIGHT : GTK_STATE_NORMAL, GTK_STATE_NORMAL, GTK_SHADOW_NONE, @@ -601,6 +552,14 @@ void wxAuiDefaultDockArt::DrawCaption(wxDC& dc, wxWindow *WXUNUSED(window), DrawCaptionBackground(dc, rect, (pane.state & wxAuiPaneInfo::optionActive)?true:false); + int caption_offset = 0; + if ( pane.icon.IsOk() ) + { + DrawIcon(dc, rect, pane); + + caption_offset += pane.icon.GetWidth() + 3; + } + if (pane.state & wxAuiPaneInfo::optionActive) dc.SetTextForeground(m_active_caption_text_colour); else @@ -623,10 +582,19 @@ void wxAuiDefaultDockArt::DrawCaption(wxDC& dc, wxWindow *WXUNUSED(window), wxString draw_text = wxAuiChopText(dc, text, clip_rect.width); dc.SetClippingRegion(clip_rect); - dc.DrawText(draw_text, rect.x+3, rect.y+(rect.height/2)-(h/2)-1); + dc.DrawText(draw_text, rect.x+3 + caption_offset, rect.y+(rect.height/2)-(h/2)-1); dc.DestroyClippingRegion(); } +void +wxAuiDefaultDockArt::DrawIcon(wxDC& dc, const wxRect& rect, wxAuiPaneInfo& pane) +{ + // Draw the icon centered vertically + dc.DrawBitmap(pane.icon, + rect.x+2, rect.y+(rect.height-pane.icon.GetHeight())/2, + true); +} + void wxAuiDefaultDockArt::DrawGripper(wxDC& dc, wxWindow *WXUNUSED(window), const wxRect& rect, wxAuiPaneInfo& pane) @@ -739,13 +707,13 @@ void wxAuiDefaultDockArt::DrawPaneButton(wxDC& dc, wxWindow *WXUNUSED(window), { if (pane.state & wxAuiPaneInfo::optionActive) { - dc.SetBrush(wxBrush(wxAuiStepColour(m_active_caption_colour, 120))); - dc.SetPen(wxPen(wxAuiStepColour(m_active_caption_colour, 70))); + dc.SetBrush(wxBrush(m_active_caption_colour.ChangeLightness(120))); + dc.SetPen(wxPen(m_active_caption_colour.ChangeLightness(70))); } else { - dc.SetBrush(wxBrush(wxAuiStepColour(m_inactive_caption_colour, 120))); - dc.SetPen(wxPen(wxAuiStepColour(m_inactive_caption_colour, 70))); + dc.SetBrush(wxBrush(m_inactive_caption_colour.ChangeLightness(120))); + dc.SetPen(wxPen(m_inactive_caption_colour.ChangeLightness(70))); } // draw the background behind the button