X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0100b858d6064139180fdf8dc00cbffc1cdae260..f281f29f89a06dffd4a9357623e4d7a247419dc9:/src/gtk/renderer.cpp?ds=inline diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp index aa02feb193..1094858d74 100644 --- a/src/gtk/renderer.cpp +++ b/src/gtk/renderer.cpp @@ -24,15 +24,13 @@ #pragma hdrstop #endif -#ifndef WX_PRECOMP -#endif // WX_PRECOMP - +#include "wx/renderer.h" #include #include "wx/gtk/win_gtk.h" #include "wx/window.h" #include "wx/dc.h" -#include "wx/renderer.h" +#include "wx/dcclient.h" #ifdef __WXGTK20__ #include "wx/settings.h" @@ -63,7 +61,7 @@ public: wxDC& dc, const wxRect& rect, int flags = 0); -#endif // GTK 2.0 +#endif // GTK+ 2.0 virtual void DrawSplitterBorder(wxWindow *win, wxDC& dc, @@ -76,7 +74,23 @@ public: wxOrientation orient, int flags = 0); + virtual void DrawComboBoxDropButton(wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags = 0); + virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win); + +private: + // FIXME: shouldn't we destroy these windows somewhere? + + // used by DrawHeaderButton and DrawComboBoxDropButton + static GtkWidget *GetButtonWidget(); + +#ifdef __WXGTK20__ + // used by DrawTreeItemButton() + static GtkWidget *GetTreeWidget(); +#endif // GTK+ 2.0 }; // ============================================================================ @@ -91,6 +105,50 @@ wxRendererNative& wxRendererNative::GetDefault() return s_rendererGTK; } +// ---------------------------------------------------------------------------- +// helper functions +// ---------------------------------------------------------------------------- + +GtkWidget * +wxRendererGTK::GetButtonWidget() +{ + static GtkWidget *s_button = NULL; + static GtkWidget *s_window = NULL; + + if ( !s_button ) + { + s_window = gtk_window_new( GTK_WINDOW_POPUP ); + gtk_widget_realize( s_window ); + s_button = gtk_button_new(); + gtk_container_add( GTK_CONTAINER(s_window), s_button ); + gtk_widget_realize( s_button ); + } + + return s_button; +} + +#ifdef __WXGTK20__ + +GtkWidget * +wxRendererGTK::GetTreeWidget() +{ + static GtkWidget *s_tree = NULL; + static GtkWidget *s_window = NULL; + + if ( !s_tree ) + { + s_tree = gtk_tree_view_new(); + s_window = gtk_window_new( GTK_WINDOW_POPUP ); + gtk_widget_realize( s_window ); + gtk_container_add( GTK_CONTAINER(s_window), s_tree ); + gtk_widget_realize( s_tree ); + } + + return s_tree; +} + +#endif // GTK+ 2.0 + // ---------------------------------------------------------------------------- // list/tree controls drawing // ---------------------------------------------------------------------------- @@ -102,25 +160,18 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win, int flags) { - static GtkWidget *s_button = NULL; - static GtkWidget *s_window = NULL; - if (s_button == NULL) - { - s_window = gtk_window_new( GTK_WINDOW_POPUP ); - gtk_widget_realize( s_window ); - s_button = gtk_button_new(); - gtk_container_add( GTK_CONTAINER(s_window), s_button ); - gtk_widget_realize( s_button ); - } + GtkWidget *button = GetButtonWidget(); gtk_paint_box ( - s_button->style, + button->style, + // FIXME: I suppose GTK_PIZZA(win->m_wxwindow)->bin_window doesn't work with wxMemoryDC. + // Maybe use code similar as in DrawComboBoxDropButton below? GTK_PIZZA(win->m_wxwindow)->bin_window, flags & wxCONTROL_DISABLED ? GTK_STATE_INSENSITIVE : GTK_STATE_NORMAL, GTK_SHADOW_OUT, - NULL, - s_button, + NULL, + button, "button", dc.XLOG2DEV(rect.x) -1, rect.y -1, rect.width +2, rect.height +2 ); @@ -129,107 +180,30 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win, #ifdef __WXGTK20__ // draw a ">" or "v" button -// -// TODO: isn't there a GTK function to draw it? void wxRendererGTK::DrawTreeItemButton(wxWindow* win, wxDC& dc, const wxRect& rect, int flags) { -#if 1 - -#define PM_SIZE 8 - - GtkPizza *pizza = GTK_PIZZA( win->m_wxwindow ); - GtkStyle *style = win->m_widget->style; - int x = rect.x; - int y = rect.y; - y = dc.LogicalToDeviceY( y ); - x = dc.LogicalToDeviceX( x ); - -#if 1 - // This draws the GTK+ 2.2.4 triangle - x--; - GdkPoint points[3]; - - if ( flags & wxCONTROL_EXPANDED ) - { - points[0].x = x; - points[0].y = y + (PM_SIZE + 2) / 6; - points[1].x = points[0].x + (PM_SIZE + 2); - points[1].y = points[0].y; - points[2].x = (points[0].x + (PM_SIZE + 2) / 2); - points[2].y = y + 2 * (PM_SIZE + 2) / 3; - } - else - { - points[0].x = x + ((PM_SIZE + 2) / 6 + 2); - points[0].y = y - 1; - points[1].x = points[0].x; - points[1].y = points[0].y + (PM_SIZE + 2); - points[2].x = (points[0].x + - (2 * (PM_SIZE + 2) / 3 - 1)); - points[2].y = points[0].y + (PM_SIZE + 2) / 2; - } - - if ( flags & wxCONTROL_CURRENT ) - gdk_draw_polygon( pizza->bin_window, style->fg_gc[GTK_STATE_PRELIGHT], TRUE, points, 3); - else - gdk_draw_polygon( pizza->bin_window, style->base_gc[GTK_STATE_NORMAL], TRUE, points, 3); - gdk_draw_polygon( pizza->bin_window, style->fg_gc[GTK_STATE_NORMAL], FALSE, points, 3 ); -#else - // this draws the GTK+ 2.2.3 tree item square - gdk_draw_rectangle( pizza->bin_window, - style->base_gc[GTK_STATE_NORMAL], TRUE, - x, y, PM_SIZE, PM_SIZE); - gdk_draw_rectangle( pizza->bin_window, - style->fg_gc[GTK_STATE_NORMAL], FALSE, - x, y, PM_SIZE, PM_SIZE); - - gdk_draw_line( pizza->bin_window, style->fg_gc[GTK_STATE_NORMAL], - x + 2, y + PM_SIZE / 2, x + PM_SIZE - 2, y + PM_SIZE / 2); - - if ( flags & wxCONTROL_EXPANDED ) - { - gdk_draw_line( pizza->bin_window, style->fg_gc[GTK_STATE_NORMAL], - x + PM_SIZE / 2, y + 2, - x + PM_SIZE / 2, y + PM_SIZE - 2); - } -#endif - - -#else - dc.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT), - wxSOLID)); - dc.SetPen(*wxBLACK_PEN); - wxPoint button[3]; + GtkWidget *tree = GetTreeWidget(); - const wxCoord xMiddle = rect.x + rect.width/2; - const wxCoord yMiddle = rect.y + rect.height/2; - - if ( flags & wxCONTROL_EXPANDED ) - { - button[0].x = rect.GetLeft(); - button[0].y = yMiddle - 2; - button[1].x = rect.GetRight(); - button[1].y = yMiddle - 2; - button[2].x = xMiddle; - button[2].y = yMiddle + 3; - } - else // collapsed - { - button[0].y = rect.GetBottom(); - button[0].x = xMiddle - 2; - button[1].y = rect.GetTop(); - button[1].x = xMiddle - 2; - button[2].y = yMiddle; - button[2].x = xMiddle + 3; - } - - dc.DrawPolygon(3, button); -#endif + // VZ: I don't know how to get the size of the expander so as to centre it + // in the given rectangle, +2/3 below is just what looks good here... + gtk_paint_expander + ( + tree->style, + GTK_PIZZA(win->m_wxwindow)->bin_window, + GTK_STATE_NORMAL, + NULL, + tree, + "treeview", + dc.LogicalToDeviceX(rect.x) + 2, + dc.LogicalToDeviceY(rect.y) + 3, + flags & wxCONTROL_EXPANDED ? GTK_EXPANDER_EXPANDED + : GTK_EXPANDER_COLLAPSED + ); } -#endif // GTK 2.0 +#endif // GTK+ 2.0 // ---------------------------------------------------------------------------- // splitter sash drawing @@ -297,12 +271,12 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win, if ( isVert ) { int h = win->GetClientSize().GetHeight(); - + rect.x = position; rect.y = 0; rect.width = SASH_FULL_SIZE; rect.height = h; - + erase_rect.x = position; erase_rect.y = 0; erase_rect.width = SASH_FULL_SIZE; @@ -311,12 +285,12 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win, else // horz { int w = win->GetClientSize().GetWidth(); - + rect.x = 0; rect.y = position; rect.height = SASH_FULL_SIZE; rect.width = w; - + erase_rect.y = position; erase_rect.x = 0; erase_rect.height = SASH_FULL_SIZE; @@ -356,7 +330,7 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win, rect.y, rect.width, rect.height, - isVert ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL + !isVert ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL ); #else // GTK+ 1.x @@ -399,3 +373,42 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win, #endif // GTK+ 2.x/1.x } +void wxRendererGTK::DrawComboBoxDropButton(wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags) +{ + GtkWidget *button = GetButtonWidget(); + + // device context must inherit from wxWindowDC + // (so it must be wxClientDC, wxMemoryDC or wxPaintDC) + wxWindowDC& wdc = (wxWindowDC&)dc; + + // only doing debug-time checking here (it should probably be enough) + wxASSERT ( wdc.IsKindOf(CLASSINFO(wxWindowDC)) ); + + GtkStateType state; + + if ( flags & wxCONTROL_CURRENT ) + state = GTK_STATE_PRELIGHT; + else if ( flags & wxCONTROL_DISABLED ) + state = GTK_STATE_INSENSITIVE; + else + state = GTK_STATE_NORMAL; + + // draw arrow on button + gtk_paint_arrow + ( + button->style, + wdc.m_window, + state, + flags & wxCONTROL_PRESSED ? GTK_SHADOW_IN : GTK_SHADOW_OUT, + NULL, + button, + "arrow", + GTK_ARROW_DOWN, + FALSE, + rect.x + 1, rect.y + 1, rect.width - 2, rect.height - 2 + ); +} +