[snappy] ui: relocation of subtitle toggle

[Luis de Bethencourt <luisbg src gnome org>]

commit 69ec9ba6b4caa56ca024cdc2267b95b968d7294e
Author: Luis de Bethencourt <luis debethencourt com>
Date:   Thu Dec 13 11:55:54 2012 -0500

    ui: relocation of subtitle toggle

 docs/clutter_controls_layout |    2 +-
 src/user_interface.c         |   49 ++++++++++++++++++++++++------------------
 2 files changed, 29 insertions(+), 22 deletions(-)
---
diff --git a/docs/clutter_controls_layout b/docs/clutter_controls_layout
index 548161b..a7ea96a 100644
--- a/docs/clutter_controls_layout
+++ b/docs/clutter_controls_layout
@@ -40,8 +40,8 @@ ui->control_box (fixed alignment bin)
 				[
 					ui->video_stream_toggle
 					ui->audio_stream_toggle
-					ui->subtitle_toggle
 				]
+			ui->subtitle_toggle
 			]
 		]
 	]
diff --git a/src/user_interface.c b/src/user_interface.c
index 0eb40c6..ddb822e 100644
--- a/src/user_interface.c
+++ b/src/user_interface.c
@@ -663,19 +663,6 @@ load_controls (UserInterface * ui)
     }
     clutter_actor_add_child (bottom_box, ui->audio_stream_toggle);
 
-    // Controls subtitle toggle
-    ui->subtitle_toggle = gtk_clutter_texture_new ();
-    gtk_clutter_texture_set_from_pixbuf (GTK_CLUTTER_TEXTURE
-        (ui->subtitle_toggle),
-        gdk_pixbuf_new_from_file (ui->subtitle_toggle_png, NULL), &error);
-    if (!ui->subtitle_toggle && error)
-      g_debug ("Clutter error: %s", error->message);
-    if (error) {
-      g_error_free (error);
-      error = NULL;
-    }
-    clutter_actor_add_child (bottom_box, ui->subtitle_toggle);
-
     clutter_box_layout_pack (CLUTTER_BOX_LAYOUT (ui->pos_n_vol_layout), bottom_box, TRUE,       /* expand */
         FALSE,                  /* x-fill */
         FALSE,                  /* y-fill */
@@ -683,17 +670,35 @@ load_controls (UserInterface * ui)
         CLUTTER_BOX_ALIGNMENT_END);     /* y-align */
   }
 
-  clutter_box_layout_pack (CLUTTER_BOX_LAYOUT (ui->main_box_layout), ui->info_box, FALSE,       /* expand */
+  clutter_box_layout_pack (CLUTTER_BOX_LAYOUT (ui->info_box_layout), ui->pos_n_vol_box, FALSE,  /* expand */
+      FALSE,                    /* x-fill */
+      FALSE,                    /* y-fill */
+      CLUTTER_BOX_ALIGNMENT_END,        /* 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
+      (ui->subtitle_toggle),
+      gdk_pixbuf_new_from_file (ui->subtitle_toggle_png, NULL), &error);
+  if (!ui->subtitle_toggle && error)
+    g_debug ("Clutter error: %s", error->message);
+  if (error) {
+    g_error_free (error);
+    error = NULL;
+  }
+  // clutter_actor_add_child (ui->info_box, 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_CENTER);    /* y-align */
+      CLUTTER_BOX_ALIGNMENT_START);    /* y-align */
 
-  clutter_box_layout_pack (CLUTTER_BOX_LAYOUT (ui->info_box_layout), ui->pos_n_vol_box, FALSE,  /* expand */
+  clutter_box_layout_pack (CLUTTER_BOX_LAYOUT (ui->main_box_layout), ui->info_box, FALSE,       /* expand */
       FALSE,                    /* x-fill */
       FALSE,                    /* y-fill */
-      CLUTTER_BOX_ALIGNMENT_END,        /* x-align */
-      CLUTTER_BOX_ALIGNMENT_START);     /* y-align */
+      CLUTTER_BOX_ALIGNMENT_CENTER,     /* x-align */
+      CLUTTER_BOX_ALIGNMENT_CENTER);    /* y-align */
 
   clutter_actor_lower_bottom (ui->control_bg);
 
@@ -957,11 +962,12 @@ update_controls_size (UserInterface * ui)
     ctl_height = ctl_width / CONTROLS_ASPECT_RATIO;
   }
 
+  icon_size = ctl_height * PLAY_TOGGLE_RATIO;
+
   clutter_actor_set_size (CLUTTER_ACTOR (ui->control_box),
-      ctl_width + ((ctl_width / BG_W) * SHADOW_RIGHT),
+      ctl_width + ((ctl_width / BG_W) * SHADOW_RIGHT) + (icon_size * 0.72f),
       ctl_height + ((ctl_height / BG_H) * SHADOW_BOTTOM));
 
-  icon_size = ctl_height * PLAY_TOGGLE_RATIO;
   clutter_actor_set_size (ui->control_play_toggle, icon_size, icon_size);
 
   clutter_box_layout_set_spacing (CLUTTER_BOX_LAYOUT (ui->info_box_layout),
@@ -1003,9 +1009,10 @@ update_controls_size (UserInterface * ui)
   icon_size = ctl_height * VOLUME_ICON_RATIO;
   clutter_actor_set_size (ui->volume_low, icon_size, icon_size);
   clutter_actor_set_size (ui->volume_high, icon_size * 1.2f, icon_size);        /* originally 120x100 */
+  clutter_actor_set_size (ui->subtitle_toggle, icon_size * 1.4f,
+      icon_size);
 
   if (FALSE) {                  // hide this buttons (TODO: optional Flag)
-    clutter_actor_set_size (ui->subtitle_toggle, icon_size, icon_size);
     clutter_actor_set_size (ui->video_stream_toggle, icon_size, icon_size);
     clutter_actor_set_size (ui->audio_stream_toggle, icon_size, icon_size);
   }