X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9b3119232cd5a2c281283b4d7a730df9a4fc213d..8d6f95db28f663c2f98488b15dfca8899522b968:/src/gtk/renderer.cpp diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp index da41f34eba..aa02feb193 100644 --- a/src/gtk/renderer.cpp +++ b/src/gtk/renderer.cpp @@ -6,7 +6,7 @@ // Created: 20.07.2003 // RCS-ID: $Id$ // Copyright: (c) 2003 Vadim Zeitlin -// License: wxWindows license +// License: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -107,19 +107,19 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win, 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_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 ( - s_button->style, + s_button->style, GTK_PIZZA(win->m_wxwindow)->bin_window, flags & wxCONTROL_DISABLED ? GTK_STATE_INSENSITIVE : GTK_STATE_NORMAL, GTK_SHADOW_OUT, - NULL, + NULL, s_button, "button", dc.XLOG2DEV(rect.x) -1, rect.y -1, rect.width +2, rect.height +2 @@ -132,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); @@ -163,6 +226,7 @@ wxRendererGTK::DrawTreeItemButton(wxWindow* WXUNUSED(win), } dc.DrawPolygon(3, button); +#endif } #endif // GTK 2.0 @@ -177,10 +241,10 @@ wxRendererGTK::DrawTreeItemButton(wxWindow* WXUNUSED(win), static const wxCoord SASH_FULL_SIZE = 5; #else // GTK+ 1.x // the full sash width (should be even) - static const wxCoord SASH_SIZE = 10; + static const wxCoord SASH_SIZE = 8; // margin around the sash - static const wxCoord SASH_MARGIN = 5; + static const wxCoord SASH_MARGIN = 2; // the full sash size static const wxCoord SASH_FULL_SIZE = SASH_SIZE + SASH_MARGIN; @@ -221,7 +285,7 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win, { if ( !win->m_wxwindow->window ) { - // VZ: this happens on startup -- why? + // window not realized yet return; } @@ -229,21 +293,55 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win, const bool isVert = orient == wxVERTICAL; GdkRectangle rect; + GdkRectangle erase_rect; if ( isVert ) { + int h = win->GetClientSize().GetHeight(); + rect.x = position; rect.y = 0; rect.width = SASH_FULL_SIZE; - rect.height = size.y; + rect.height = h; + + 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 = 0; rect.y = position; rect.height = SASH_FULL_SIZE; - rect.width = size.x; + rect.width = w; + + 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 ( @@ -261,22 +359,6 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win, 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? - gtk_paint_flat_box - ( - win->m_wxwindow->style, - GTK_PIZZA(win->m_wxwindow)->bin_window, - GTK_STATE_NORMAL, - GTK_SHADOW_NONE, - &rect, - win->m_wxwindow, - (char *)"base", // const_cast - 0, 0, -1, -1 - ); - // leave some margin before sash itself position += SASH_MARGIN / 2;