rpms/gnome-media/devel fix-alignment-of-sliders.patch, NONE, 1.1 gnome-media.spec, 1.167, 1.168

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-media/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8885

Modified Files:
	gnome-media.spec 
Added Files:
	fix-alignment-of-sliders.patch 
Log Message:
fix alignment of sliders


fix-alignment-of-sliders.patch:

--- NEW FILE fix-alignment-of-sliders.patch ---
diff -up gnome-media-2.26.0/gnome-volume-control/src/gvc-balance-bar.c.fix-alignment-of-sliders gnome-media-2.26.0/gnome-volume-control/src/gvc-balance-bar.c
--- gnome-media-2.26.0/gnome-volume-control/src/gvc-balance-bar.c.fix-alignment-of-sliders	2009-03-03 16:26:48.000000000 -0500
+++ gnome-media-2.26.0/gnome-volume-control/src/gvc-balance-bar.c	2009-04-27 14:00:51.205166047 -0400
@@ -385,7 +385,7 @@ gvc_balance_bar_init (GvcBalanceBar *bar
         bar->priv->label = gtk_label_new_with_mnemonic (_("_Balance:"));
         gtk_misc_set_alignment (GTK_MISC (bar->priv->label),
                                 0.0,
-                                0.5);
+                                0.0);
         /* frame */
         frame = gtk_frame_new (NULL);
         gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
diff -up gnome-media-2.26.0/gnome-volume-control/src/gvc-channel-bar.c.fix-alignment-of-sliders gnome-media-2.26.0/gnome-volume-control/src/gvc-channel-bar.c
--- gnome-media-2.26.0/gnome-volume-control/src/gvc-channel-bar.c.fix-alignment-of-sliders	2009-04-27 14:00:51.192165593 -0400
+++ gnome-media-2.26.0/gnome-volume-control/src/gvc-channel-bar.c	2009-04-27 14:25:21.855382395 -0400
@@ -102,6 +102,7 @@ _scale_box_new (GvcChannelBar *bar)
         GtkWidget            *box;
         GtkWidget            *sbox;
         GtkWidget            *ebox;
+        GtkWidget            *alignment;
 
         if (priv->orientation == GTK_ORIENTATION_VERTICAL) {
                 bar->priv->scale_box = box = gtk_vbox_new (FALSE, 6);
@@ -143,7 +144,6 @@ _scale_box_new (GvcChannelBar *bar)
 
                 gtk_box_pack_start (GTK_BOX (sbox), priv->image, FALSE, FALSE, 0);
                 gtk_box_pack_start (GTK_BOX (sbox), priv->label, FALSE, FALSE, 0);
-
                 gtk_box_pack_start (GTK_BOX (box), priv->scale, TRUE, TRUE, 0);
 
                 bar->priv->end_box = ebox = gtk_hbox_new (FALSE, 6);
@@ -578,9 +578,20 @@ gvc_channel_bar_set_is_amplified (GvcCha
         	str = g_strdup_printf ("<small>%s</small>", C_("volume", "100%"));
         	gtk_scale_add_mark (GTK_SCALE (bar->priv->scale), ADJUSTMENT_MAX_NORMAL,
         			    GTK_POS_BOTTOM, str);
+		gtk_widget_queue_resize (bar->priv->scale);
         	g_free (str);
+                gtk_alignment_set (GTK_ALIGNMENT (bar->priv->mute_box), 0.5, 0, 0, 0);
+                gtk_misc_set_alignment (GTK_MISC (bar->priv->low_image), 0.5, 0);
+                gtk_misc_set_alignment (GTK_MISC (bar->priv->high_image), 0.5, 0);
+                gtk_misc_set_alignment (GTK_MISC (bar->priv->label), 0, 0);
+
+
 	} else {
 		gtk_scale_clear_marks (GTK_SCALE (bar->priv->scale));
+                gtk_alignment_set (GTK_ALIGNMENT (bar->priv->mute_box), 0.5, 0.5, 0, 0);
+                gtk_misc_set_alignment (GTK_MISC (bar->priv->low_image), 0.5, 0.5);
+                gtk_misc_set_alignment (GTK_MISC (bar->priv->high_image), 0.5, 0.5);
+                gtk_misc_set_alignment (GTK_MISC (bar->priv->label), 0, 0.5);
 	}
 }
 
@@ -826,9 +837,7 @@ gvc_channel_bar_init (GvcChannelBar *bar
         gtk_widget_set_no_show_all (bar->priv->image, TRUE);
 
         bar->priv->label = gtk_label_new (NULL);
-        gtk_misc_set_alignment (GTK_MISC (bar->priv->label),
-                                0.0,
-                                0.5);
+        gtk_misc_set_alignment (GTK_MISC (bar->priv->label), 0.0, 0.5);
         gtk_widget_set_no_show_all (bar->priv->label, TRUE);
 
         /* frame */


Index: gnome-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- gnome-media.spec	27 Apr 2009 06:24:09 -0000	1.167
+++ gnome-media.spec	27 Apr 2009 18:57:59 -0000	1.168
@@ -21,6 +21,9 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=574312
 Patch3:		gnome-media-add-100-mark.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=579115
+Patch4:         fix-alignment-of-sliders.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes:      gnome
 URL:            http://www.gnome.org
@@ -81,6 +84,7 @@
 pushd gnome-volume-control/src
 %patch3 -p0 -b .amplified-mark
 popd
+%patch4 -p1 -b .fix-alignment-of-sliders
 
 autoreconf -f -i
 
@@ -258,6 +262,7 @@
 %changelog
 * Mon Apr 27 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-2
 - Don't drop schemas translations from po files
+- Fix alignment of sliders
 
 * Mon Mar 16 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-1
 - Update to 2.26.0