#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
// ----------------------------------------------------------------------------
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();
+
+#ifdef __WXGTK20__
+ // used by DrawTreeItemButton()
+ static GtkWidget *GetTreeWidget();
+#endif // GTK+ 2.0
};
// ============================================================================
}
// ----------------------------------------------------------------------------
-// common code
+// helper functions
// ----------------------------------------------------------------------------
-static GtkWidget *gs_button = NULL;
-static GtkWidget *gs_window = NULL;
+GtkWidget *
+wxRendererGTK::GetButtonWidget()
+{
+ static GtkWidget *s_button = NULL;
+ static GtkWidget *s_window = NULL;
-void
-wxRendererGTK::PrepareButtonDraw()
+ 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()
{
- // 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_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
// ----------------------------------------------------------------------------
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
);
#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;
- }
+ GtkWidget *tree = GetTreeWidget();
+ GtkStateType state;
if ( flags & wxCONTROL_CURRENT )
- gdk_draw_polygon( pizza->bin_window, style->fg_gc[GTK_STATE_PRELIGHT], TRUE, points, 3);
+ state = GTK_STATE_PRELIGHT;
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 );
+ state = GTK_STATE_NORMAL;
+
+ // 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,
+ state,
+ NULL,
+ tree,
+ "treeview",
+ dc.LogicalToDeviceX(rect.x) + 2,
+ dc.LogicalToDeviceY(rect.y) + 3,
+ flags & wxCONTROL_EXPANDED ? GTK_EXPANDER_EXPANDED
+ : GTK_EXPANDER_COLLAPSED
+ );
}
-#endif // __WXGTK20__
+#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
+#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;
-
- // the full sash size
- static const wxCoord SASH_FULL_SIZE = SASH_SIZE + SASH_MARGIN;
#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
-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
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
{
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,
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
rect.y,
rect.width,
rect.height,
- !isVert ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL
+ isVert ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL
);
#else // GTK+ 1.x
#endif // GTK+ 2.x/1.x
}
-void wxRendererGTK::DrawComboBoxDropButton(wxWindow *win,
- wxDC& dc,
- const wxRect& rect,
- int flags)
+void
+wxRendererGTK::DrawDropArrow(wxWindow *win,
+ wxDC& dc,
+ const wxRect& rect,
+ int flags)
{
- if (gs_button == NULL)
- PrepareButtonDraw();
+ GtkWidget *button = GetButtonWidget();
- // device context must inherit from wxWindowDC
- // (so it must be wxClientDC, wxMemoryDC or wxPaintDC)
+ // 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.
wxWindowDC& wdc = (wxWindowDC&)dc;
- // only doing debug-time checking here (it should probably be enough)
+ // 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;
- // erase background first
- gtk_paint_box
+ // draw arrow on button
+ gtk_paint_arrow
(
- gs_button->style,
+ button->style,
wdc.m_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
+ wxWindowDC& wdc = (wxWindowDC&)dc;
+ wxASSERT ( wdc.IsKindOf(CLASSINFO(wxWindowDC)) );
+
+ // 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,
+ button->style,
wdc.m_window,
state,
flags & wxCONTROL_PRESSED ? GTK_SHADOW_IN : GTK_SHADOW_OUT,
NULL,
- gs_button,
- "arrow",
- GTK_ARROW_DOWN,
- FALSE,
- 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);
+
}
projects / wxWidgets.git / blobdiff