X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1827c0f538a8dd657d2e513173fbe3794f56eb1e..8a31648287be0ef976f133de2786b137f1e98340:/src/gtk/win_gtk.cpp diff --git a/src/gtk/win_gtk.cpp b/src/gtk/win_gtk.cpp index 6869fbde37..bf4bd7fc2d 100644 --- a/src/gtk/win_gtk.cpp +++ b/src/gtk/win_gtk.cpp @@ -19,8 +19,7 @@ borders, and RTL. For scrolling, the "set_scroll_adjustments" signal is implemented to make wxPizza appear scrollable to GTK+, allowing it to be put in a GtkScrolledWindow. Child widget positions are adjusted for the scrolling -position in size_allocate. A second same-size GdkWindow is placed behind -widget->window, to allow GDK to use a more efficient scrolling technique. +position in size_allocate. For borders, space is reserved in realize and size_allocate. The border is drawn on wxPizza's parent GdkWindow. @@ -30,14 +29,6 @@ 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,37 +52,21 @@ static void size_allocate(GtkWidget* widget, GtkAllocation* alloc) int w = alloc->width - 2 * border_x; if (w < 0) w = 0; - if (GTK_WIDGET_REALIZED(widget) && (is_move || is_resize)) + if (gtk_widget_get_realized(widget) && (is_move || is_resize)) { int h = alloc->height - 2 * border_y; if (h < 0) h = 0; - if (pizza->m_is_scrollable) - { - // two windows, both same size - 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); - } - else + gdk_window_move_resize(widget->window, + alloc->x + border_x, alloc->y + border_y, w, h); + + if (is_resize && (border_x || border_y)) { - // one window - gdk_window_move_resize(widget->window, - alloc->x + border_x, alloc->y + border_y, w, h); - - if (is_resize && (border_x || border_y)) - { - // old and new border areas need to be invalidated, - // otherwise they will not be erased/redrawn properly - const GtkAllocation& a1 = widget->allocation; - const GtkAllocation& a2 = *alloc; - GdkRectangle r1 = { a1.x, a1.y, a1.width, a1.height }; - GdkRectangle r2 = { a2.x, a2.y, a2.width, a2.height }; - gdk_window_invalidate_rect(widget->parent->window, &r1, false); - gdk_window_invalidate_rect(widget->parent->window, &r2, false); - } + // old and new border areas need to be invalidated, + // otherwise they will not be erased/redrawn properly + GdkWindow* parent = gtk_widget_get_parent_window(widget); + gdk_window_invalidate_rect(parent, &widget->allocation, false); + gdk_window_invalidate_rect(parent, alloc, false); } } @@ -101,10 +76,8 @@ static void size_allocate(GtkWidget* widget, GtkAllocation* alloc) for (const GList* list = pizza->m_fixed.children; list; list = list->next) { const GtkFixedChild* child = static_cast(list->data); - if (GTK_WIDGET_VISIBLE(child->widget)) + if (gtk_widget_get_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, @@ -127,7 +100,7 @@ static void realize(GtkWidget* widget) parent_class->realize(widget); wxPizza* pizza = WX_PIZZA(widget); - if (pizza->m_border_style || pizza->m_is_scrollable) + if (pizza->m_border_style) { int border_x, border_y; pizza->get_border_widths(border_x, border_y); @@ -137,69 +110,32 @@ static void realize(GtkWidget* widget) int h = widget->allocation.height - 2 * border_y; if (w < 0) w = 0; if (h < 0) h = 0; - if (pizza->m_is_scrollable) - { - // second window is created if wxWindow is scrollable - GdkWindowAttr attr; - attr.event_mask = 0; - attr.x = x; - attr.y = y; - attr.width = w; - attr.height = h; - attr.wclass = GDK_INPUT_OUTPUT; - attr.visual = gtk_widget_get_visual(widget); - attr.colormap = gtk_widget_get_colormap(widget); - attr.window_type = GDK_WINDOW_CHILD; - - 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(backing_window, widget); - gdk_window_reparent(widget->window, backing_window, 0, 0); - gdk_window_resize(widget->window, w, h); - - // 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(backing_window, NULL, false); - } - else - gdk_window_move_resize(widget->window, x, y, w, h); + gdk_window_move_resize(widget->window, x, y, w, h); } } -static void unrealize(GtkWidget* widget) +static void show(GtkWidget* widget) { - GdkWindow* backing_window = get_backing_window(widget); - - parent_class->unrealize(widget); - - if (backing_window) + if (widget->parent && WX_PIZZA(widget)->m_border_style) { - gdk_window_set_user_data(backing_window, NULL); - gdk_window_destroy(backing_window); + // invalidate whole allocation so borders will be drawn properly + const GtkAllocation& a = widget->allocation; + gtk_widget_queue_draw_area(widget->parent, a.x, a.y, a.width, a.height); } -} - -static void map(GtkWidget* widget) -{ - GdkWindow* backing_window = get_backing_window(widget); - if (backing_window) - gdk_window_show(backing_window); - parent_class->map(widget); + parent_class->show(widget); } -static void unmap(GtkWidget* widget) +static void hide(GtkWidget* widget) { - GdkWindow* backing_window = get_backing_window(widget); - - parent_class->unmap(widget); + if (widget->parent && WX_PIZZA(widget)->m_border_style) + { + // invalidate whole allocation so borders will be erased properly + const GtkAllocation& a = widget->allocation; + gtk_widget_queue_draw_area(widget->parent, a.x, a.y, a.width, a.height); + } - if (backing_window) - gdk_window_hide(backing_window); + parent_class->hide(widget); } // not used, but needs to exist so gtk_widget_set_scroll_adjustments will work @@ -251,9 +187,8 @@ static void class_init(void* g_class, void*) GtkWidgetClass* widget_class = (GtkWidgetClass*)g_class; widget_class->size_allocate = size_allocate; widget_class->realize = realize; - widget_class->unrealize = unrealize; - widget_class->map = map; - widget_class->unmap = unmap; + widget_class->show = show; + widget_class->hide = hide; wxPizzaClass* klass = (wxPizzaClass*)g_class; // needed to make widget appear scrollable to GTK+ @@ -301,7 +236,11 @@ GtkWidget* wxPizza::New(long windowStyle) pizza->m_is_scrollable = (windowStyle & (wxHSCROLL | wxVSCROLL)) != 0; // mask off border styles not useable with wxPizza pizza->m_border_style = int(windowStyle & BORDER_STYLES); +#if GTK_CHECK_VERSION(3,0,0) || defined(GTK_DISABLE_DEPRECATED) + gtk_widget_set_has_window(widget, true); +#else gtk_fixed_set_has_window(GTK_FIXED(widget), true); +#endif gtk_widget_add_events(widget, GDK_EXPOSURE_MASK | GDK_SCROLL_MASK | @@ -338,6 +277,11 @@ void wxPizza::move(GtkWidget* widget, int x, int y) } } +void wxPizza::put(GtkWidget* widget, int x, int y) +{ + gtk_fixed_put(&m_fixed, widget, x, y); +} + struct AdjustData { GdkWindow* window; int dx, dy;