X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/75f661bbc8f9d44f6899aca0fd3afa98224ecf4d..4a699e3a59b19c21b6faae714b56cac5a75df2e2:/src/gtk/win_gtk.cpp diff --git a/src/gtk/win_gtk.cpp b/src/gtk/win_gtk.cpp index 62bf3e424b..5475bf6f0e 100644 --- a/src/gtk/win_gtk.cpp +++ b/src/gtk/win_gtk.cpp @@ -7,6 +7,8 @@ // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// +#include "wx/wxprec.h" + #include "wx/defs.h" #include "wx/gtk/private.h" #include "wx/gtk/private/win_gtk.h" @@ -19,8 +21,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. @@ -28,6 +29,12 @@ drawn on wxPizza's parent GdkWindow. For RTL, child widget positions are mirrored in size_allocate. */ +struct wxPizzaChild +{ + GtkWidget* widget; + int x, y, width, height; +}; + static GtkWidgetClass* parent_class; extern "C" { @@ -40,46 +47,46 @@ struct wxPizzaClass static void size_allocate(GtkWidget* widget, GtkAllocation* alloc) { - const bool is_resize = - widget->allocation.width != alloc->width || - widget->allocation.height != alloc->height; - const bool is_move = - widget->allocation.x != alloc->x || - widget->allocation.y != alloc->y; - - widget->allocation = *alloc; - wxPizza* pizza = WX_PIZZA(widget); int border_x, border_y; pizza->get_border_widths(border_x, border_y); 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)) { int h = alloc->height - 2 * border_y; if (h < 0) h = 0; + const int x = alloc->x + border_x; + const int y = alloc->y + border_y; - if (pizza->m_is_scrollable) - { - // 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 + GdkWindow* window = gtk_widget_get_window(widget); + int old_x, old_y; + gdk_window_get_position(window, &old_x, &old_y); + + if (x != old_x || y != old_y || + w != gdk_window_get_width(window) || h != gdk_window_get_height(window)) { - // one window - gdk_window_move_resize(widget->window, - alloc->x + border_x, alloc->y + border_y, w, h); + gdk_window_move_resize(window, x, y, w, h); + + if (border_x + border_y) + { + // 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); + } } } + + widget->allocation = *alloc; + // adjust child positions - for (const GList* list = pizza->m_fixed.children; list; list = list->next) + for (const GList* p = pizza->m_children; p; p = p->next) { - const GtkFixedChild* child = static_cast(list->data); - if (GTK_WIDGET_VISIBLE(child->widget)) + const wxPizzaChild* child = static_cast(p->data); + if (gtk_widget_get_visible(child->widget)) { GtkAllocation child_alloc; // note that child positions do not take border into @@ -87,14 +94,10 @@ static void size_allocate(GtkWidget* widget, GtkAllocation* alloc) // which has already been adjusted child_alloc.x = child->x - pizza->m_scroll_x; child_alloc.y = child->y - pizza->m_scroll_y; - GtkRequisition req; - gtk_widget_get_child_requisition(child->widget, &req); - child_alloc.width = req.width; - child_alloc.height = req.height; + child_alloc.width = child->width; + child_alloc.height = child->height; if (gtk_widget_get_direction(widget) == GTK_TEXT_DIR_RTL) - { child_alloc.x = w - child_alloc.x - child_alloc.width; - } gtk_widget_size_allocate(child->widget, &child_alloc); } } @@ -105,7 +108,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); @@ -115,68 +118,54 @@ 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; - - pizza->m_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_resize(widget->window, w, h); - - // Parts of m_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); - } - 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) { - parent_class->unrealize(widget); - - wxPizza* pizza = WX_PIZZA(widget); - if (pizza->m_backing_window) + if (widget->parent && WX_PIZZA(widget)->m_border_style) { - gdk_window_set_user_data(pizza->m_backing_window, NULL); - gdk_window_destroy(pizza->m_backing_window); - pizza->m_backing_window = NULL; + // 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); } + + parent_class->show(widget); } -static void map(GtkWidget* widget) +static void hide(GtkWidget* widget) { - parent_class->map(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); + } - wxPizza* pizza = WX_PIZZA(widget); - if (pizza->m_backing_window) - gdk_window_show(pizza->m_backing_window); + parent_class->hide(widget); +} + +static void pizza_add(GtkContainer* container, GtkWidget* widget) +{ + WX_PIZZA(container)->put(widget, 0, 0, 1, 1); } -static void unmap(GtkWidget* widget) +static void pizza_remove(GtkContainer* container, GtkWidget* widget) { - parent_class->unmap(widget); + GTK_CONTAINER_CLASS(parent_class)->remove(container, widget); - wxPizza* pizza = WX_PIZZA(widget); - if (pizza->m_backing_window) - gdk_window_hide(pizza->m_backing_window); + wxPizza* pizza = WX_PIZZA(container); + for (GList* p = pizza->m_children; p; p = p->next) + { + wxPizzaChild* child = static_cast(p->data); + if (child->widget == widget) + { + pizza->m_children = g_list_delete_link(pizza->m_children, p); + delete child; + break; + } + } } // not used, but needs to exist so gtk_widget_set_scroll_adjustments will work @@ -228,9 +217,11 @@ 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; + GtkContainerClass* container_class = (GtkContainerClass*)g_class; + container_class->add = pizza_add; + container_class->remove = pizza_remove; wxPizzaClass* klass = (wxPizzaClass*)g_class; // needed to make widget appear scrollable to GTK+ @@ -273,13 +264,17 @@ 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_children = NULL; pizza->m_scroll_x = 0; pizza->m_scroll_y = 0; 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 | @@ -299,23 +294,37 @@ GtkWidget* wxPizza::New(long windowStyle) return widget; } -// gtk_fixed_move does not check for a change before issuing a queue_resize, -// we need to avoid that to prevent endless sizing loops, so check first -void wxPizza::move(GtkWidget* widget, int x, int y) +void wxPizza::move(GtkWidget* widget, int x, int y, int width, int height) { - GtkFixed* fixed = &m_fixed; - for (const GList* list = fixed->children; list; list = list->next) + for (const GList* p = m_children; p; p = p->next) { - const GtkFixedChild* child = static_cast(list->data); + wxPizzaChild* child = static_cast(p->data); if (child->widget == widget) { - if (child->x != x || child->y != y) - gtk_fixed_move(fixed, widget, x, y); + child->x = x; + child->y = y; + child->width = width; + child->height = height; + // normally a queue-resize would be needed here, but we know + // wxWindowGTK::DoMoveWindow() will take care of it break; } } } +void wxPizza::put(GtkWidget* widget, int x, int y, int width, int height) +{ + gtk_fixed_put(GTK_FIXED(this), widget, 0, 0); + + wxPizzaChild* child = new wxPizzaChild; + child->widget = widget; + child->x = x; + child->y = y; + child->width = width; + child->height = height; + m_children = g_list_append(m_children, child); +} + struct AdjustData { GdkWindow* window; int dx, dy; @@ -326,10 +335,11 @@ extern "C" { 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) { - 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. @@ -360,16 +370,30 @@ void wxPizza::scroll(int dx, int dy) 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_border_style) + else if (m_is_scrollable /* || (m_border_style & wxBORDER_THEME) */) { - GtkWidget *entry_widget = wxGTKPrivate::GetEntryWidget(); - if (entry_widget->style) + GtkWidget *style_widget = wxGTKPrivate::GetTreeWidget(); + + if (style_widget->style) + { + x = style_widget->style->xthickness; + y = style_widget->style->ythickness; + } + } + else + { + GtkWidget *style_widget = wxGTKPrivate::GetEntryWidget(); + + if (style_widget->style) { - x = entry_widget->style->xthickness; - y = entry_widget->style->ythickness; + x = style_widget->style->xthickness; + y = style_widget->style->ythickness; } } #endif