X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/254a3429530c72810c6e713f15c15b0420175b54..79b7701c0bc547dc4b579258c7116700e5925162:/src/aui/dockart.cpp diff --git a/src/aui/dockart.cpp b/src/aui/dockart.cpp index 44c84e3b49..227edd7a3b 100644 --- a/src/aui/dockart.cpp +++ b/src/aui/dockart.cpp @@ -35,13 +35,13 @@ #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" #endif @@ -57,14 +57,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 @@ -75,35 +75,37 @@ 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 // 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; + bg = 255; alpha = 1.0 - alpha; // 0 = transparent fg; 1 = opaque fg } - else + else { // blend with black - bg = 0.0; + bg = 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((int)r, (int)g, (int)b); + + return wxColour(r, g, b); } @@ -130,7 +132,7 @@ wxBitmap wxAuiBitmapFromBits(const unsigned char bits[], int w, int h, img.SetMaskColour(123,123,123); return wxBitmap(img); } - + static void DrawGradientRectangle(wxDC& dc, const wxRect& rect, @@ -145,17 +147,17 @@ static void DrawGradientRectangle(wxDC& dc, if (direction == wxAUI_GRADIENT_VERTICAL) high = rect.GetHeight()-1; - else + else high = rect.GetWidth()-1; for (int i = 0; i <= high; ++i) { int r,g,b; - - - r = start_color.Red() + ((i*rd*100)/high)/100; - g = start_color.Green() + ((i*gd*100)/high)/100; - b = start_color.Blue() + ((i*bd*100)/high)/100; + + + r = start_color.Red() + (high <= 0 ? 0 : (((i*rd*100)/high)/100)); + g = start_color.Green() + (high <= 0 ? 0 : (((i*gd*100)/high)/100)); + b = start_color.Blue() + (high <= 0 ? 0 : (((i*bd*100)/high)/100)); wxPen p(wxColor((unsigned char)r, (unsigned char)g, @@ -164,7 +166,7 @@ static void DrawGradientRectangle(wxDC& dc, if (direction == wxAUI_GRADIENT_VERTICAL) dc.DrawLine(rect.x, rect.y+i, rect.x+rect.width, rect.y+i); - else + else dc.DrawLine(rect.x+i, rect.y, rect.x+i, rect.y+rect.height); } } @@ -172,23 +174,23 @@ static void DrawGradientRectangle(wxDC& dc, wxString wxAuiChopText(wxDC& dc, const wxString& text, int max_size) { wxCoord x,y; - + // first check if the text fits with no problems dc.GetTextExtent(text, &x, &y); if (x <= max_size) return text; - + size_t i, len = text.Length(); size_t last_good_length = 0; for (i = 0; i < len; ++i) { wxString s = text.Left(i); s += wxT("..."); - + dc.GetTextExtent(s, &x, &y); if (x > max_size) break; - + last_good_length = i; } @@ -199,19 +201,26 @@ 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 + // the base_colour is too pale to use as our base colour, + // so darken it a bit -- + if ((255-base_colour.Red()) + + (255-base_colour.Green()) + + (255-base_colour.Blue()) < 60) + { + base_colour = wxAuiStepColour(base_colour, 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 darker4_colour = wxAuiStepColour(base_colour, 50); wxColor darker5_colour = wxAuiStepColour(base_colour, 40); m_active_caption_colour = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT); @@ -221,15 +230,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); @@ -243,33 +247,40 @@ wxAuiDefaultDockArt::wxAuiDefaultDockArt() // 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[]={ - 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 }; +#elif defined(__WXGTK__) + 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}; @@ -302,7 +313,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; @@ -405,18 +416,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 ; @@ -424,17 +431,13 @@ 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); dc.SetBrush(m_sash_brush); dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height); +#if 0 GdkRectangle gdk_rect; if (orientation == wxVERTICAL ) { @@ -450,15 +453,16 @@ void wxAuiDefaultDockArt::DrawSash(wxDC& dc, wxWindow *window, int orientation, gdk_rect.width = rect.width; gdk_rect.height = m_sash_size; } +#endif 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, @@ -536,7 +540,7 @@ void wxAuiDefaultDockArt::DrawCaptionBackground(wxDC& dc, const wxRect& rect, bo { if (active) dc.SetBrush(wxBrush(m_active_caption_colour)); - else + else dc.SetBrush(wxBrush(m_inactive_caption_colour)); dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height); @@ -559,7 +563,7 @@ void wxAuiDefaultDockArt::DrawCaptionBackground(wxDC& dc, const wxRect& rect, bo m_gradient_type); #endif } - else + else { #ifdef __WXMAC__ // on mac the gradients are expected to become darker from the top @@ -605,9 +609,9 @@ void wxAuiDefaultDockArt::DrawCaption(wxDC& dc, wxWindow *WXUNUSED(window), if (pane.HasCloseButton()) clip_rect.width -= m_button_size; if (pane.HasPinButton()) - clip_rect.width -= m_button_size; + clip_rect.width -= m_button_size; if (pane.HasMaximizeButton()) - clip_rect.width -= m_button_size; + clip_rect.width -= m_button_size; wxString draw_text = wxAuiChopText(dc, text, clip_rect.width); @@ -674,19 +678,21 @@ void wxAuiDefaultDockArt::DrawPaneButton(wxDC& dc, wxWindow *WXUNUSED(window), wxAuiPaneInfo& pane) { wxBitmap bmp; + if (!(&pane)) + return; switch (button) { default: case wxAUI_BUTTON_CLOSE: if (pane.state & wxAuiPaneInfo::optionActive) bmp = m_active_close_bitmap; - else + else bmp = m_inactive_close_bitmap; break; case wxAUI_BUTTON_PIN: if (pane.state & wxAuiPaneInfo::optionActive) bmp = m_active_pin_bitmap; - else + else bmp = m_inactive_pin_bitmap; break; case wxAUI_BUTTON_MAXIMIZE_RESTORE: @@ -694,14 +700,14 @@ void wxAuiDefaultDockArt::DrawPaneButton(wxDC& dc, wxWindow *WXUNUSED(window), { if (pane.state & wxAuiPaneInfo::optionActive) bmp = m_active_restore_bitmap; - else + else bmp = m_inactive_restore_bitmap; } - else + else { if (pane.state & wxAuiPaneInfo::optionActive) bmp = m_active_maximize_bitmap; - else + else bmp = m_inactive_maximize_bitmap; } break; @@ -729,7 +735,7 @@ void wxAuiDefaultDockArt::DrawPaneButton(wxDC& dc, wxWindow *WXUNUSED(window), dc.SetBrush(wxBrush(wxAuiStepColour(m_active_caption_colour, 120))); dc.SetPen(wxPen(wxAuiStepColour(m_active_caption_colour, 70))); } - else + else { dc.SetBrush(wxBrush(wxAuiStepColour(m_inactive_caption_colour, 120))); dc.SetPen(wxPen(wxAuiStepColour(m_inactive_caption_colour, 70)));