X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/693460233749fec3bf79720268d3cd8dfc55c78d..50679f941ec64c417c39582b276068fef8ca59cb:/src/gtk/win_gtk.c diff --git a/src/gtk/win_gtk.c b/src/gtk/win_gtk.c index ead5ad20d6..02e277c659 100644 --- a/src/gtk/win_gtk.c +++ b/src/gtk/win_gtk.c @@ -64,8 +64,7 @@ static void gtk_pizza_scroll_set_adjustments (GtkPizza *pizza, GtkAdjustment *hadj, GtkAdjustment *vadj); -/* static */ -GtkContainerClass *pizza_parent_class = NULL; +static GtkWidgetClass* pizza_parent_class; GtkType gtk_pizza_get_type () @@ -85,6 +84,7 @@ gtk_pizza_get_type () sizeof (GtkPizza), 16, /* n_preallocs */ (GInstanceInitFunc) gtk_pizza_init, + NULL }; pizza_type = g_type_register_static (GTK_TYPE_CONTAINER, "GtkPizza", &pizza_info, (GTypeFlags)0); } @@ -189,18 +189,10 @@ gtk_pizza_init (GtkPizza *pizza) pizza->children = NULL; - pizza->width = 20; - pizza->height = 20; - pizza->bin_window = NULL; - pizza->xoffset = 0; - pizza->yoffset = 0; - - pizza->scroll_x = 0; - pizza->scroll_y = 0; - - pizza->external_expose = FALSE; + pizza->m_xoffset = 0; + pizza->m_yoffset = 0; } GtkWidget* @@ -213,6 +205,64 @@ gtk_pizza_new () return GTK_WIDGET (pizza); } +gint gtk_pizza_get_xoffset (GtkPizza *pizza) +{ + g_return_val_if_fail ( (pizza != NULL), -1 ); + g_return_val_if_fail ( (GTK_IS_PIZZA (pizza)), -1 ); + + return pizza->m_xoffset; +} + +gint gtk_pizza_get_yoffset (GtkPizza *pizza) +{ + g_return_val_if_fail ( (pizza != NULL), -1 ); + g_return_val_if_fail ( (GTK_IS_PIZZA (pizza)), -1 ); + + return pizza->m_yoffset; +} + +void gtk_pizza_set_xoffset (GtkPizza *pizza, gint xoffset) +{ + g_return_if_fail (pizza != NULL); + g_return_if_fail (GTK_IS_PIZZA (pizza)); + + pizza->m_xoffset = xoffset; + // do something +} + +void gtk_pizza_set_yoffset (GtkPizza *pizza, gint yoffset) +{ + g_return_if_fail (pizza != NULL); + g_return_if_fail (GTK_IS_PIZZA (pizza)); + + pizza->m_xoffset = yoffset; + // do something +} + +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 ); + + if (pizza->shadow_type == GTK_MYSHADOW_NONE) + border = 0; + else + if (pizza->shadow_type == GTK_MYSHADOW_THIN) + border = 1; + else + border = 2; + + return width-border*2; +} + + static void gtk_pizza_scroll_set_adjustments (GtkPizza *pizza, GtkAdjustment *hadj, @@ -240,16 +290,6 @@ gtk_pizza_set_shadow_type (GtkPizza *pizza, } } -void -gtk_pizza_set_external (GtkPizza *pizza, - gboolean expose) -{ - g_return_if_fail (pizza != NULL); - g_return_if_fail (GTK_IS_PIZZA (pizza)); - - pizza->external_expose = expose; -} - void gtk_pizza_put (GtkPizza *pizza, GtkWidget *widget, @@ -264,6 +304,12 @@ gtk_pizza_put (GtkPizza *pizza, g_return_if_fail (GTK_IS_PIZZA (pizza)); g_return_if_fail (widget != NULL); + if (gtk_widget_get_direction( GTK_WIDGET(pizza) ) == GTK_TEXT_DIR_RTL) + { + /* reverse horizontal placement */ + x = GTK_WIDGET(pizza)->allocation.width - x - width; + } + child_info = g_new (GtkPizzaChild, 1); child_info->widget = widget; @@ -324,7 +370,7 @@ gtk_pizza_set_size (GtkPizza *pizza, child->y = y; child->width = width; child->height = height; - + gtk_widget_set_size_request (widget, width, height); return; @@ -480,8 +526,8 @@ gtk_pizza_unrealize (GtkWidget *widget) gdk_window_destroy (pizza->bin_window); pizza->bin_window = NULL; - if (GTK_WIDGET_CLASS (pizza_parent_class)->unrealize) - (* GTK_WIDGET_CLASS (pizza_parent_class)->unrealize) (widget); + if (pizza_parent_class->unrealize) + pizza_parent_class->unrealize(widget); } static void @@ -526,6 +572,7 @@ gtk_pizza_size_allocate (GtkWidget *widget, gint x,y,w,h; GtkPizzaChild *child; GList *children; + gboolean only_resize; g_return_if_fail (widget != NULL); g_return_if_fail (GTK_IS_PIZZA(widget)); @@ -533,6 +580,8 @@ gtk_pizza_size_allocate (GtkWidget *widget, pizza = GTK_PIZZA (widget); + only_resize = ((widget->allocation.x == allocation->x) && + (widget->allocation.y == allocation->y)); widget->allocation = *allocation; if (pizza->shadow_type == GTK_MYSHADOW_NONE) @@ -554,8 +603,12 @@ gtk_pizza_size_allocate (GtkWidget *widget, if (GTK_WIDGET_REALIZED (widget)) { - gdk_window_move_resize( widget->window, x, y, w, h ); - gdk_window_move_resize( pizza->bin_window, 0, 0, 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 ); } children = pizza->children; @@ -578,16 +631,12 @@ gtk_pizza_expose (GtkWidget *widget, g_return_val_if_fail (GTK_IS_PIZZA (widget), FALSE); g_return_val_if_fail (event != NULL, FALSE); - pizza = GTK_PIZZA (widget); + pizza = (GtkPizza*)widget; if (event->window != pizza->bin_window) return FALSE; - /* We handle all expose events in window.cpp now. */ - if (pizza->external_expose) - return FALSE; - - (* GTK_WIDGET_CLASS (pizza_parent_class)->expose_event) (widget, event); + pizza_parent_class->expose_event(widget, event); return FALSE; } @@ -601,7 +650,7 @@ gtk_pizza_style_set(GtkWidget *widget, GtkStyle *previous_style) gtk_style_set_background(widget->style, GTK_PIZZA(widget)->bin_window, GTK_STATE_NORMAL ); } - (* GTK_WIDGET_CLASS (pizza_parent_class)->style_set) (widget, previous_style); + pizza_parent_class->style_set(widget, previous_style); } static void @@ -688,12 +737,31 @@ gtk_pizza_allocate_child (GtkPizza *pizza, GtkAllocation allocation; GtkRequisition requisition; - allocation.x = child->x - pizza->xoffset; - allocation.y = child->y - pizza->yoffset; + allocation.x = child->x - pizza->m_xoffset; + allocation.y = child->y - pizza->m_yoffset; gtk_widget_get_child_requisition (child->widget, &requisition); allocation.width = requisition.width; allocation.height = requisition.height; + if (gtk_widget_get_direction( GTK_WIDGET(pizza) ) == GTK_TEXT_DIR_RTL) + { + /* reverse horizontal placement */ + gint offset,border; + + offset = GTK_WIDGET(pizza)->allocation.width; + + if (pizza->shadow_type == GTK_MYSHADOW_NONE) + border = 0; + else + if (pizza->shadow_type == GTK_MYSHADOW_THIN) + border = 1; + else + border = 2; + offset -= border*2; + + allocation.x = offset - child->x - allocation.width - pizza->m_xoffset; + } + gtk_widget_size_allocate (child->widget, &allocation); } @@ -747,8 +815,8 @@ gtk_pizza_adjust_allocations (GtkPizza *pizza, void gtk_pizza_scroll (GtkPizza *pizza, gint dx, gint dy) { - pizza->xoffset += dx; - pizza->yoffset += dy; + pizza->m_xoffset += dx; + pizza->m_yoffset += dy; gtk_pizza_adjust_allocations (pizza, -dx, -dy);