[snappy] ui: substitle/fullscreen buttons inside right_box

[Luis de Bethencourt <luisbg src gnome org>]

commit 815d3eb9ebffdaeefa785faf222e96d38e19e0d6
Author: Luis de Bethencourt <luis debethencourt com>
Date:   Thu Apr 18 12:21:02 2013 -0400

    ui: substitle/fullscreen buttons inside right_box

 docs/clutter_controls_layout |  9 ++++++---
 src/user_interface.c         | 28 ++++++++++++++++++----------
 2 files changed, 24 insertions(+), 13 deletions(-)
---
diff --git a/docs/clutter_controls_layout b/docs/clutter_controls_layout
index ffe2183..4702768 100644
--- a/docs/clutter_controls_layout
+++ b/docs/clutter_controls_layout
@@ -7,7 +7,7 @@ ui->control_box (fixed alignment bin)
        main_box (vertical alignment box)
        [
                ui->control_title
-               info_box (vertical alignment box)
+               info_box (horizontal alignment box)
                [
                        ui->control_play_toggle
                        ui->pos_n_vol_box (vertical alignment box)
@@ -31,8 +31,11 @@ ui->control_box (fixed alignment bin)
                                        ui->video_stream_toggle
                                        ui->audio_stream_toggle
                                ]
-                       ui->subtitle_toggle
-                       ui->fullscreen_button
+                       ]
+                       right_box (horizontal alignment box)
+                       [
+                               ui->subtitle_toggle
+                               ui->fullscreen_button
                        ]
                ]
        ]
diff --git a/src/user_interface.c b/src/user_interface.c
index 3df409b..a13495d 100644
--- a/src/user_interface.c
+++ b/src/user_interface.c
@@ -579,9 +579,11 @@ load_controls (UserInterface * ui)
   ClutterLayoutManager *controls_layout = NULL;
   ClutterLayoutManager *bottom_box_layout = NULL;
   ClutterLayoutManager *volume_box_layout = NULL;
+  ClutterLayoutManager *right_box_layout = NULL;
   ClutterActor *middle_box = NULL;
   ClutterActor *bottom_box = NULL;
   ClutterActor *vol_int_box = NULL;
+  ClutterActor *right_box = NULL;
   GError *error = NULL;
 
   ui->play_png = g_build_filename (ui->data_dir, "media-actions-start.svg",
@@ -850,6 +852,20 @@ load_controls (UserInterface * ui)
       CLUTTER_BOX_ALIGNMENT_START,      /* x-align */
       CLUTTER_BOX_ALIGNMENT_START);     /* y-align */
 
+  // Controls right box for subtitles and fullscreen
+  right_box_layout = clutter_box_layout_new ();
+  clutter_box_layout_set_orientation (CLUTTER_BOX_LAYOUT (right_box_layout),
+      CLUTTER_ORIENTATION_HORIZONTAL);
+  clutter_box_layout_set_spacing (CLUTTER_BOX_LAYOUT (right_box_layout), 10);
+  right_box = clutter_actor_new ();
+  clutter_actor_set_layout_manager (right_box, right_box_layout);
+
+  clutter_box_layout_pack (CLUTTER_BOX_LAYOUT (ui->info_box_layout), right_box, FALSE,        /* expand */
+      FALSE,                    /* x-fill */
+      FALSE,                    /* y-fill */
+      CLUTTER_BOX_ALIGNMENT_CENTER,     /* x-align */
+      CLUTTER_BOX_ALIGNMENT_START);     /* y-align */
+
   // Controls subtitle toggle
   ui->subtitle_toggle = gtk_clutter_texture_new ();
   gtk_clutter_texture_set_from_pixbuf (GTK_CLUTTER_TEXTURE
@@ -862,11 +878,7 @@ load_controls (UserInterface * ui)
     error = NULL;
   }
   clutter_actor_hide (ui->subtitle_toggle);
-  clutter_box_layout_pack (CLUTTER_BOX_LAYOUT (ui->info_box_layout), ui->subtitle_toggle, FALSE,        /* 
expand */
-      FALSE,                    /* x-fill */
-      FALSE,                    /* y-fill */
-      CLUTTER_BOX_ALIGNMENT_CENTER,     /* x-align */
-      CLUTTER_BOX_ALIGNMENT_START);     /* y-align */
+  clutter_actor_add_child (right_box, ui->subtitle_toggle);
 
   // Controls fullscreen
   ui->fullscreen_button = gtk_clutter_texture_new ();
@@ -879,11 +891,7 @@ load_controls (UserInterface * ui)
     g_error_free (error);
     error = NULL;
   }
-  clutter_box_layout_pack (CLUTTER_BOX_LAYOUT (ui->info_box_layout), ui->fullscreen_button, FALSE,        /* 
expand */
-      FALSE,                    /* x-fill */
-      FALSE,                    /* y-fill */
-      CLUTTER_BOX_ALIGNMENT_CENTER,     /* x-align */
-      CLUTTER_BOX_ALIGNMENT_START);     /* y-align */
+  clutter_actor_add_child (right_box, ui->fullscreen_button);
 
   // Add Info Box to Main Box Layout
   clutter_box_layout_pack (CLUTTER_BOX_LAYOUT (ui->main_box_layout), ui->info_box, FALSE,       /* expand */