X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e1befae3d2ab8897c5bfd1d0d3beb1ef20da567e..e8d9821d754585e579a0a7e9aeb2fd7913706d05:/src/gtk1/renderer.cpp?ds=sidebyside diff --git a/src/gtk1/renderer.cpp b/src/gtk1/renderer.cpp index 143c284dc0..beb39a217f 100644 --- a/src/gtk1/renderer.cpp +++ b/src/gtk1/renderer.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: gtk/renderer.cpp +// Name: src/gtk1/renderer.cpp // Purpose: implementation of wxRendererNative for wxGTK // Author: Vadim Zeitlin // Modified by: @@ -25,22 +25,20 @@ #endif #include "wx/renderer.h" -#include -#include "wx/gtk/win_gtk.h" -#include "wx/window.h" -#include "wx/dc.h" -#include "wx/dcclient.h" +#ifndef WX_PRECOMP + #include "wx/window.h" + #include "wx/dc.h" +#endif -#ifdef __WXGTK20__ - #include "wx/settings.h" -#endif // GTK 2.0 +#include +#include "wx/gtk1/win_gtk.h" +#include "wx/gtk1/dcclient.h" -#ifdef __WXGTK20__ - #define WXUNUSED_IN_GTK1(arg) arg -#else - #define WXUNUSED_IN_GTK1(arg) -#endif +// 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 so USE_ERASE_RECT=0 +#define USE_ERASE_RECT 0 // ---------------------------------------------------------------------------- // wxRendererGTK: our wxRendererNative implementation @@ -55,14 +53,6 @@ public: const wxRect& rect, int flags = 0); -#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, const wxRect& rect, @@ -79,11 +69,18 @@ public: const wxRect& rect, int flags = 0); + virtual void DrawDropArrow(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 - void PrepareButtonDraw(); + static GtkWidget *GetButtonWidget(); }; // ============================================================================ @@ -99,24 +96,25 @@ wxRendererNative& wxRendererNative::GetDefault() } // ---------------------------------------------------------------------------- -// common code +// helper functions // ---------------------------------------------------------------------------- -static GtkWidget *gs_button = NULL; -static GtkWidget *gs_window = NULL; - -void -wxRendererGTK::PrepareButtonDraw() +GtkWidget * +wxRendererGTK::GetButtonWidget() { - // prepares gs_button and gs_window which are used when - // drawing button based elements. - wxASSERT ( !gs_button ); - - gs_window = gtk_window_new( GTK_WINDOW_POPUP ); - gtk_widget_realize( gs_window ); - gs_button = gtk_button_new(); - gtk_container_add( GTK_CONTAINER(gs_window), gs_button ); - gtk_widget_realize( gs_button ); + 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; } // ---------------------------------------------------------------------------- @@ -130,107 +128,47 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win, int flags) { - if (gs_button == NULL) - PrepareButtonDraw(); + GtkWidget *button = GetButtonWidget(); gtk_paint_box ( - gs_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, - gs_button, + button, "button", - dc.XLOG2DEV(rect.x) -1, rect.y -1, rect.width +2, rect.height +2 + dc.LogicalToDeviceX(rect.x) -1, rect.y -1, rect.width +2, rect.height +2 ); } -#ifdef __WXGTK20__ - -// draw a ">" or "v" button -// -// TODO: replace the code below with gtk_paint_expander() -void -wxRendererGTK::DrawTreeItemButton(wxWindow* win, - wxDC& dc, const wxRect& rect, int flags) -{ -#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 ); - - // 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 ); -} - -#endif // __WXGTK20__ - // ---------------------------------------------------------------------------- // splitter sash drawing // ---------------------------------------------------------------------------- -// all this should probably be read from the current theme settings somehow? -#ifdef __WXGTK20__ - // the full sash size - static const wxCoord SASH_FULL_SIZE = 5; -#else // GTK+ 1.x - // the full sash width (should be even) - static const wxCoord SASH_SIZE = 8; +// the full sash width (should be even) +static const wxCoord SASH_SIZE = 8; - // margin around the sash - static const wxCoord SASH_MARGIN = 2; +// margin around the sash +static const wxCoord SASH_MARGIN = 2; - // the full sash size - static const wxCoord SASH_FULL_SIZE = SASH_SIZE + SASH_MARGIN; -#endif // GTK+ 2.x/1.x +static int GetGtkSplitterFullSize() +{ + return SASH_SIZE + SASH_MARGIN; +} wxSplitterRenderParams -wxRendererGTK::GetSplitterParams(const wxWindow * WXUNUSED(win)) +wxRendererGTK::GetSplitterParams(const wxWindow *WXUNUSED(win)) { // we don't draw any border, hence 0 for the second field return wxSplitterRenderParams ( - SASH_FULL_SIZE, + GetGtkSplitterFullSize(), 0, -#ifdef __WXGTK20__ - true // hot sensitive -#else // GTK+ 1.x false // not -#endif // GTK+ 2.x/1.x ); } @@ -245,11 +183,11 @@ wxRendererGTK::DrawSplitterBorder(wxWindow * WXUNUSED(win), void wxRendererGTK::DrawSplitterSash(wxWindow *win, - wxDC& dc, + wxDC& WXUNUSED(dc), const wxSize& size, wxCoord position, wxOrientation orient, - int WXUNUSED_IN_GTK1(flags)) + int WXUNUSED(flags)) { if ( !win->m_wxwindow->window ) { @@ -257,24 +195,31 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win, return; } + wxCoord full_size = GetGtkSplitterFullSize(); + // are we drawing vertical or horizontal splitter? const bool isVert = orient == wxVERTICAL; GdkRectangle rect; +#if USE_ERASE_RECT GdkRectangle erase_rect; +#endif + if ( isVert ) { int h = win->GetClientSize().GetHeight(); rect.x = position; rect.y = 0; - rect.width = SASH_FULL_SIZE; + rect.width = full_size; rect.height = h; +#if USE_ERASE_RECT erase_rect.x = position; erase_rect.y = 0; - erase_rect.width = SASH_FULL_SIZE; + erase_rect.width = full_size; erase_rect.height = h; +#endif } else // horz { @@ -282,19 +227,20 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win, rect.x = 0; rect.y = position; - rect.height = SASH_FULL_SIZE; + rect.height = full_size; rect.width = w; +#if USE_ERASE_RECT erase_rect.y = position; erase_rect.x = 0; - erase_rect.height = SASH_FULL_SIZE; + erase_rect.height = full_size; erase_rect.width = w; +#endif } - // we must erase everything first, otherwise the garbage from the old sash - // is left when dragging it - // - // TODO: is this the right way to draw themed background? +#if USE_ERASE_RECT + // 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, @@ -303,30 +249,14 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win, GTK_SHADOW_NONE, NULL, win->m_wxwindow, - (char *)"base", // const_cast + (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, - flags & wxCONTROL_CURRENT ? GTK_STATE_PRELIGHT : GTK_STATE_NORMAL, - GTK_SHADOW_NONE, - NULL /* no clipping */, - win->m_wxwindow, - "paned", - rect.x, - rect.y, - rect.width, - rect.height, - !isVert ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL - ); -#else // GTK+ 1.x // leave some margin before sash itself position += SASH_MARGIN / 2; @@ -364,61 +294,105 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win, isVert ? size.y - 2*SASH_SIZE : position, SASH_SIZE, SASH_SIZE ); -#endif // GTK+ 2.x/1.x } -void wxRendererGTK::DrawComboBoxDropButton(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags) +void +wxRendererGTK::DrawDropArrow(wxWindow *WXUNUSED(win), + wxDC& dc, + const wxRect& rect, + int flags) { - if (gs_button == NULL) - PrepareButtonDraw(); + GtkWidget *button = GetButtonWidget(); + + // 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. + wxWindowDCImpl * const impl = wxDynamicCast(dc.GetImpl(), wxWindowDCImpl); + wxCHECK_RET( impl, "must have a window DC" ); - // device context must inherit from wxWindowDC - // (so it must be wxClientDC, wxMemoryDC or wxPaintDC) - wxWindowDC& wdc = (wxWindowDC&)dc; + GdkWindow* gdk_window = impl->GetGDKWindow(); - // only doing debug-time checking here (it should probably be enough) - wxASSERT ( wdc.IsKindOf(CLASSINFO(wxWindowDC)) ); + // 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); 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; - gtk_paint_box + // draw arrow on button + gtk_paint_arrow ( - gs_button->style, - //GTK_PIZZA(wdc->m_window)->bin_window, - wdc.m_window, + button->style, + gdk_window, state, - GTK_SHADOW_NONE, + flags & wxCONTROL_PRESSED ? GTK_SHADOW_IN : GTK_SHADOW_OUT, NULL, - gs_button, - "button", - rect.x, rect.y, rect.width, rect.height + button, + "arrow", + GTK_ARROW_DOWN, + FALSE, + rect.x + arrowX, + rect.y + arrowY, + arrowWidth, + arrowHeight ); +} - // draw arrow on button - gtk_paint_arrow +void +wxRendererGTK::DrawComboBoxDropButton(wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags) +{ + GtkWidget *button = GetButtonWidget(); + + // for reason why we do this, see DrawDropArrow + wxWindowDCImpl * const impl = wxDynamicCast(dc.GetImpl(), wxWindowDCImpl); + wxCHECK_RET( impl, "must have a window DC" ); + + GdkWindow* gdk_window = impl->GetGDKWindow(); + + // draw button + 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_box ( - gs_button->style, - //GTK_PIZZA(wdc->m_window)->bin_window, - wdc.m_window, + button->style, + gdk_window, state, flags & wxCONTROL_PRESSED ? GTK_SHADOW_IN : GTK_SHADOW_OUT, NULL, - gs_button, - "arrow", - GTK_ARROW_DOWN, - TRUE, - rect.x + 1, rect.y + 1, rect.width - 2, rect.height - 2 + button, + "button", + rect.x, rect.y, rect.width, rect.height ); -} + // draw arrow on button + DrawDropArrow(win,dc,rect,flags); +}