X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8db7faf281abef276b1e84a2504191cbd3ce2606..4c0d2cd3d0c59bf0114e0e10355bff86ddb116a0:/src/gtk/win_gtk.c diff --git a/src/gtk/win_gtk.c b/src/gtk/win_gtk.c index 7e19cae8af..d0955231ce 100644 --- a/src/gtk/win_gtk.c +++ b/src/gtk/win_gtk.c @@ -20,8 +20,26 @@ 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; @@ -40,8 +58,6 @@ static void gtk_pizza_size_request (GtkWidget *widget, GtkRequisition *requisition); static void gtk_pizza_size_allocate (GtkWidget *widget, GtkAllocation *allocation); -static gint gtk_pizza_expose (GtkWidget *widget, - GdkEventExpose *event); static void gtk_pizza_style_set (GtkWidget *widget, GtkStyle *previous_style); static void gtk_pizza_add (GtkContainer *container, @@ -73,7 +89,7 @@ gtk_pizza_get_type () if (!pizza_type) { - static const GTypeInfo pizza_info = + const GTypeInfo pizza_info = { sizeof (GtkPizzaClass), NULL, /* base_init */ @@ -148,7 +164,6 @@ gtk_pizza_class_init (GtkPizzaClass *klass) widget_class->unrealize = gtk_pizza_unrealize; widget_class->size_request = gtk_pizza_size_request; widget_class->size_allocate = gtk_pizza_size_allocate; - widget_class->expose_event = gtk_pizza_expose; widget_class->style_set = gtk_pizza_style_set; container_class->add = gtk_pizza_add; @@ -183,6 +198,7 @@ gtk_pizza_child_type (GtkContainer *container) 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; @@ -199,6 +215,20 @@ gtk_pizza_new () 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); } @@ -239,19 +269,16 @@ void gtk_pizza_set_yoffset (GtkPizza *pizza, gint yoffset) gint gtk_pizza_get_rtl_offset (GtkPizza *pizza) { - gint width; gint border; g_return_val_if_fail ( (pizza != NULL), 0 ); g_return_val_if_fail ( (GTK_IS_PIZZA (pizza)), 0 ); - + if (!pizza->bin_window) return 0; - - gdk_window_get_geometry( pizza->bin_window, NULL, NULL, &width, NULL, NULL ); - + border = pizza->container.border_width; - - return width-border*2; + + return GTK_WIDGET(pizza)->allocation.width - border*2; } @@ -282,8 +309,6 @@ gtk_pizza_put (GtkPizza *pizza, 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); @@ -292,6 +317,7 @@ gtk_pizza_put (GtkPizza *pizza, gtk_widget_set_parent (widget, GTK_WIDGET (pizza)); + gtk_widget_set_size_request( widget, width, height ); if (GTK_WIDGET_REALIZED (pizza)) gtk_pizza_allocate_child (pizza, child_info); } @@ -329,16 +355,13 @@ gtk_pizza_set_size (GtkPizza *pizza, 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; @@ -385,6 +408,7 @@ gtk_pizza_realize (GtkWidget *widget) GtkPizzaChild *child; GList *children; int border; + int w, h; g_return_if_fail (widget != NULL); g_return_if_fail (GTK_IS_PIZZA (widget)); @@ -399,16 +423,24 @@ gtk_pizza_realize (GtkWidget *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); @@ -421,6 +453,13 @@ gtk_pizza_realize (GtkWidget *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 | @@ -535,25 +574,38 @@ gtk_pizza_size_allocate (GtkWidget *widget, (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; @@ -566,26 +618,6 @@ gtk_pizza_size_allocate (GtkWidget *widget, } } -static gint -gtk_pizza_expose (GtkWidget *widget, - GdkEventExpose *event) -{ - GtkPizza *pizza; - - g_return_val_if_fail (widget != NULL, FALSE); - g_return_val_if_fail (GTK_IS_PIZZA (widget), FALSE); - g_return_val_if_fail (event != NULL, FALSE); - - pizza = (GtkPizza*)widget; - - if (event->window != pizza->bin_window) - return FALSE; - - pizza_parent_class->expose_event(widget, event); - - return FALSE; -} - static void gtk_pizza_style_set(GtkWidget *widget, GtkStyle *previous_style) { @@ -691,15 +723,15 @@ gtk_pizza_allocate_child (GtkPizza *pizza, 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; + + allocation.x = offset - child->x - allocation.width + pizza->m_xoffset; } - + gtk_widget_size_allocate (child->widget, &allocation); }