X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/384188277daa21729884bf3818e6ec4f6bb027cd..eec960fa8987d15fd87e249c8441474188124425:/src/gtk/renderer.cpp diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp index baae5fe61b..2802f9274a 100644 --- a/src/gtk/renderer.cpp +++ b/src/gtk/renderer.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: gtk/renderer.cpp +// Name: src/gtk/renderer.cpp // Purpose: implementation of wxRendererNative for wxGTK // Author: Vadim Zeitlin // Modified by: @@ -25,23 +25,16 @@ #endif #include "wx/renderer.h" -#include -#include "wx/gtk/win_gtk.h" - -#include "wx/window.h" -#include "wx/dc.h" -#include "wx/dcclient.h" -#ifdef __WXGTK20__ +#ifndef WX_PRECOMP + #include "wx/window.h" + #include "wx/dcclient.h" #include "wx/settings.h" -#endif // GTK 2.0 - -#ifdef __WXGTK20__ - #define WXUNUSED_IN_GTK1(arg) arg -#else - #define WXUNUSED_IN_GTK1(arg) #endif +#include +#include "wx/gtk/win_gtk.h" + // ---------------------------------------------------------------------------- // wxRendererGTK: our wxRendererNative implementation // ---------------------------------------------------------------------------- @@ -53,15 +46,15 @@ public: virtual void DrawHeaderButton(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0); + int flags = 0, + wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE, + wxHeaderButtonParams* params = NULL); -#ifdef __WXGTK20__ // draw the expanded/collapsed icon for a tree control item virtual void DrawTreeItemButton(wxWindow *win, wxDC& dc, const wxRect& rect, int flags = 0); -#endif // GTK+ 2.0 virtual void DrawSplitterBorder(wxWindow *win, wxDC& dc, @@ -79,18 +72,39 @@ public: const wxRect& rect, int flags = 0); + virtual void DrawDropArrow(wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags = 0); + + virtual void DrawCheckBox(wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags = 0); + + virtual void DrawPushButton(wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags = 0); + + virtual void DrawItemSelectionRect(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 + // used by DrawHeaderButton and DrawPushButton static GtkWidget *GetButtonWidget(); -#ifdef __WXGTK20__ // used by DrawTreeItemButton() static GtkWidget *GetTreeWidget(); -#endif // GTK+ 2.0 + + // used by DrawCheckBox() + static GtkWidget *GetCheckButtonWidget(); }; // ============================================================================ @@ -127,7 +141,23 @@ wxRendererGTK::GetButtonWidget() return s_button; } -#ifdef __WXGTK20__ +GtkWidget * +wxRendererGTK::GetCheckButtonWidget() +{ + 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_check_button_new(); + gtk_container_add( GTK_CONTAINER(s_window), s_button ); + gtk_widget_realize( s_button ); + } + + return s_button; +} GtkWidget * wxRendererGTK::GetTreeWidget() @@ -147,8 +177,6 @@ wxRendererGTK::GetTreeWidget() return s_tree; } -#endif // GTK+ 2.0 - // ---------------------------------------------------------------------------- // list/tree controls drawing // ---------------------------------------------------------------------------- @@ -157,27 +185,35 @@ void wxRendererGTK::DrawHeaderButton(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags) + int flags, + wxHeaderSortIconType sortArrow, + wxHeaderButtonParams* params) { GtkWidget *button = GetButtonWidget(); + GdkWindow* gdk_window = dc.GetGDKWindow(); + wxASSERT_MSG( gdk_window, + wxT("cannot use wxRendererNative on wxDC of this type") ); + + int x_diff = 0; + if (win->GetLayoutDirection() == wxLayout_RightToLeft) + x_diff = rect.width; + gtk_paint_box ( 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, + gdk_window, flags & wxCONTROL_DISABLED ? GTK_STATE_INSENSITIVE : GTK_STATE_NORMAL, GTK_SHADOW_OUT, NULL, button, "button", - dc.XLOG2DEV(rect.x) -1, rect.y -1, rect.width +2, rect.height +2 + dc.LogicalToDeviceX(rect.x) - x_diff, rect.y, rect.width, rect.height ); -} -#ifdef __WXGTK20__ + DrawHeaderButtonContents(win, dc, rect, flags, sortArrow, params); +} // draw a ">" or "v" button void @@ -186,57 +222,52 @@ wxRendererGTK::DrawTreeItemButton(wxWindow* win, { GtkWidget *tree = GetTreeWidget(); + GdkWindow* gdk_window = dc.GetGDKWindow(); + wxASSERT_MSG( gdk_window, + wxT("cannot use wxRendererNative on wxDC of this type") ); + GtkStateType state; if ( flags & wxCONTROL_CURRENT ) state = GTK_STATE_PRELIGHT; else state = GTK_STATE_NORMAL; - + + int x_diff = 0; + if (win->GetLayoutDirection() == wxLayout_RightToLeft) + x_diff = rect.width; + // 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, + gdk_window, state, NULL, tree, "treeview", - dc.LogicalToDeviceX(rect.x) + 2, + dc.LogicalToDeviceX(rect.x) + 6 - x_diff, dc.LogicalToDeviceY(rect.y) + 3, flags & wxCONTROL_EXPANDED ? GTK_EXPANDER_EXPANDED : GTK_EXPANDER_COLLAPSED ); } -#endif // GTK+ 2.0 // ---------------------------------------------------------------------------- // splitter sash drawing // ---------------------------------------------------------------------------- -#ifndef __WXGTK20__ - // the full sash width (should be even) - static const wxCoord SASH_SIZE = 8; - - // margin around the sash - static const wxCoord SASH_MARGIN = 2; -#endif // GTK+ 2.x/1.x - static int GetGtkSplitterFullSize() { -#ifdef __WXGTK20__ static GtkWidget *s_paned = NULL; if (s_paned == NULL) s_paned = gtk_vpaned_new(); gint handle_size; gtk_widget_style_get (s_paned, "handle_size", &handle_size, NULL); - + return handle_size; -#else - return SASH_SIZE + SASH_MARGIN; -#endif } wxSplitterRenderParams @@ -247,11 +278,7 @@ wxRendererGTK::GetSplitterParams(const wxWindow *WXUNUSED(win)) ( GetGtkSplitterFullSize(), 0, -#ifdef __WXGTK20__ true // hot sensitive -#else // GTK+ 1.x - false // not -#endif // GTK+ 2.x/1.x ); } @@ -270,21 +297,25 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win, const wxSize& size, wxCoord position, wxOrientation orient, - int WXUNUSED_IN_GTK1(flags)) + int flags) { if ( !win->m_wxwindow->window ) { // window not realized yet return; } - + + GdkWindow* gdk_window = dc.GetGDKWindow(); + wxASSERT_MSG( gdk_window, + wxT("cannot use wxRendererNative on wxDC of this type") ); + wxCoord full_size = GetGtkSplitterFullSize(); // are we drawing vertical or horizontal splitter? const bool isVert = orient == wxVERTICAL; GdkRectangle rect; - GdkRectangle erase_rect; + if ( isVert ) { int h = win->GetClientSize().GetHeight(); @@ -293,11 +324,6 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win, rect.y = 0; rect.width = full_size; rect.height = h; - - erase_rect.x = position; - erase_rect.y = 0; - erase_rect.width = full_size; - erase_rect.height = h; } else // horz { @@ -307,129 +333,208 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win, rect.y = position; rect.height = full_size; rect.width = w; - - erase_rect.y = position; - erase_rect.x = 0; - erase_rect.height = full_size; - erase_rect.width = w; } + + int x_diff = 0; + if (win->GetLayoutDirection() == wxLayout_RightToLeft) + x_diff = rect.width; -#if 0 - // RR: After a correction to the orientation of the sash - // this doesn't seem to be required anymore and it - // seems to confuse some themes - - // we must erase everything first, otherwise the garbage - // from the old sash is left when dragging it - gtk_paint_flat_box - ( - win->m_wxwindow->style, - GTK_PIZZA(win->m_wxwindow)->bin_window, - GTK_STATE_NORMAL, - GTK_SHADOW_NONE, - NULL, - win->m_wxwindow, - (char *)"viewportbin", // const_cast - erase_rect.x, - erase_rect.y, - erase_rect.width, - erase_rect.height - ); -#endif - -#ifdef __WXGTK20__ gtk_paint_handle ( win->m_wxwindow->style, - GTK_PIZZA(win->m_wxwindow)->bin_window, + gdk_window, flags & wxCONTROL_CURRENT ? GTK_STATE_PRELIGHT : GTK_STATE_NORMAL, GTK_SHADOW_NONE, NULL /* no clipping */, win->m_wxwindow, "paned", - rect.x, - rect.y, + dc.LogicalToDeviceX(rect.x) - x_diff, + dc.LogicalToDeviceY(rect.y), rect.width, rect.height, isVert ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL ); -#else // GTK+ 1.x +} + +void +wxRendererGTK::DrawDropArrow(wxWindow *WXUNUSED(win), + wxDC& dc, + const wxRect& rect, + int flags) +{ + GtkWidget *button = GetButtonWidget(); - // leave some margin before sash itself - position += SASH_MARGIN / 2; + // If we give GTK_PIZZA(win->m_wxwindow)->bin_window as + // a window for gtk_paint_xxx function, then it won't + // work for wxMemoryDC. So that is why we assume wxDC + // is wxWindowDC (wxClientDC, wxMemoryDC and wxPaintDC + // are derived from it) and use its m_window. + GdkWindow* gdk_window = dc.GetGDKWindow(); + wxASSERT_MSG( gdk_window, + wxT("cannot use wxRendererNative on wxDC of this type") ); + + // draw arrow so that there is even space horizontally + // on both sides + int arrowX = rect.width/4 + 1; + int arrowWidth = rect.width - (arrowX*2); + + // scale arrow's height accoording to the width + int arrowHeight = rect.width/3; + int arrowY = (rect.height-arrowHeight)/2 + + ((rect.height-arrowHeight) & 1); - // and finally draw it using GTK paint functions - typedef void (*GtkPaintLineFunc)(GtkStyle *, GdkWindow *, - GtkStateType, - GdkRectangle *, GtkWidget *, - gchar *, - gint, gint, gint); + GtkStateType state; - GtkPaintLineFunc func = isVert ? gtk_paint_vline : gtk_paint_hline; + if ( flags & wxCONTROL_PRESSED ) + state = GTK_STATE_ACTIVE; + else if ( flags & wxCONTROL_DISABLED ) + state = GTK_STATE_INSENSITIVE; + else if ( flags & wxCONTROL_CURRENT ) + state = GTK_STATE_PRELIGHT; + else + state = GTK_STATE_NORMAL; - (*func) + // draw arrow on button + gtk_paint_arrow ( - win->m_wxwindow->style, - GTK_PIZZA(win->m_wxwindow)->bin_window, - GTK_STATE_NORMAL, + button->style, + gdk_window, + state, + flags & wxCONTROL_PRESSED ? GTK_SHADOW_IN : GTK_SHADOW_OUT, NULL, - win->m_wxwindow, - (char *)"paned", // const_cast - 0, isVert ? size.y : size.x, position + SASH_SIZE / 2 - 1 + button, + "arrow", + GTK_ARROW_DOWN, + FALSE, + rect.x + arrowX, + rect.y + arrowY, + arrowWidth, + arrowHeight ); +} - gtk_paint_box +void +wxRendererGTK::DrawComboBoxDropButton(wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags) +{ + DrawPushButton(win,dc,rect,flags); + DrawDropArrow(win,dc,rect); +} + +void +wxRendererGTK::DrawCheckBox(wxWindow *WXUNUSED(win), + wxDC& dc, + const wxRect& rect, + int flags ) +{ + GtkWidget *button = GetCheckButtonWidget(); + + // for reason why we do this, see DrawDropArrow + GdkWindow* gdk_window = dc.GetGDKWindow(); + wxASSERT_MSG( gdk_window, + wxT("cannot use wxRendererNative on wxDC of this type") ); + + GtkStateType state; + + if ( flags & wxCONTROL_PRESSED ) + state = GTK_STATE_ACTIVE; + else if ( flags & wxCONTROL_DISABLED ) + state = GTK_STATE_INSENSITIVE; + else if ( flags & wxCONTROL_CURRENT ) + state = GTK_STATE_PRELIGHT; + else + state = GTK_STATE_NORMAL; + + gtk_paint_check ( - win->m_wxwindow->style, - GTK_PIZZA(win->m_wxwindow)->bin_window, - GTK_STATE_NORMAL, - GTK_SHADOW_OUT, - (GdkRectangle*) NULL, - win->m_wxwindow, - (char *)"paned", // const_cast - isVert ? position : size.x - 2*SASH_SIZE, - isVert ? size.y - 2*SASH_SIZE : position, - SASH_SIZE, SASH_SIZE + button->style, + gdk_window, + state, + flags & wxCONTROL_CHECKED ? GTK_SHADOW_IN : GTK_SHADOW_OUT, + NULL, + button, + "cellcheck", + dc.LogicalToDeviceX(rect.x)+2, + dc.LogicalToDeviceY(rect.y)+3, + 13, 13 ); -#endif // GTK+ 2.x/1.x } -void wxRendererGTK::DrawComboBoxDropButton(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags) +void +wxRendererGTK::DrawPushButton(wxWindow *WXUNUSED(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)) ); + // for reason why we do this, see DrawDropArrow + GdkWindow* gdk_window = dc.GetGDKWindow(); + wxASSERT_MSG( gdk_window, + wxT("cannot use wxRendererNative on wxDC of this type") ); + // draw button GtkStateType state; - if ( flags & wxCONTROL_CURRENT ) - state = GTK_STATE_PRELIGHT; + if ( flags & wxCONTROL_PRESSED ) + state = GTK_STATE_ACTIVE; else if ( flags & wxCONTROL_DISABLED ) state = GTK_STATE_INSENSITIVE; + else if ( flags & wxCONTROL_CURRENT ) + state = GTK_STATE_PRELIGHT; else state = GTK_STATE_NORMAL; - // draw arrow on button - gtk_paint_arrow + gtk_paint_box ( button->style, - wdc.m_window, + gdk_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 + "button", + rect.x, rect.y, rect.width, rect.height ); } +void +wxRendererGTK::DrawItemSelectionRect(wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags ) +{ + GdkWindow* gdk_window = dc.GetGDKWindow(); + wxASSERT_MSG( gdk_window, + wxT("cannot use wxRendererNative on wxDC of this type") ); + + GtkStateType state; + if (flags & wxCONTROL_SELECTED) + { + if (flags & wxCONTROL_FOCUSED) + state = GTK_STATE_SELECTED; + else + state = GTK_STATE_INSENSITIVE; + + gtk_paint_flat_box( win->m_wxwindow->style, + gdk_window, + state, + GTK_SHADOW_NONE, + NULL, + win->m_wxwindow, + "treeview", + dc.LogicalToDeviceX(rect.x), + dc.LogicalToDeviceY(rect.y), + rect.width, + rect.height ); + } + + if (flags & wxCONTROL_CURRENT) + { + dc.SetPen( *wxBLACK_PEN ); + dc.SetBrush( *wxTRANSPARENT_BRUSH ); + dc.DrawRectangle( rect ); + } +}