X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8096c4256b5cba930b07ad7d36caaa390d343c83..ba8c878f957da36c14879b747a2d54d7fe01baa8:/src/aui/dockart.cpp diff --git a/src/aui/dockart.cpp b/src/aui/dockart.cpp index 202ae344e0..02a0c74035 100644 --- a/src/aui/dockart.cpp +++ b/src/aui/dockart.cpp @@ -41,7 +41,6 @@ #ifdef __WXGTK__ #include -#include "wx/gtk/win_gtk.h" #include "wx/renderer.h" #endif @@ -75,35 +74,35 @@ 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 + 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((int)r, (int)g, (int)b); + + return wxColour((unsigned char)r, (unsigned char)g, (unsigned char)b); } @@ -130,7 +129,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 +144,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 +163,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 +171,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; } @@ -200,18 +199,25 @@ wxString wxAuiChopText(wxDC& dc, const wxString& text, int max_size) wxAuiDefaultDockArt::wxAuiDefaultDockArt() { #ifdef __WXMAC__ - wxBrush toolbarbrush; - toolbarbrush.MacSetTheme( kThemeBrushToolbarBackground ); - wxColor base_colour = toolbarbrush.GetColour(); + 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 +227,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); @@ -247,16 +248,23 @@ wxAuiDefaultDockArt::wxAuiDefaultDockArt() 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 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}; + // 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[] = { @@ -268,7 +276,7 @@ wxAuiDefaultDockArt::wxAuiDefaultDockArt() 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[]={ 0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0xfc,0xdf,0xfc,0xdf,0xfc, 0xdf,0xfc,0xdf,0xfc,0xdf,0xfc,0x0f,0xf8,0x7f,0xff,0x7f,0xff, @@ -322,12 +330,12 @@ int wxAuiDefaultDockArt::GetMetric(int id) { switch (id) { - case wxAUI_ART_SASH_SIZE: return m_sash_size; - case wxAUI_ART_CAPTION_SIZE: return m_caption_size; - case wxAUI_ART_GRIPPER_SIZE: return m_gripper_size; - case wxAUI_ART_PANE_BORDER_SIZE: return m_border_size; - case wxAUI_ART_PANE_BUTTON_SIZE: return m_button_size; - case wxAUI_ART_GRADIENT_TYPE: return m_gradient_type; + case wxAUI_DOCKART_SASH_SIZE: return m_sash_size; + case wxAUI_DOCKART_CAPTION_SIZE: return m_caption_size; + case wxAUI_DOCKART_GRIPPER_SIZE: return m_gripper_size; + case wxAUI_DOCKART_PANE_BORDER_SIZE: return m_border_size; + case wxAUI_DOCKART_PANE_BUTTON_SIZE: return m_button_size; + case wxAUI_DOCKART_GRADIENT_TYPE: return m_gradient_type; default: wxFAIL_MSG(wxT("Invalid Metric Ordinal")); break; } @@ -338,12 +346,12 @@ void wxAuiDefaultDockArt::SetMetric(int id, int new_val) { switch (id) { - case wxAUI_ART_SASH_SIZE: m_sash_size = new_val; break; - case wxAUI_ART_CAPTION_SIZE: m_caption_size = new_val; break; - case wxAUI_ART_GRIPPER_SIZE: m_gripper_size = new_val; break; - case wxAUI_ART_PANE_BORDER_SIZE: m_border_size = new_val; break; - case wxAUI_ART_PANE_BUTTON_SIZE: m_button_size = new_val; break; - case wxAUI_ART_GRADIENT_TYPE: m_gradient_type = new_val; break; + case wxAUI_DOCKART_SASH_SIZE: m_sash_size = new_val; break; + case wxAUI_DOCKART_CAPTION_SIZE: m_caption_size = new_val; break; + case wxAUI_DOCKART_GRIPPER_SIZE: m_gripper_size = new_val; break; + case wxAUI_DOCKART_PANE_BORDER_SIZE: m_border_size = new_val; break; + case wxAUI_DOCKART_PANE_BUTTON_SIZE: m_button_size = new_val; break; + case wxAUI_DOCKART_GRADIENT_TYPE: m_gradient_type = new_val; break; default: wxFAIL_MSG(wxT("Invalid Metric Ordinal")); break; } } @@ -352,16 +360,16 @@ wxColour wxAuiDefaultDockArt::GetColour(int id) { switch (id) { - case wxAUI_ART_BACKGROUND_COLOUR: return m_background_brush.GetColour(); - case wxAUI_ART_SASH_COLOUR: return m_sash_brush.GetColour(); - case wxAUI_ART_INACTIVE_CAPTION_COLOUR: return m_inactive_caption_colour; - case wxAUI_ART_INACTIVE_CAPTION_GRADIENT_COLOUR: return m_inactive_caption_gradient_colour; - case wxAUI_ART_INACTIVE_CAPTION_TEXT_COLOUR: return m_inactive_caption_text_colour; - case wxAUI_ART_ACTIVE_CAPTION_COLOUR: return m_active_caption_colour; - case wxAUI_ART_ACTIVE_CAPTION_GRADIENT_COLOUR: return m_active_caption_gradient_colour; - case wxAUI_ART_ACTIVE_CAPTION_TEXT_COLOUR: return m_active_caption_text_colour; - case wxAUI_ART_BORDER_COLOUR: return m_border_pen.GetColour(); - case wxAUI_ART_GRIPPER_COLOUR: return m_gripper_brush.GetColour(); + case wxAUI_DOCKART_BACKGROUND_COLOUR: return m_background_brush.GetColour(); + case wxAUI_DOCKART_SASH_COLOUR: return m_sash_brush.GetColour(); + case wxAUI_DOCKART_INACTIVE_CAPTION_COLOUR: return m_inactive_caption_colour; + case wxAUI_DOCKART_INACTIVE_CAPTION_GRADIENT_COLOUR: return m_inactive_caption_gradient_colour; + case wxAUI_DOCKART_INACTIVE_CAPTION_TEXT_COLOUR: return m_inactive_caption_text_colour; + case wxAUI_DOCKART_ACTIVE_CAPTION_COLOUR: return m_active_caption_colour; + case wxAUI_DOCKART_ACTIVE_CAPTION_GRADIENT_COLOUR: return m_active_caption_gradient_colour; + case wxAUI_DOCKART_ACTIVE_CAPTION_TEXT_COLOUR: return m_active_caption_text_colour; + case wxAUI_DOCKART_BORDER_COLOUR: return m_border_pen.GetColour(); + case wxAUI_DOCKART_GRIPPER_COLOUR: return m_gripper_brush.GetColour(); default: wxFAIL_MSG(wxT("Invalid Metric Ordinal")); break; } @@ -372,16 +380,16 @@ void wxAuiDefaultDockArt::SetColour(int id, const wxColor& colour) { switch (id) { - case wxAUI_ART_BACKGROUND_COLOUR: m_background_brush.SetColour(colour); break; - case wxAUI_ART_SASH_COLOUR: m_sash_brush.SetColour(colour); break; - case wxAUI_ART_INACTIVE_CAPTION_COLOUR: m_inactive_caption_colour = colour; break; - case wxAUI_ART_INACTIVE_CAPTION_GRADIENT_COLOUR: m_inactive_caption_gradient_colour = colour; break; - case wxAUI_ART_INACTIVE_CAPTION_TEXT_COLOUR: m_inactive_caption_text_colour = colour; break; - case wxAUI_ART_ACTIVE_CAPTION_COLOUR: m_active_caption_colour = colour; break; - case wxAUI_ART_ACTIVE_CAPTION_GRADIENT_COLOUR: m_active_caption_gradient_colour = colour; break; - case wxAUI_ART_ACTIVE_CAPTION_TEXT_COLOUR: m_active_caption_text_colour = colour; break; - case wxAUI_ART_BORDER_COLOUR: m_border_pen.SetColour(colour); break; - case wxAUI_ART_GRIPPER_COLOUR: + case wxAUI_DOCKART_BACKGROUND_COLOUR: m_background_brush.SetColour(colour); break; + case wxAUI_DOCKART_SASH_COLOUR: m_sash_brush.SetColour(colour); break; + case wxAUI_DOCKART_INACTIVE_CAPTION_COLOUR: m_inactive_caption_colour = colour; break; + case wxAUI_DOCKART_INACTIVE_CAPTION_GRADIENT_COLOUR: m_inactive_caption_gradient_colour = colour; break; + case wxAUI_DOCKART_INACTIVE_CAPTION_TEXT_COLOUR: m_inactive_caption_text_colour = colour; break; + case wxAUI_DOCKART_ACTIVE_CAPTION_COLOUR: m_active_caption_colour = colour; break; + case wxAUI_DOCKART_ACTIVE_CAPTION_GRADIENT_COLOUR: m_active_caption_gradient_colour = colour; break; + case wxAUI_DOCKART_ACTIVE_CAPTION_TEXT_COLOUR: m_active_caption_text_colour = colour; break; + 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)); @@ -392,13 +400,13 @@ void wxAuiDefaultDockArt::SetColour(int id, const wxColor& colour) void wxAuiDefaultDockArt::SetFont(int id, const wxFont& font) { - if (id == wxAUI_ART_CAPTION_FONT) + if (id == wxAUI_DOCKART_CAPTION_FONT) m_caption_font = font; } wxFont wxAuiDefaultDockArt::GetFont(int id) { - if (id == wxAUI_ART_CAPTION_FONT) + if (id == wxAUI_DOCKART_CAPTION_FONT) return m_caption_font; return wxNullFont; } @@ -406,17 +414,13 @@ wxFont wxAuiDefaultDockArt::GetFont(int id) void wxAuiDefaultDockArt::DrawSash(wxDC& dc, wxWindow *window, int orientation, const wxRect& rect) { #if defined(__WXMAC__) + 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 +428,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 +450,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, @@ -502,7 +503,7 @@ void wxAuiDefaultDockArt::DrawBorder(wxDC& dc, wxWindow *WXUNUSED(window), const dc.SetBrush(*wxTRANSPARENT_BRUSH); wxRect rect = _rect; - int i, border_width = GetMetric(wxAUI_ART_PANE_BORDER_SIZE); + int i, border_width = GetMetric(wxAUI_DOCKART_PANE_BORDER_SIZE); if (pane.IsToolbar()) { @@ -536,7 +537,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 +560,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 +606,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 +675,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 +697,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 +732,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)));