extern "C" {
#endif /* __cplusplus */
+typedef struct _GtkPizzaChild GtkPizzaChild;
+typedef struct _GtkPizzaClass GtkPizzaClass;
typedef struct _GtkPizzaAdjData GtkPizzaAdjData;
+struct _GtkPizzaClass
+{
+ GtkContainerClass parent_class;
+
+ void (*set_scroll_adjustments) (GtkPizza *pizza,
+ GtkAdjustment *hadjustment,
+ GtkAdjustment *vadjustment);
+};
+
+struct _GtkPizzaChild
+{
+ GtkWidget *widget;
+ gint x;
+ gint y;
+};
+
struct _GtkPizzaAdjData
{
gint dx;
static void gtk_pizza_allocate_child (GtkPizza *pizza,
GtkPizzaChild *child);
-static void gtk_pizza_adjust_allocations_recurse (GtkWidget *widget,
- gpointer cb_data);
static GtkType gtk_pizza_child_type (GtkContainer *container);
if (!pizza_type)
{
- static const GTypeInfo pizza_info =
+ const GTypeInfo pizza_info =
{
sizeof (GtkPizzaClass),
NULL, /* base_init */
static void
gtk_pizza_init (GtkPizza *pizza)
{
+ GTK_WIDGET_SET_FLAGS (pizza, GTK_CAN_FOCUS);
GTK_WIDGET_UNSET_FLAGS (pizza, GTK_NO_WINDOW);
pizza->children = NULL;
GtkPizza *pizza;
pizza = g_object_new (gtk_pizza_get_type (), NULL);
+
+ pizza->m_noscroll = FALSE;
+
+ return GTK_WIDGET (pizza);
+}
+
+GtkWidget*
+gtk_pizza_new_no_scroll ()
+{
+ GtkPizza *pizza;
+
+ pizza = g_object_new (gtk_pizza_get_type (), NULL);
+
+ pizza->m_noscroll = TRUE;
return GTK_WIDGET (pizza);
}
g_return_val_if_fail ( (pizza != NULL), 0 );
g_return_val_if_fail ( (GTK_IS_PIZZA (pizza)), 0 );
-
+
if (!pizza->bin_window) return 0;
-
+
border = pizza->container.border_width;
-
+
return GTK_WIDGET(pizza)->allocation.width - border*2;
}
child_info->widget = widget;
child_info->x = x;
child_info->y = y;
- child_info->width = width;
- child_info->height = height;
pizza->children = g_list_append (pizza->children, child_info);
if (child->widget == widget)
{
- if ((child->x == x) &&
- (child->y == y) &&
- (child->width == width) &&
- (child->height == height)) return;
-
- child->x = x;
- child->y = y;
- child->width = width;
- child->height = height;
-
+ if (child->x != x || child->y != y)
+ {
+ child->x = x;
+ child->y = y;
+ gtk_widget_queue_resize(widget);
+ }
+
gtk_widget_set_size_request (widget, width, height);
return;
GtkPizzaChild *child;
GList *children;
int border;
+ int w, h;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_PIZZA (widget));
attributes.width = widget->allocation.width;
attributes.height = widget->allocation.height;
- border = pizza->container.border_width;
- attributes.x += border;
- attributes.y += border;
- attributes.width -= 2 * border;
- attributes.height -= 2 * border;
-
/* minimal size */
if (attributes.width < 2) attributes.width = 2;
if (attributes.height < 2) attributes.height = 2;
+ border = pizza->container.border_width;
+ w = attributes.width - 2 * border;
+ h = attributes.height - 2 * border;
+ if (w < 2) w = 2;
+ if (h < 2) h = 2;
+
+ if (!pizza->m_noscroll)
+ {
+ attributes.x += border;
+ attributes.y += border;
+ attributes.width = w;
+ attributes.height = h;
+ }
+
attributes.wclass = GDK_INPUT_OUTPUT;
attributes.visual = gtk_widget_get_visual (widget);
attributes.colormap = gtk_widget_get_colormap (widget);
attributes.x = 0;
attributes.y = 0;
+ if (pizza->m_noscroll)
+ {
+ attributes.x = border;
+ attributes.y = border;
+ attributes.width = w;
+ attributes.height = h;
+ }
attributes.event_mask = gtk_widget_get_events (widget);
attributes.event_mask |= GDK_EXPOSURE_MASK |
(widget->allocation.y == allocation->y));
widget->allocation = *allocation;
- border = pizza->container.border_width;
-
- x = allocation->x + border;
- y = allocation->y + border;
- w = allocation->width - border*2;
- h = allocation->height - border*2;
- if (w < 0)
- w = 0;
- if (h < 0)
- h = 0;
-
- if (GTK_WIDGET_REALIZED (widget))
+ if (GTK_WIDGET_REALIZED(widget))
{
- if (only_resize)
- gdk_window_resize( widget->window, w, h );
+ border = pizza->container.border_width;
+
+ x = allocation->x + border;
+ y = allocation->y + border;
+ w = allocation->width - border*2;
+ h = allocation->height - border*2;
+ if (w < 0)
+ w = 0;
+ if (h < 0)
+ h = 0;
+
+ if (pizza->m_noscroll)
+ {
+ if (only_resize)
+ gdk_window_resize( widget->window, allocation->width, allocation->height );
+ else
+ gdk_window_move_resize( widget->window, allocation->x, allocation->y,
+ allocation->width, allocation->height );
+
+ gdk_window_move_resize( pizza->bin_window, border, border, w, h );
+ }
else
- gdk_window_move_resize( widget->window, x, y, w, h );
+ {
+ if (only_resize)
+ gdk_window_resize( widget->window, w, h );
+ else
+ gdk_window_move_resize( widget->window, x, y, w, h );
- gdk_window_resize( pizza->bin_window, w, h );
+ gdk_window_resize( pizza->bin_window, w, h );
+ }
}
children = pizza->children;
if (gtk_widget_get_direction( GTK_WIDGET(pizza) ) == GTK_TEXT_DIR_RTL)
{
/* reverse horizontal placement */
- gint offset,border;
-
+ gint offset,border;
+
offset = GTK_WIDGET(pizza)->allocation.width;
border = pizza->container.border_width;
offset -= border*2;
-
- allocation.x = offset - child->x - allocation.width + pizza->m_xoffset;
- }
-
- gtk_widget_size_allocate (child->widget, &allocation);
-}
-static void
-gtk_pizza_adjust_allocations_recurse (GtkWidget *widget,
- gpointer cb_data)
-{
- GtkPizzaAdjData *data = cb_data;
-
- widget->allocation.x += data->dx;
- widget->allocation.y += data->dy;
-
- if (GTK_WIDGET_NO_WINDOW (widget) && GTK_IS_CONTAINER (widget))
- {
- gtk_container_forall (GTK_CONTAINER (widget),
- gtk_pizza_adjust_allocations_recurse,
- cb_data);
+ allocation.x = offset - child->x - allocation.width + pizza->m_xoffset;
}
+
+ gtk_widget_size_allocate (child->widget, &allocation);
}
-static void
-gtk_pizza_adjust_allocations (GtkPizza *pizza,
- gint dx,
- gint dy)
+void
+gtk_pizza_scroll (GtkPizza *pizza, gint dx, gint dy)
{
GList *tmp_list;
- GtkPizzaAdjData data;
-
- data.dx = dx;
- data.dy = dy;
+
+ pizza->m_xoffset += dx;
+ pizza->m_yoffset += dy;
+ if (pizza->bin_window)
+ gdk_window_scroll( pizza->bin_window, -dx, -dy );
+
tmp_list = pizza->children;
while (tmp_list)
{
GtkPizzaChild *child = tmp_list->data;
tmp_list = tmp_list->next;
- child->widget->allocation.x += dx;
- child->widget->allocation.y += dy;
-
- if (GTK_WIDGET_NO_WINDOW (child->widget) &&
- GTK_IS_CONTAINER (child->widget))
- {
- gtk_container_forall (GTK_CONTAINER (child->widget),
- gtk_pizza_adjust_allocations_recurse,
- &data);
- }
+ GtkAllocation alloc = child->widget->allocation;
+ alloc.x -= dx;
+ alloc.y -= dy;
+ gtk_widget_size_allocate( child->widget, &alloc );
}
}
-void
-gtk_pizza_scroll (GtkPizza *pizza, gint dx, gint dy)
-{
- pizza->m_xoffset += dx;
- pizza->m_yoffset += dy;
-
- gtk_pizza_adjust_allocations (pizza, -dx, -dy);
-
- if (pizza->bin_window)
- gdk_window_scroll( pizza->bin_window, -dx, -dy );
-}
-
#ifdef __cplusplus
}
#endif /* __cplusplus */
projects / wxWidgets.git / blobdiff