st-scroll-view: Fix style

This commit is contained in:
Jasper St. Pierre 2013-12-11 20:35:21 -05:00
parent 04a31a52ae
commit b168ccb605

View File

@ -598,36 +598,36 @@ st_scroll_view_allocate (ClutterActor *actor,
*/ */
/* Vertical scrollbar */ /* Vertical scrollbar */
if (clutter_actor_get_text_direction (actor) == CLUTTER_TEXT_DIRECTION_RTL) if (clutter_actor_get_text_direction (actor) == CLUTTER_TEXT_DIRECTION_RTL)
{ {
child_box.x1 = content_box.x1; child_box.x1 = content_box.x1;
child_box.x2 = content_box.x1 + sb_width; child_box.x2 = content_box.x1 + sb_width;
} }
else else
{ {
child_box.x1 = content_box.x2 - sb_width; child_box.x1 = content_box.x2 - sb_width;
child_box.x2 = content_box.x2; child_box.x2 = content_box.x2;
} }
child_box.y1 = content_box.y1; child_box.y1 = content_box.y1;
child_box.y2 = content_box.y2 - (hscrollbar_visible ? sb_height : 0); child_box.y2 = content_box.y2 - (hscrollbar_visible ? sb_height : 0);
clutter_actor_allocate (priv->vscroll, &child_box, flags); clutter_actor_allocate (priv->vscroll, &child_box, flags);
/* Horizontal scrollbar */ /* Horizontal scrollbar */
if (clutter_actor_get_text_direction (actor) == CLUTTER_TEXT_DIRECTION_RTL) if (clutter_actor_get_text_direction (actor) == CLUTTER_TEXT_DIRECTION_RTL)
{ {
child_box.x1 = content_box.x1 + (vscrollbar_visible ? sb_width : 0); child_box.x1 = content_box.x1 + (vscrollbar_visible ? sb_width : 0);
child_box.x2 = content_box.x2; child_box.x2 = content_box.x2;
} }
else else
{ {
child_box.x1 = content_box.x1; child_box.x1 = content_box.x1;
child_box.x2 = content_box.x2 - (vscrollbar_visible ? sb_width : 0); child_box.x2 = content_box.x2 - (vscrollbar_visible ? sb_width : 0);
} }
child_box.y1 = content_box.y2 - sb_height; child_box.y1 = content_box.y2 - sb_height;
child_box.y2 = content_box.y2; child_box.y2 = content_box.y2;
clutter_actor_allocate (priv->hscroll, &child_box, flags); clutter_actor_allocate (priv->hscroll, &child_box, flags);
/* In case the scrollbar policy is NEVER or scrollbars should be /* In case the scrollbar policy is NEVER or scrollbars should be
* overlayed, we don't trim the content box allocation by the * overlayed, we don't trim the content box allocation by the