Correct window placement only once.
This fixes edit label control placement in wxListCtrl in RTL. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42031 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
fe63cfad2b
commit
8db7faf281
@ -277,12 +277,6 @@ gtk_pizza_put (GtkPizza *pizza,
|
|||||||
g_return_if_fail (GTK_IS_PIZZA (pizza));
|
g_return_if_fail (GTK_IS_PIZZA (pizza));
|
||||||
g_return_if_fail (widget != NULL);
|
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 = g_new (GtkPizzaChild, 1);
|
||||||
|
|
||||||
child_info->widget = widget;
|
child_info->widget = widget;
|
||||||
@ -298,7 +292,8 @@ gtk_pizza_put (GtkPizza *pizza,
|
|||||||
|
|
||||||
gtk_widget_set_parent (widget, GTK_WIDGET (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
|
void
|
||||||
@ -541,6 +536,7 @@ gtk_pizza_size_allocate (GtkWidget *widget,
|
|||||||
widget->allocation = *allocation;
|
widget->allocation = *allocation;
|
||||||
|
|
||||||
border = pizza->container.border_width;
|
border = pizza->container.border_width;
|
||||||
|
|
||||||
x = allocation->x + border;
|
x = allocation->x + border;
|
||||||
y = allocation->y + border;
|
y = allocation->y + border;
|
||||||
w = allocation->width - border*2;
|
w = allocation->width - border*2;
|
||||||
|
Loading…
Reference in New Issue
Block a user