From: Richard Kettlewell <rjk@greenend.org.uk>
Date: Tue, 1 Dec 2009 18:49:20 +0000 (+0000)
Subject: Track window size between main and compact mode.
X-Git-Tag: 5.0~27^2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/commitdiff_plain/c2f519409c8d38f59e169abfc39bc97586222f85

Track window size between main and compact mode.
Enable compact mode support.
---

diff --git a/CHANGES.html b/CHANGES.html
index b9ed4e3..17da951 100644
--- a/CHANGES.html
+++ b/CHANGES.html
@@ -99,7 +99,8 @@ span.command {
       &ldquo;Recent&rdquo;, &ldquo;Added&rdquo; and &ldquo;Choose&rdquo; tabs
       to the queue.</p>
 
-      <p>Disobedience now supports playlist editing.</p>
+      <p>Disobedience now supports playlist editing and has a compact mode,
+      available from the <b>Control</b> menu.</p>
 
       <p>Disobedience has a <a href="disobedience/manual/index.html">new
       manual</a>.</p>
diff --git a/disobedience/disobedience.c b/disobedience/disobedience.c
index 95949f6..8ca36e5 100644
--- a/disobedience/disobedience.c
+++ b/disobedience/disobedience.c
@@ -172,6 +172,10 @@ static GtkWidget *notebook(void) {
   return tabs;
 }
 
+/* Tracking of window sizes */
+static int toplevel_width = 640, toplevel_height = 480;
+static int mini_width = 480, mini_height = 140;
+
 static void main_minimode(const char attribute((unused)) *event,
                           void attribute((unused)) *evendata,
                           void attribute((unused)) *callbackdata) {
@@ -180,9 +184,24 @@ static void main_minimode(const char attribute((unused)) *event,
     gtk_widget_hide(playing_mini);
     /* Show the queue (bit confusing otherwise!) */
     gtk_notebook_set_current_page(GTK_NOTEBOOK(tabs), 0);
+    gtk_window_resize(GTK_WINDOW(toplevel), toplevel_width, toplevel_height);
   } else {
     gtk_widget_hide(tabs);
     gtk_widget_show(playing_mini);
+    gtk_window_resize(GTK_WINDOW(toplevel), mini_width, mini_height);
+  }
+}
+
+/* Called when the window size is allocate */
+static void toplevel_size_allocate(GtkWidget attribute((unused)) *w,
+                                   GtkAllocation *a,
+                                   gpointer attribute((unused)) user_data) {
+  if(full_mode) {
+    toplevel_width = a->width;
+    toplevel_height = a->height;
+  } else {
+    mini_width = a->width;
+    mini_height = a->height;
   }
 }
 
@@ -194,10 +213,14 @@ static void make_toplevel_window(void) {
   D(("top_window"));
   toplevel = gtk_window_new(GTK_WINDOW_TOPLEVEL);
   /* default size is too small */
-  gtk_window_set_default_size(GTK_WINDOW(toplevel), 640, 480);
+  gtk_window_set_default_size(GTK_WINDOW(toplevel),
+                              toplevel_width, toplevel_height);
   /* terminate on close */
   g_signal_connect(G_OBJECT(toplevel), "delete_event",
                    G_CALLBACK(delete_event), NULL);
+  /* track size */
+  g_signal_connect(G_OBJECT(toplevel), "size-allocate",
+                   G_CALLBACK(toplevel_size_allocate), NULL);
   /* lay out the window */
   gtk_window_set_title(GTK_WINDOW(toplevel), "Disobedience");
   gtk_container_add(GTK_CONTAINER(toplevel), vbox);
diff --git a/disobedience/menu.c b/disobedience/menu.c
index f54fe4a..8947426 100644
--- a/disobedience/menu.c
+++ b/disobedience/menu.c
@@ -352,7 +352,6 @@ GtkWidget *menubar(GtkWidget *w) {
       (char *)"<CheckItem>",            /* item_type */
       0                                 /* extra_data */
     },
-#if 0
     {
       (char *)"/Control/Compact mode",  /* path */
       (char *)"<CTRL>M",                /* accelerator */
@@ -361,7 +360,6 @@ GtkWidget *menubar(GtkWidget *w) {
       (char *)"<CheckItem>",            /* item_type */
       0                                 /* extra_data */
     },
-#endif
     {
       (char *)"/Control/Activate playlist", /* path */
       0,                                /* accelerator */