From cbf7df0e0d89ca51247ccbc35ae00e1cf317936e Mon Sep 17 00:00:00 2001
From: Jonathan Moore Liles <j.liles@unix.net>
Date: Wed, 10 Apr 2013 19:23:35 -0700
Subject: [PATCH] Mixer: Clean up strip layout.

---
 mixer/src/Controller_Module.C |  2 +-
 mixer/src/Mixer_Strip.C       | 27 +++++++++++++++------------
 mixer/src/Mixer_Strip.H       |  1 +
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/mixer/src/Controller_Module.C b/mixer/src/Controller_Module.C
index 8db6fc1..86af136 100644
--- a/mixer/src/Controller_Module.C
+++ b/mixer/src/Controller_Module.C
@@ -281,7 +281,7 @@ Controller_Module::connect_spatializer_to ( Module *m )
         o->labelcolor(FL_FOREGROUND_COLOR);
         o->align(FL_ALIGN_TOP);
         o->when(FL_WHEN_CHANGED);
-        o->label( "Spatialization" );
+        label( "Spatialization" );
 
         o->align(FL_ALIGN_TOP);
         o->labelsize( 10 );
diff --git a/mixer/src/Mixer_Strip.C b/mixer/src/Mixer_Strip.C
index 92c8904..5f0274e 100644
--- a/mixer/src/Mixer_Strip.C
+++ b/mixer/src/Mixer_Strip.C
@@ -303,10 +303,12 @@ Mixer_Strip::set_spatializer_visibility ( void )
     if ( fader_tab->visible() && spatialization_controller->is_controlling() )
     {
          spatialization_controller->show();
+         spatialization_label->show();
     }
     else
     {
          spatialization_controller->hide();
+         spatialization_label->hide();
     }
 }
 
@@ -471,7 +473,7 @@ Mixer_Strip::init ( )
                     o->resizable(0);
                     o->end();
                 }
-                { Fl_Scalepack* o = new Fl_Scalepack(2, 135, 105, 315 );
+                { Fl_Scalepack* o = new Fl_Scalepack(2, 135, 105, 311 );
                     // o->box( FL_BORDER_BOX );
 //                        o->color( FL_RED );
                     o->spacing( 20 );
@@ -505,17 +507,18 @@ Mixer_Strip::init ( )
 /*         { Fl_Pack *o = panner_pack = new Fl_Pack( 2, 465, 114, 40 ); */
 /*             o->spacing( 2 ); */
 /*             o->type( Fl_Pack::VERTICAL ); */
-        { Fl_Box *o = new Fl_Box( 0, 0, 100, 12 );
-            o->align( (Fl_Align)(FL_ALIGN_BOTTOM | FL_ALIGN_INSIDE) );
-            o->labelsize( 10 );
-//                o->label( "Spatialization" );
-        }
-        { Controller_Module *o = spatialization_controller = new Controller_Module( true );
-            o->hide();
-            o->pad( false );
-            o->size( 100, 100 );
-        }
-         
+            { Fl_Box *o = spatialization_label = new Fl_Box( 0, 0, 100, 12 );
+                o->align( (Fl_Align)(FL_ALIGN_BOTTOM | FL_ALIGN_INSIDE) );
+                o->labelsize( 10 );
+                o->hide();
+                o->label( "Spatialization" );
+            }
+            { Controller_Module *o = spatialization_controller = new Controller_Module( true );
+                o->hide();
+                o->label( 0 );
+                o->pad( false );
+                o->size( 100, 100 );
+            }
 /*             o->end(); */
 /*         } */
         o->end();
diff --git a/mixer/src/Mixer_Strip.H b/mixer/src/Mixer_Strip.H
index c1a64aa..5b65723 100644
--- a/mixer/src/Mixer_Strip.H
+++ b/mixer/src/Mixer_Strip.H
@@ -103,6 +103,7 @@ private:
 
     Chain *_chain;
 
+    Fl_Box *spatialization_label;
     Controller_Module *gain_controller;
     Controller_Module *jack_input_controller;
     Controller_Module *spatialization_controller;