X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cedd7b22f4efca68479ec4bb79a9ce5f80164a3b..a43a9e5521440dbb28037646ed4a07125c8823a9:/src/aui/dockart.cpp?ds=inline diff --git a/src/aui/dockart.cpp b/src/aui/dockart.cpp index 2a0fc70cd9..55b5e89258 100644 --- a/src/aui/dockart.cpp +++ b/src/aui/dockart.cpp @@ -35,13 +35,15 @@ #endif #ifdef __WXMAC__ -#include "wx/mac/private.h" +#include "wx/osx/private.h" #include "wx/graphics.h" +#include "wx/dcgraph.h" +// for themeing support +#include #endif #ifdef __WXGTK__ #include -#include "wx/gtk/win_gtk.h" #include "wx/renderer.h" #endif @@ -57,14 +59,14 @@ // wxAuiBlendColour is used by wxAuiStepColour -double wxAuiBlendColour(double fg, double bg, double alpha) +unsigned char wxAuiBlendColour(unsigned char fg, unsigned char bg, double alpha) { double result = bg + (alpha * (fg - bg)); if (result < 0.0) result = 0.0; if (result > 255) result = 255; - return result; + return (unsigned char)result; } // wxAuiStepColour() it a utility function that simply darkens @@ -76,8 +78,10 @@ wxColor wxAuiStepColour(const wxColor& c, int ialpha) if (ialpha == 100) return c; - double r = c.Red(), g = c.Green(), b = c.Blue(); - double bg; + unsigned char r = c.Red(), + g = c.Green(), + b = c.Blue(); + unsigned char bg; // ialpha is 0..200 where 0 is completely black // and 200 is completely white and 100 is the same @@ -89,13 +93,13 @@ wxColor wxAuiStepColour(const wxColor& c, int ialpha) if (ialpha > 100) { // blend with white - bg = 255.0; + bg = 255; alpha = 1.0 - alpha; // 0 = transparent fg; 1 = opaque fg } else { // blend with black - bg = 0.0; + bg = 0; alpha = 1.0 + alpha; // 0 = transparent fg; 1 = opaque fg } @@ -103,7 +107,7 @@ wxColor wxAuiStepColour(const wxColor& c, int ialpha) g = wxAuiBlendColour(g, bg, alpha); b = wxAuiBlendColour(b, bg, alpha); - return wxColour((unsigned char)r, (unsigned char)g, (unsigned char)b); + return wxColour(r, g, b); } @@ -199,10 +203,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 @@ -230,15 +232,10 @@ wxAuiDefaultDockArt::wxAuiDefaultDockArt() m_inactive_caption_gradient_colour = wxAuiStepColour(base_colour, 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); @@ -263,9 +260,16 @@ wxAuiDefaultDockArt::wxAuiDefaultDockArt() 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}; + // 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[] = { @@ -311,7 +315,7 @@ wxAuiDefaultDockArt::wxAuiDefaultDockArt() m_active_pin_bitmap = wxAuiBitmapFromBits(pin_bits, 16, 16, m_active_caption_text_colour); // default metric values -#if defined(__WXMAC__) +#if defined( __WXMAC__ ) && wxOSX_USE_COCOA_OR_CARBON SInt32 height; GetThemeMetric( kThemeMetricSmallPaneSplitterHeight , &height ); m_sash_size = height; @@ -414,18 +418,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 +433,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 +459,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_DRAWABLE(window->m_wxwindow)) return; gtk_paint_handle ( window->m_wxwindow->style, - GTK_PIZZA(window->m_wxwindow)->bin_window, + window->GTKGetDrawingWindow(), // flags & wxCONTROL_CURRENT ? GTK_STATE_PRELIGHT : GTK_STATE_NORMAL, GTK_STATE_NORMAL, GTK_SHADOW_NONE,