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.
-For non-scrolling wxWindows, a second GdkWindow is used for the
-border; scrolling wxWindows draw their border on wxPizza's parent
-(a GtkScrolledWindow) GdkWindow. Border widths for sunken and raised
-styles are taken from widget->style, so they will match the current theme.
+For borders, space is reserved in realize and size_allocate. The border is
+drawn on wxPizza's parent GdkWindow.
For RTL, child widget positions are mirrored in size_allocate.
*/
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 h = alloc->height - 2 * border_y;
if (h < 0) h = 0;
- 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 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
- {
- // one window
- gdk_window_move_resize(widget->window,
- alloc->x, alloc->y, alloc->width, alloc->height);
- }
- if (is_resize && pizza->m_backing_window)
+ gdk_window_move_resize(widget->window,
+ alloc->x + border_x, alloc->y + border_y, w, h);
+
+ if (is_resize && (border_x || border_y))
{
- // wxWidgets turns off redraw-on-allocate by default,
- // so border area needs to be invalidated
- if (border_x > 1 || border_y > 1)
- {
- if (pizza->m_is_scrollable)
- ; // invalidate does not seem to be needed in this case
- else
- gdk_window_invalidate_rect(pizza->m_backing_window, NULL, 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);
}
}
+
+ widget->allocation = *alloc;
+
// adjust child positions
for (const GList* list = pizza->m_fixed.children; list; list = list->next)
{
child_alloc.width = req.width;
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;
- }
gtk_widget_size_allocate(child->widget, &child_alloc);
}
}
parent_class->realize(widget);
wxPizza* pizza = WX_PIZZA(widget);
- // second window is created if there is a border, or wxWindow is scrollable
- if (pizza->m_border_style || pizza->m_is_scrollable)
+ if (pizza->m_border_style)
{
- GdkWindowAttr attr;
- attr.event_mask = pizza->m_is_scrollable ? 0 : GDK_EXPOSURE_MASK;
- attr.x = widget->allocation.x;
- attr.y = widget->allocation.y;
- attr.width = widget->allocation.width;
- attr.height = widget->allocation.height;
int border_x, border_y;
pizza->get_border_widths(border_x, border_y);
+ int x = widget->allocation.x + border_x;
+ int y = widget->allocation.y + border_y;
int w = widget->allocation.width - 2 * border_x;
int h = widget->allocation.height - 2 * border_y;
if (w < 0) w = 0;
if (h < 0) h = 0;
- if (pizza->m_is_scrollable)
- {
- attr.x += border_x;
- attr.y += border_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);
- if (pizza->m_is_scrollable)
- gdk_window_reparent(widget->window, pizza->m_backing_window, 0, 0);
- else
- gdk_window_reparent(widget->window, pizza->m_backing_window, border_x, border_y);
- gdk_window_resize(widget->window, w, h);
-
- // 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);
+ 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);
}
-}
-static void map(GtkWidget* widget)
-{
- parent_class->map(widget);
-
- wxPizza* pizza = WX_PIZZA(widget);
- if (pizza->m_backing_window)
- gdk_window_show(pizza->m_backing_window);
+ parent_class->show(widget);
}
-static void unmap(GtkWidget* widget)
+static void hide(GtkWidget* 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);
+ }
- wxPizza* pizza = WX_PIZZA(widget);
- if (pizza->m_backing_window)
- gdk_window_hide(pizza->m_backing_window);
+ parent_class->hide(widget);
}
// not used, but needs to exist so gtk_widget_set_scroll_adjustments will work
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+
{
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;
}
}
+void wxPizza::put(GtkWidget* widget, int x, int y)
+{
+ gtk_fixed_put(&m_fixed, widget, x, y);
+}
+
struct AdjustData {
GdkWindow* window;
int dx, dy;
static void scroll_adjust(GtkWidget* widget, void* data)
{
const AdjustData* p = static_cast<AdjustData*>(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.
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 *style_widget = wxGTKPrivate::GetTreeWidget();
+
+ if (style_widget->style)
+ {
+ x = style_widget->style->xthickness;
+ y = style_widget->style->ythickness;
+ }
+ }
+ else
{
- GtkWidget *entry_widget = wxGTKPrivate::GetEntryWidget();
- if (entry_widget->style)
+ 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
}
projects / wxWidgets.git / blobdiff