From: Richard Kettlewell <rjk@greenend.org.uk>
Date: Sun, 6 Dec 2009 11:30:20 +0000 (+0000)
Subject: Merge compact mode volume slider changes.
X-Git-Tag: 5.0~25
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/commitdiff_plain/1f2a5e52d2a40d7a80a18afc93f9da173e7a2196?hp=c2b331101e92ac0440e83653e2ee76cb36174a9c

Merge compact mode volume slider changes.
---

diff --git a/disobedience/control.c b/disobedience/control.c
index e371ca9..bc3c2c5 100644
--- a/disobedience/control.c
+++ b/disobedience/control.c
@@ -334,7 +334,8 @@ static void volume_changed(const char attribute((unused)) *event,
   /* Only display volume/balance controls if they will work */
   if(volume_supported()) {
     gtk_widget_show(volume_widget);
-    gtk_widget_show(balance_widget);
+    if(full_mode)
+      gtk_widget_show(balance_widget);
     l = volume_l / 100.0;
     r = volume_r / 100.0;
     gtk_adjustment_set_value(volume_adj, volume(l, r) * goesupto);
@@ -566,10 +567,13 @@ static int disable_rtp(disorder_eclient attribute((unused)) *c,
 static void control_minimode(const char attribute((unused)) *event,
                              void attribute((unused)) *evendata,
                              void attribute((unused)) *callbackdata) {
-  if(full_mode && volume_supported())
+  if(full_mode && volume_supported()) {
     gtk_widget_show(balance_widget);
-  else
+    gtk_scale_set_value_pos(GTK_SCALE(volume_widget), GTK_POS_TOP);
+  } else {
     gtk_widget_hide(balance_widget);
+    gtk_scale_set_value_pos(GTK_SCALE(volume_widget), GTK_POS_RIGHT);
+  }
 }
 
 /*