X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9b3119232cd5a2c281283b4d7a730df9a4fc213d..af27647706cb7ca50cf04814ff867532919a252c:/src/gtk1/renderer.cpp diff --git a/src/gtk1/renderer.cpp b/src/gtk1/renderer.cpp index da41f34eba..beb39a217f 100644 --- a/src/gtk1/renderer.cpp +++ b/src/gtk1/renderer.cpp @@ -1,12 +1,12 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: gtk/renderer.cpp +// Name: src/gtk1/renderer.cpp // Purpose: implementation of wxRendererNative for wxGTK // Author: Vadim Zeitlin // Modified by: // Created: 20.07.2003 // RCS-ID: $Id$ // Copyright: (c) 2003 Vadim Zeitlin -// License: wxWindows license +// License: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -24,25 +24,21 @@ #pragma hdrstop #endif +#include "wx/renderer.h" + #ifndef WX_PRECOMP -#endif // WX_PRECOMP + #include "wx/window.h" + #include "wx/dc.h" +#endif #include -#include "wx/gtk/win_gtk.h" +#include "wx/gtk1/win_gtk.h" +#include "wx/gtk1/dcclient.h" -#include "wx/window.h" -#include "wx/dc.h" -#include "wx/renderer.h" - -#ifdef __WXGTK20__ - #include "wx/settings.h" -#endif // GTK 2.0 - -#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 @@ -57,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, @@ -76,7 +64,23 @@ public: wxOrientation orient, int flags = 0); + virtual void DrawComboBoxDropButton(wxWindow *win, + wxDC& dc, + 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 + static GtkWidget *GetButtonWidget(); }; // ============================================================================ @@ -91,6 +95,28 @@ 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; +} + // ---------------------------------------------------------------------------- // list/tree controls drawing // ---------------------------------------------------------------------------- @@ -102,103 +128,47 @@ 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 + dc.LogicalToDeviceX(rect.x) -1, rect.y -1, rect.width +2, rect.height +2 ); } -#ifdef __WXGTK20__ - -// draw a ">" or "v" button -// -// TODO: isn't there a GTK function to draw it? -void -wxRendererGTK::DrawTreeItemButton(wxWindow* WXUNUSED(win), - wxDC& dc, const wxRect& rect, int flags) -{ - dc.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT), - wxSOLID)); - dc.SetPen(*wxBLACK_PEN); - wxPoint button[3]; - - 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 // GTK 2.0 - // ---------------------------------------------------------------------------- // 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 = 10; +// the full sash width (should be even) +static const wxCoord SASH_SIZE = 8; - // margin around the sash - static const wxCoord SASH_MARGIN = 5; +// 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 ); } @@ -213,69 +183,79 @@ 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 ) { - // VZ: this happens on startup -- why? + // window not realized yet 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.height = size.y; + rect.width = full_size; + rect.height = h; + +#if USE_ERASE_RECT + erase_rect.x = position; + erase_rect.y = 0; + erase_rect.width = full_size; + erase_rect.height = h; +#endif } else // horz { + int w = win->GetClientSize().GetWidth(); + rect.x = 0; rect.y = position; - rect.height = SASH_FULL_SIZE; - rect.width = size.x; + rect.height = full_size; + rect.width = w; + +#if USE_ERASE_RECT + erase_rect.y = position; + erase_rect.x = 0; + erase_rect.height = full_size; + erase_rect.width = w; +#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 - // 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, GTK_PIZZA(win->m_wxwindow)->bin_window, GTK_STATE_NORMAL, GTK_SHADOW_NONE, - &rect, + NULL, win->m_wxwindow, - (char *)"base", // const_cast - 0, 0, -1, -1 + (char *)"viewportbin", // const_cast + erase_rect.x, + erase_rect.y, + erase_rect.width, + erase_rect.height ); +#endif // leave some margin before sash itself @@ -314,6 +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::DrawDropArrow(wxWindow *WXUNUSED(win), + wxDC& dc, + const wxRect& rect, + int flags) +{ + 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" ); + + GdkWindow* gdk_window = impl->GetGDKWindow(); + + // 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_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 + ( + button->style, + gdk_window, + state, + flags & wxCONTROL_PRESSED ? GTK_SHADOW_IN : GTK_SHADOW_OUT, + NULL, + button, + "arrow", + GTK_ARROW_DOWN, + FALSE, + rect.x + arrowX, + rect.y + arrowY, + arrowWidth, + arrowHeight + ); +} + +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 + ( + button->style, + gdk_window, + state, + flags & wxCONTROL_PRESSED ? GTK_SHADOW_IN : GTK_SHADOW_OUT, + NULL, + button, + "button", + rect.x, rect.y, rect.width, rect.height + ); + + // draw arrow on button + DrawDropArrow(win,dc,rect,flags); + +}