X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/95155e752c80e957bc2df39c44dce2853f7ce1f2..eed9e4791274d68ea1fb0c556bf3199ecf88a7d9:/src/gtk1/renderer.cpp

diff --git a/src/gtk1/renderer.cpp b/src/gtk1/renderer.cpp
index 2c16c49654..7e8587f80d 100644
--- a/src/gtk1/renderer.cpp
+++ b/src/gtk1/renderer.cpp
@@ -38,6 +38,12 @@
     #include "wx/settings.h"
 #endif // GTK 2.0
 
+#ifdef __WXGTK20__
+    #define WXUNUSED_IN_GTK1(arg) arg
+#else
+    #define WXUNUSED_IN_GTK1(arg)
+#endif
+
 // ----------------------------------------------------------------------------
 // wxRendererGTK: our wxRendererNative implementation
 // ----------------------------------------------------------------------------
@@ -59,15 +65,18 @@ public:
                                     int flags = 0);
 #endif // GTK 2.0
 
-    // draw a (vertical) sash
-    //
-    // VZ: doesn't work -- nothing is shown on screen, why?
-#if 0
+    virtual void DrawSplitterBorder(wxWindow *win,
+                                    wxDC& dc,
+                                    const wxRect& rect,
+                                    int flags = 0);
     virtual void DrawSplitterSash(wxWindow *win,
                                   wxDC& dc,
                                   const wxSize& size,
-                                  wxCoord position);
-#endif // 0
+                                  wxCoord position,
+                                  wxOrientation orient,
+                                  int flags = 0);
+
+    virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win);
 };
 
 // ============================================================================
@@ -75,29 +84,45 @@ public:
 // ============================================================================
 
 /* static */
-wxRendererNative& wxRendererNative::Get()
+wxRendererNative& wxRendererNative::GetDefault()
 {
     static wxRendererGTK s_rendererGTK;
 
     return s_rendererGTK;
 }
 
+// ----------------------------------------------------------------------------
+// list/tree controls drawing
+// ----------------------------------------------------------------------------
+
 void
 wxRendererGTK::DrawHeaderButton(wxWindow *win,
                                 wxDC& dc,
                                 const wxRect& rect,
                                 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 );
+    }
+
     gtk_paint_box
     (
-        win->m_wxwindow->style,
+    s_button->style,
         GTK_PIZZA(win->m_wxwindow)->bin_window,
         flags & wxCONTROL_DISABLED ? GTK_STATE_INSENSITIVE : GTK_STATE_NORMAL,
         GTK_SHADOW_OUT,
-        (GdkRectangle*) NULL,
-        win->m_wxwindow,
-        (char *)"button", // const_cast
-        dc.XLOG2DEV(rect.x) - 1, rect.y - 1, rect.width + 2, rect.height + 2
+    NULL,
+        s_button,
+        "button",
+        dc.XLOG2DEV(rect.x) -1, rect.y -1, rect.width +2, rect.height +2
     );
 }
 
@@ -107,9 +132,72 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win,
 //
 // TODO: isn't there a GTK function to draw it?
 void
-wxRendererGTK::DrawTreeItemButton(wxWindow* WXUNUSED(win),
+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);
@@ -138,18 +226,62 @@ wxRendererGTK::DrawTreeItemButton(wxWindow* WXUNUSED(win),
     }
 
     dc.DrawPolygon(3, button);
+#endif
 }
 
 #endif // GTK 2.0
 
-#if 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 = 8;
+
+    // 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
+
+wxSplitterRenderParams
+wxRendererGTK::GetSplitterParams(const wxWindow * WXUNUSED(win))
+{
+    // we don't draw any border, hence 0 for the second field
+    return wxSplitterRenderParams
+           (
+               SASH_FULL_SIZE,
+               0,
+#ifdef __WXGTK20__
+               true     // hot sensitive
+#else // GTK+ 1.x
+               false    // not
+#endif // GTK+ 2.x/1.x
+           );
+}
+
+void
+wxRendererGTK::DrawSplitterBorder(wxWindow * WXUNUSED(win),
+                                  wxDC& WXUNUSED(dc),
+                                  const wxRect& WXUNUSED(rect),
+                                  int WXUNUSED(flags))
+{
+    // nothing to do
+}
 
-// draw a (vertical) sash
 void
 wxRendererGTK::DrawSplitterSash(wxWindow *win,
                                 wxDC& dc,
                                 const wxSize& size,
-                                wxCoord position)
+                                wxCoord position,
+                                wxOrientation orient,
+                                int WXUNUSED_IN_GTK1(flags))
 {
     if ( !win->m_wxwindow->window )
     {
@@ -157,29 +289,113 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
         return;
     }
 
-    gtk_paint_vline
+    // are we drawing vertical or horizontal splitter?
+    const bool isVert = orient == wxVERTICAL;
+
+    GdkRectangle rect;
+    GdkRectangle erase_rect;
+    if ( isVert )
+    {
+    int h = win->GetClientSize().GetHeight();
+    
+        rect.x = position;
+        rect.y = h/2 - 14/2;
+        rect.width = SASH_FULL_SIZE;
+        rect.height = 14;
+    
+        erase_rect.x = position;
+        erase_rect.y = 0;
+        erase_rect.width = SASH_FULL_SIZE;
+        erase_rect.height = h;
+    }
+    else // horz
+    {
+    int w = win->GetClientSize().GetWidth();
+    
+        rect.x = w/2 - 14/2;
+        rect.y = position;
+        rect.height = SASH_FULL_SIZE;
+        rect.width = 14;
+    
+        erase_rect.y = position;
+        erase_rect.x = 0;
+        erase_rect.height = SASH_FULL_SIZE;
+        erase_rect.width = w;
+    }
+
+    // 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?
+    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 *)"base", // const_cast
+        erase_rect.x,
+        erase_rect.y,
+        erase_rect.width,
+        erase_rect.height
+    );
+
+#ifdef __WXGTK20__
+    gtk_paint_handle
     (
         win->m_wxwindow->style,
-        win->m_wxwindow->window,
+        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;
+
+    // and finally draw it using GTK paint functions
+    typedef void (*GtkPaintLineFunc)(GtkStyle *, GdkWindow *,
+                                                GtkStateType,
+                                                GdkRectangle *, GtkWidget *,
+                                                gchar *,
+                                                gint, gint, gint);
+
+    GtkPaintLineFunc func = isVert ? gtk_paint_vline : gtk_paint_hline;
+
+    (*func)
+    (
+        win->m_wxwindow->style,
+        GTK_PIZZA(win->m_wxwindow)->bin_window,
         GTK_STATE_NORMAL,
-        (GdkRectangle *)NULL,
+        NULL,
         win->m_wxwindow,
-        (char *)"vpaned", // const_cast
-        0, size.y, position + 3
+        (char *)"paned", // const_cast
+        0, isVert ? size.y : size.x, position + SASH_SIZE / 2 - 1
     );
 
     gtk_paint_box
     (
         win->m_wxwindow->style,
-        win->m_wxwindow->window,
+        GTK_PIZZA(win->m_wxwindow)->bin_window,
         GTK_STATE_NORMAL,
         GTK_SHADOW_OUT,
-        (GdkRectangle *)NULL,
+        (GdkRectangle*) NULL,
         win->m_wxwindow,
         (char *)"paned", // const_cast
-        position, 5, 10, 10
+        isVert ? position : size.x - 2*SASH_SIZE,
+        isVert ? size.y - 2*SASH_SIZE : position,
+        SASH_SIZE, SASH_SIZE
     );
+#endif // GTK+ 2.x/1.x
 }
 
-#endif // 0
-