#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:
state = GTK_STATE_PRELIGHT;
else
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
// 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)
{
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;
"arrow",
GTK_ARROW_DOWN,
FALSE,
- rect.x + 1, rect.y + 1, rect.width - 2, rect.height - 2
+ 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
+ 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
+ (
+ button->style,
+ wdc.m_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);
+
}
projects / wxWidgets.git / blobdiff