X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/69fdd54eeb09e2a2dcc9907804d8449499d88aba..0c75b29e1ed19810546de38b646b5b901be873e2:/src/gtk/win_gtk.cpp diff --git a/src/gtk/win_gtk.cpp b/src/gtk/win_gtk.cpp index 860c830338..841c01225f 100644 --- a/src/gtk/win_gtk.cpp +++ b/src/gtk/win_gtk.cpp @@ -8,9 +8,8 @@ /////////////////////////////////////////////////////////////////////////////// #include "wx/defs.h" -#include "wx/gtk/win_gtk.h" - -#include +#include "wx/gtk/private.h" +#include "wx/gtk/private/win_gtk.h" /* wxPizza is a custom GTK+ widget derived from GtkFixed. A custom widget @@ -66,29 +65,28 @@ static void size_allocate(GtkWidget* widget, GtkAllocation* alloc) if (pizza->m_is_scrollable) { - // backing window is inside border + // two windows, both same size gdk_window_move_resize(pizza->m_backing_window, alloc->x + border_x, alloc->y + border_y, w, h); + if (is_resize) + gdk_window_resize(widget->window, w, h); + } + else if (pizza->m_backing_window) + { + // two windows, widget->window is smaller by border widths (need to + // move widget->window as well as resize because border can change) + gdk_window_move_resize(pizza->m_backing_window, + alloc->x, alloc->y, alloc->width, alloc->height); + gdk_window_move_resize(widget->window, border_x, border_y, w, h); } else { - // border window (or only window if - // no-scroll no-border) is full size - GdkWindow* window = pizza->m_backing_window; - if (window == NULL) - window = widget->window; - gdk_window_move_resize( - window, alloc->x, alloc->y, alloc->width, alloc->height); + // one window + gdk_window_move_resize(widget->window, + alloc->x, alloc->y, alloc->width, alloc->height); } if (is_resize && pizza->m_backing_window) { - // main window is inside border - if (pizza->m_is_scrollable) - gdk_window_resize(widget->window, w, h); - else - // need move as well as resize because border can change - gdk_window_move_resize(widget->window, border_x, border_y, w, h); - // wxWidgets turns off redraw-on-allocate by default, // so border area needs to be invalidated if (border_x > 1 || border_y > 1) @@ -168,8 +166,11 @@ static void realize(GtkWidget* widget) else gdk_window_reparent(widget->window, pizza->m_backing_window, border_x, border_y); gdk_window_resize(widget->window, w, h); - - gdk_window_set_back_pixmap( pizza->m_backing_window, None, False ); + + // Parts of m_backing_window which are supposed to be obscured 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); } } @@ -341,6 +342,30 @@ void wxPizza::move(GtkWidget* widget, int x, int y) } } +struct AdjustData { + GdkWindow* window; + int dx, dy; +}; + +// Adjust allocations for all widgets using the GdkWindow which was just scrolled +extern "C" { +static void scroll_adjust(GtkWidget* widget, void* data) +{ + const AdjustData* p = static_cast(data); + if (widget->window == p->window) + { + widget->allocation.x += p->dx; + widget->allocation.y += p->dy; + // GtkFrame requires a queue_resize, otherwise parts of + // the frame newly exposed by the scroll are not drawn. + // To be safe, do it for all widgets. + gtk_widget_queue_resize_no_redraw(widget); + if (GTK_IS_CONTAINER(widget)) + gtk_container_forall(GTK_CONTAINER(widget), scroll_adjust, data); + } +} +} + void wxPizza::scroll(int dx, int dy) { GtkWidget* widget = GTK_WIDGET(this); @@ -349,18 +374,15 @@ void wxPizza::scroll(int dx, int dy) m_scroll_x -= dx; m_scroll_y -= dy; if (widget->window) - gdk_window_scroll(widget->window, dx, dy); - const GList* list = m_fixed.children; - if (list) { - const GtkFixedChild* child = static_cast(list->data); - // queueing a resize on any child will update them all - gtk_widget_queue_resize(child->widget); + gdk_window_scroll(widget->window, dx, dy); + // Adjust child allocations. Doing a queue_resize on the children is not + // enough, sometimes they redraw in the wrong place during fast scrolling. + AdjustData data = { widget->window, dx, dy }; + gtk_container_forall(GTK_CONTAINER(widget), scroll_adjust, &data); } } -extern GtkWidget *GetEntryWidget(); - void wxPizza::get_border_widths(int& x, int& y) { x = y = 0; @@ -368,7 +390,7 @@ void wxPizza::get_border_widths(int& x, int& y) x = y = 1; else if (m_border_style) { - GtkWidget *entry_widget = GetEntryWidget(); + GtkWidget *entry_widget = wxGTKPrivate::GetEntryWidget(); if (entry_widget->style) { x = entry_widget->style->xthickness;