X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6063039441bcf82503d5623afd5bb87ae9ec8733..b42468496c00cc7384234093227c03edcf04d84c:/src/gtk/win_gtk.cpp diff --git a/src/gtk/win_gtk.cpp b/src/gtk/win_gtk.cpp index 0ef51eb2bd..6869fbde37 100644 --- a/src/gtk/win_gtk.cpp +++ b/src/gtk/win_gtk.cpp @@ -30,6 +30,14 @@ For RTL, child widget positions are mirrored in size_allocate. static GtkWidgetClass* parent_class; +static inline GdkWindow* get_backing_window(GtkWidget* widget) +{ + GdkWindow* w = NULL; + if (widget->window && WX_PIZZA(widget)->m_is_scrollable) + w = gdk_window_get_parent(widget->window); + return w; +} + extern "C" { struct wxPizzaClass @@ -61,7 +69,8 @@ static void size_allocate(GtkWidget* widget, GtkAllocation* alloc) if (pizza->m_is_scrollable) { // two windows, both same size - gdk_window_move_resize(pizza->m_backing_window, + GdkWindow* backing_window = gdk_window_get_parent(widget->window); + gdk_window_move_resize(backing_window, alloc->x + border_x, alloc->y + border_y, w, h); if (is_resize) gdk_window_resize(widget->window, w, h); @@ -87,7 +96,7 @@ static void size_allocate(GtkWidget* widget, GtkAllocation* alloc) } widget->allocation = *alloc; - + // adjust child positions for (const GList* list = pizza->m_fixed.children; list; list = list->next) { @@ -95,7 +104,7 @@ static void size_allocate(GtkWidget* widget, GtkAllocation* alloc) if (GTK_WIDGET_VISIBLE(child->widget)) { GtkAllocation child_old_alloc = child->widget->allocation; - + GtkAllocation child_alloc; // note that child positions do not take border into // account, they need to be relative to widget->window, @@ -108,12 +117,7 @@ static void size_allocate(GtkWidget* widget, GtkAllocation* alloc) child_alloc.height = req.height; if (gtk_widget_get_direction(widget) == GTK_TEXT_DIR_RTL) child_alloc.x = w - child_alloc.x - child_alloc.width; - - if ((child_alloc.x != child_old_alloc.x) || - (child_alloc.y != child_old_alloc.y) || - (child_alloc.width != child_old_alloc.width) || - (child_alloc.height != child_old_alloc.height)) - gtk_widget_size_allocate(child->widget, &child_alloc); + gtk_widget_size_allocate(child->widget, &child_alloc); } } } @@ -147,19 +151,19 @@ static void realize(GtkWidget* widget) attr.colormap = gtk_widget_get_colormap(widget); attr.window_type = GDK_WINDOW_CHILD; - pizza->m_backing_window = gdk_window_new( + GdkWindow* backing_window = gdk_window_new( gdk_window_get_parent(widget->window), &attr, GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP); - gdk_window_set_user_data(pizza->m_backing_window, widget); - gdk_window_reparent(widget->window, pizza->m_backing_window, 0, 0); + gdk_window_set_user_data(backing_window, widget); + gdk_window_reparent(widget->window, backing_window, 0, 0); gdk_window_resize(widget->window, w, h); - // Parts of m_backing_window may be exposed temporarily while + // Parts of backing window may be exposed temporarily while // resizing. Setting the backing pixmap to None prevents those // areas from being briefly painted black. - gdk_window_set_back_pixmap(pizza->m_backing_window, NULL, false); + gdk_window_set_back_pixmap(backing_window, NULL, false); } else gdk_window_move_resize(widget->window, x, y, w, h); @@ -168,33 +172,34 @@ static void realize(GtkWidget* widget) static void unrealize(GtkWidget* widget) { + GdkWindow* backing_window = get_backing_window(widget); + parent_class->unrealize(widget); - wxPizza* pizza = WX_PIZZA(widget); - if (pizza->m_backing_window) + if (backing_window) { - gdk_window_set_user_data(pizza->m_backing_window, NULL); - gdk_window_destroy(pizza->m_backing_window); - pizza->m_backing_window = NULL; + gdk_window_set_user_data(backing_window, NULL); + gdk_window_destroy(backing_window); } } static void map(GtkWidget* widget) { - parent_class->map(widget); + GdkWindow* backing_window = get_backing_window(widget); + if (backing_window) + gdk_window_show(backing_window); - wxPizza* pizza = WX_PIZZA(widget); - if (pizza->m_backing_window) - gdk_window_show(pizza->m_backing_window); + parent_class->map(widget); } static void unmap(GtkWidget* widget) { + GdkWindow* backing_window = get_backing_window(widget); + parent_class->unmap(widget); - wxPizza* pizza = WX_PIZZA(widget); - if (pizza->m_backing_window) - gdk_window_hide(pizza->m_backing_window); + if (backing_window) + gdk_window_hide(backing_window); } // not used, but needs to exist so gtk_widget_set_scroll_adjustments will work @@ -264,13 +269,6 @@ static void class_init(void* g_class, void*) G_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT); parent_class = GTK_WIDGET_CLASS(g_type_class_peek_parent(g_class)); - - gtk_widget_class_install_style_property (widget_class, - g_param_spec_boolean ("row-ending-details", - "Row Ending details", - "Enable extended row background theming", - FALSE, - G_PARAM_READABLE)); } } // extern "C" @@ -298,7 +296,6 @@ GtkWidget* wxPizza::New(long windowStyle) { GtkWidget* widget = GTK_WIDGET(g_object_new(type(), NULL)); wxPizza* pizza = WX_PIZZA(widget); - pizza->m_backing_window = NULL; pizza->m_scroll_x = 0; pizza->m_scroll_y = 0; pizza->m_is_scrollable = (windowStyle & (wxHSCROLL | wxVSCROLL)) != 0; @@ -353,7 +350,7 @@ static void scroll_adjust(GtkWidget* widget, void* data) const AdjustData* p = static_cast(data); widget->allocation.x += p->dx; widget->allocation.y += p->dy; - + if (widget->window == p->window) { // GtkFrame requires a queue_resize, otherwise parts of @@ -388,24 +385,24 @@ void wxPizza::get_border_widths(int& x, int& y) x = y = 0; if (m_border_style == 0) return; - + #ifndef __WXUNIVERSAL__ if (m_border_style & wxBORDER_SIMPLE) x = y = 1; - else if (m_is_scrollable || (m_border_style & wxBORDER_THEME)) + else if (m_is_scrollable /* || (m_border_style & wxBORDER_THEME) */) { GtkWidget *style_widget = wxGTKPrivate::GetTreeWidget(); - + if (style_widget->style) { x = style_widget->style->xthickness; y = style_widget->style->ythickness; } } - else + else { GtkWidget *style_widget = wxGTKPrivate::GetEntryWidget(); - + if (style_widget->style) { x = style_widget->style->xthickness;