brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[StBoxLayout] now RTL aware

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=584662
This commit is contained in:
Abderrahim Kitouni 2009-11-14 18:22:36 +01:00 committed by Dan Winship
parent a5edc78fac
commit 4e8206d60e
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/st/st-box-layout.c
View File

@ -803,6 +803,8 @@ st_box_layout_allocate (ClutterActor *actor,
gint n_expand_children = 0, i; gint n_expand_children = 0, i;
gfloat expand_amount, shrink_amount; gfloat expand_amount, shrink_amount;
BoxChildShrink *shrinks = NULL; BoxChildShrink *shrinks = NULL;
gboolean flip = (st_widget_get_direction (ST_WIDGET (actor)) == ST_TEXT_DIRECTION_RTL)
&& (!priv->is_vertical);
CLUTTER_ACTOR_CLASS (st_box_layout_parent_class)->allocate (actor, box, CLUTTER_ACTOR_CLASS (st_box_layout_parent_class)->allocate (actor, box,
flags); flags);
@ -897,6 +899,8 @@ st_box_layout_allocate (ClutterActor *actor,
if (priv->is_vertical) if (priv->is_vertical)
position = content_box.y1; position = content_box.y1;
else if (flip)
position = content_box.x2;
else else
position = content_box.x1; position = content_box.x1;
@ -954,7 +958,10 @@ st_box_layout_allocate (ClutterActor *actor,
else if (shrink_amount > 0) else if (shrink_amount > 0)
child_allocated -= shrinks[i].shrink_amount; child_allocated -= shrinks[i].shrink_amount;
next_position = position + child_allocated; if (flip)
next_position = position - child_allocated;
else
next_position = position + child_allocated;
if (priv->is_vertical) if (priv->is_vertical)
{ {
@ -972,8 +979,17 @@ st_box_layout_allocate (ClutterActor *actor,
} }
else else
{ {
child_box.x1 = (int)(0.5 + position); if (flip)
child_box.x2 = (int)(0.5 + next_position); {
child_box.x1 = (int)(0.5 + next_position);
child_box.x2 = (int)(0.5 + position);
}
else
{
child_box.x1 = (int)(0.5 + position);
child_box.x2 = (int)(0.5 + next_position);
}
child_box.y1 = content_box.y1; child_box.y1 = content_box.y1;
if (priv->vadjustment) if (priv->vadjustment)
child_box.y2 = content_box.y1 + MAX (avail_height, natural_height); child_box.y2 = content_box.y1 + MAX (avail_height, natural_height);
@ -984,7 +1000,10 @@ st_box_layout_allocate (ClutterActor *actor,
clutter_actor_allocate (child, &child_box, flags); clutter_actor_allocate (child, &child_box, flags);
} }
position = next_position + priv->spacing; if (flip)
position = next_position - priv->spacing;
else
position = next_position + priv->spacing;
next_child: next_child:
if (priv->is_pack_start) if (priv->is_pack_start)