X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/de4a74e2d01d600081c50a087c313a770906b560..a9efc294a979fb4ae801f7dc37af35677301212d:/src/gtk/win_gtk.c diff --git a/src/gtk/win_gtk.c b/src/gtk/win_gtk.c index b77c9a2768..6eb8b4e1e2 100644 --- a/src/gtk/win_gtk.c +++ b/src/gtk/win_gtk.c @@ -22,7 +22,6 @@ extern "C" { typedef struct _GtkPizzaChild GtkPizzaChild; typedef struct _GtkPizzaClass GtkPizzaClass; -typedef struct _GtkPizzaAdjData GtkPizzaAdjData; struct _GtkPizzaClass { @@ -40,12 +39,6 @@ struct _GtkPizzaChild gint y; }; -struct _GtkPizzaAdjData -{ - gint dx; - gint dy; -}; - static void gtk_pizza_class_init (GtkPizzaClass *klass); static void gtk_pizza_init (GtkPizza *pizza); @@ -71,8 +64,6 @@ static void gtk_pizza_forall (GtkContainer *container, 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); @@ -198,6 +189,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; @@ -214,6 +206,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); } @@ -240,7 +246,7 @@ void gtk_pizza_set_xoffset (GtkPizza *pizza, gint xoffset) g_return_if_fail (GTK_IS_PIZZA (pizza)); pizza->m_xoffset = xoffset; - // do something + /* do something */ } void gtk_pizza_set_yoffset (GtkPizza *pizza, gint yoffset) @@ -249,7 +255,7 @@ void gtk_pizza_set_yoffset (GtkPizza *pizza, gint yoffset) g_return_if_fail (GTK_IS_PIZZA (pizza)); pizza->m_xoffset = yoffset; - // do something + /* do something */ } gint gtk_pizza_get_rtl_offset (GtkPizza *pizza) @@ -258,11 +264,11 @@ gint gtk_pizza_get_rtl_offset (GtkPizza *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; } @@ -303,8 +309,6 @@ 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); } void @@ -340,8 +344,12 @@ gtk_pizza_set_size (GtkPizza *pizza, if (child->widget == widget) { - child->x = x; - child->y = y; + 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); @@ -389,6 +397,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)); @@ -403,16 +412,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); @@ -425,6 +442,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 | @@ -539,25 +563,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; @@ -675,75 +712,34 @@ 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; - } - - 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; } -} -static void -gtk_pizza_adjust_allocations (GtkPizza *pizza, - gint dx, - gint dy) -{ - GList *tmp_list; - GtkPizzaAdjData data; - - data.dx = dx; - data.dy = 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); - } - } + gtk_widget_size_allocate (child->widget, &allocation); } void gtk_pizza_scroll (GtkPizza *pizza, gint dx, gint dy) { + GList *tmp_list; + 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 ); + + for (tmp_list = pizza->children; tmp_list; tmp_list = tmp_list->next) + { + GtkPizzaChild *child = tmp_list->data; + gtk_widget_queue_resize(child->widget); + } } #ifdef __cplusplus