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
+position in size_allocate. A second same-size GdkWindow is placed in front of
widget->window, to allow GDK to use a more efficient scrolling technique.
For borders, space is reserved in realize and size_allocate. The border is
int h = alloc->height - 2 * border_y;
if (h < 0) h = 0;
- if (pizza->m_is_scrollable)
+ if (pizza->m_draw_window != widget->window)
{
// two windows, both same size
- gdk_window_move_resize(pizza->m_backing_window,
+ gdk_window_move_resize(widget->window,
alloc->x + border_x, alloc->y + border_y, w, h);
if (is_resize)
- gdk_window_resize(widget->window, w, h);
+ gdk_window_resize(pizza->m_draw_window, w, h);
}
else
{
{
// 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);
+ 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)
{
const GtkFixedChild* child = static_cast<GtkFixedChild*>(list->data);
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,
parent_class->realize(widget);
wxPizza* pizza = WX_PIZZA(widget);
+ pizza->m_draw_window = widget->window;
if (pizza->m_border_style || pizza->m_is_scrollable)
{
int border_x, border_y;
attr.colormap = gtk_widget_get_colormap(widget);
attr.window_type = GDK_WINDOW_CHILD;
- pizza->m_backing_window = gdk_window_new(
+ // existing widget->window becomes m_draw_window,
+ // new widget->window created as parent of m_draw_window
+ widget->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);
+ gdk_window_set_user_data(widget->window, widget);
+ gdk_window_reparent(pizza->m_draw_window, widget->window, 0, 0);
+ gdk_window_resize(pizza->m_draw_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(widget->window, NULL, false);
+
+ for (const GList* list = pizza->m_fixed.children; list; list = list->next)
+ {
+ const GtkFixedChild* child = static_cast<GtkFixedChild*>(list->data);
+ gtk_widget_set_parent_window(child->widget, pizza->m_draw_window);
+ }
}
else
gdk_window_move_resize(widget->window, x, y, w, h);
static void unrealize(GtkWidget* widget)
{
- parent_class->unrealize(widget);
-
wxPizza* pizza = WX_PIZZA(widget);
- if (pizza->m_backing_window)
+ if (pizza->m_draw_window != widget->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(pizza->m_draw_window, NULL);
+ gdk_window_destroy(pizza->m_draw_window);
}
+ pizza->m_draw_window = NULL;
+
+ parent_class->unrealize(widget);
}
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);
+ GdkWindow* window = WX_PIZZA(widget)->m_draw_window;
+ if (window != widget->window)
+ gdk_window_show(window);
}
static void unmap(GtkWidget* widget)
{
- parent_class->unmap(widget);
+ GdkWindow* window = WX_PIZZA(widget)->m_draw_window;
+ if (window != widget->window)
+ gdk_window_hide(window);
- wxPizza* pizza = WX_PIZZA(widget);
- if (pizza->m_backing_window)
- gdk_window_hide(pizza->m_backing_window);
+ parent_class->unmap(widget);
}
// not used, but needs to exist so gtk_widget_set_scroll_adjustments will work
return type;
}
-GtkWidget* wxPizza::New(long windowStyle,void* owner)
+GtkWidget* wxPizza::New(long windowStyle)
{
GtkWidget* widget = GTK_WIDGET(g_object_new(type(), NULL));
wxPizza* pizza = WX_PIZZA(widget);
- pizza->m_owner = owner;
- pizza->m_backing_window = NULL;
+ pizza->m_draw_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);
+ if (m_draw_window != GTK_WIDGET(this)->window)
+ gtk_widget_set_parent_window(widget, m_draw_window);
+}
+
struct AdjustData {
GdkWindow* window;
int dx, dy;
const AdjustData* p = static_cast<AdjustData*>(data);
widget->allocation.x += p->dx;
widget->allocation.y += p->dy;
-
+
if (widget->window == p->window)
{
// GtkFrame requires a queue_resize, otherwise parts of
dx = -dx;
m_scroll_x -= dx;
m_scroll_y -= dy;
- if (widget->window)
+ if (m_draw_window)
{
- gdk_window_scroll(widget->window, dx, dy);
+ gdk_window_scroll(m_draw_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 };
+ AdjustData data = { m_draw_window, dx, dy };
gtk_container_forall(GTK_CONTAINER(widget), scroll_adjust, &data);
}
}
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;
projects / wxWidgets.git / blobdiff