lots of tricks & tweaks related to the monitor section and All That It Uses

git-svn-id: svn://localhost/ardour2/branches/3.0@6777 d708f5d6-7413-0410-9779-e7cbd77b26cf

4 files changed, 42 insertions, 23 deletions

diff --git a/libs/gtkmm2ext/gtkmm2ext/tearoff.h b/libs/gtkmm2ext/gtkmm2ext/tearoff.h
index db01684e2f..9aff73fbb1 100644
--- a/libs/gtkmm2ext/gtkmm2ext/tearoff.h
+++ b/libs/gtkmm2ext/gtkmm2ext/tearoff.h
@@ -48,9 +48,10 @@ class TearOff : public Gtk::HBox
 	bool torn_off() const;
         void tear_it_off ();
         void put_it_back ();
+        void hide_visible ();
 
-        void set_tornoff_state (const XMLNode&);
-        void add_tornoff_state (XMLNode&) const;
+        void set_state (const XMLNode&);
+        void add_state (XMLNode&) const;
 
   private:
 	Gtk::Widget&   contents;
diff --git a/libs/gtkmm2ext/motionfeedback.cc b/libs/gtkmm2ext/motionfeedback.cc
index 7a10b3f614..8cdaac067c 100644
--- a/libs/gtkmm2ext/motionfeedback.cc
+++ b/libs/gtkmm2ext/motionfeedback.cc
@@ -54,7 +54,10 @@ MotionFeedback::MotionFeedback (Glib::RefPtr<Gdk::Pixbuf> pix,
 	    set_adjustment (adj);
 	}
 
-	pack_start (pixwin, false, false);
+        HBox* hpacker = manage (new HBox);
+        hpacker->pack_start (pixwin, true, false);
+        hpacker->show ();
+	pack_start (*hpacker, false, false);
 	pixwin.show ();
 
 	if (with_numeric_display) {
diff --git a/libs/gtkmm2ext/stateful_button.cc b/libs/gtkmm2ext/stateful_button.cc
index 66cc2f192a..a4503ed863 100644
--- a/libs/gtkmm2ext/stateful_button.cc
+++ b/libs/gtkmm2ext/stateful_button.cc
@@ -22,8 +22,6 @@
 
 #include <gtkmm/main.h>
 
-#include "pbd/stacktrace.h"
-
 #include <gtkmm2ext/stateful_button.h>
 
 using namespace Gtk;
@@ -65,6 +63,7 @@ StateButton::set_visual_state (int n)
 	}
 
 	set_widget_name (name);
+
 	visual_state = n;
 }
 
@@ -110,10 +109,7 @@ StatefulToggleButton::set_widget_name (const std::string& name)
 
 	if (w) {
 		w->set_name (name); 
-	} else {
-		cerr << "Statefull TOggle button - no child\n";
-		PBD::stacktrace (cerr, 20);
-	}
+	} 
 }
 
 void
@@ -124,8 +120,5 @@ StatefulButton::set_widget_name (const std::string& name)
 
 	if (w) {
 		w->set_name (name); 
-	} else {
-		cerr << "Stateful button - no child\n";
-		PBD::stacktrace (cerr, 20);
-	}
+	} 
 }
diff --git a/libs/gtkmm2ext/tearoff.cc b/libs/gtkmm2ext/tearoff.cc
index 28fb5ba4ef..32f440f379 100644
--- a/libs/gtkmm2ext/tearoff.cc
+++ b/libs/gtkmm2ext/tearoff.cc
@@ -56,24 +56,25 @@ TearOff::TearOff (Widget& c, bool allow_resize)
 	close_event_box.set_events (BUTTON_PRESS_MASK|BUTTON_RELEASE_MASK);
 	close_event_box.signal_button_release_event().connect (mem_fun (*this, &TearOff::close_click));
 	
-	own_window.add_events (KEY_PRESS_MASK|KEY_RELEASE_MASK|BUTTON_PRESS_MASK|BUTTON_RELEASE_MASK|POINTER_MOTION_MASK|POINTER_MOTION_HINT_MASK);
-	own_window.set_resizable (allow_resize);
-	own_window.set_type_hint (WINDOW_TYPE_HINT_TOOLBAR);
-        own_window.signal_realize().connect (sigc::mem_fun (*this, &TearOff::own_window_realized));
-        own_window.signal_configure_event().connect (sigc::mem_fun (*this, &TearOff::own_window_configured), false);
 
 	VBox* box1;
 	box1 = manage (new VBox);
 	box1->pack_start (close_event_box, false, false, 2);
 	
 	window_box.pack_end (*box1, false, false, 2);
+
+	own_window.add_events (KEY_PRESS_MASK|KEY_RELEASE_MASK|BUTTON_PRESS_MASK|BUTTON_RELEASE_MASK|POINTER_MOTION_MASK|POINTER_MOTION_HINT_MASK);
+	own_window.set_resizable (allow_resize);
+	own_window.set_type_hint (WINDOW_TYPE_HINT_TOOLBAR);
+
 	own_window.add (window_box);
 	
 	own_window.signal_button_press_event().connect (mem_fun (*this, &TearOff::window_button_press));
 	own_window.signal_button_release_event().connect (mem_fun (*this, &TearOff::window_button_release));
 	own_window.signal_motion_notify_event().connect (mem_fun (*this, &TearOff::window_motion));
 	own_window.signal_delete_event().connect (mem_fun (*this, &TearOff::window_delete_event));
-	own_window.signal_realize().connect (bind (sigc::ptr_fun (Gtkmm2ext::set_decoration), &own_window, WMDecoration (DECOR_BORDER|DECOR_RESIZEH)));
+        own_window.signal_realize().connect (sigc::mem_fun (*this, &TearOff::own_window_realized));
+        own_window.signal_configure_event().connect (sigc::mem_fun (*this, &TearOff::own_window_configured), false);
 
 	tearoff_arrow.set_name ("TearOffArrow");
 	close_arrow.set_name ("TearOffArrow");
@@ -249,7 +250,7 @@ TearOff::torn_off() const
 }
 
 void
-TearOff::add_tornoff_state (XMLNode& node) const
+TearOff::add_state (XMLNode& node) const
 {
         node.add_property ("tornoff", (own_window.is_visible() ? "yes" : "no"));
 
@@ -268,7 +269,7 @@ TearOff::add_tornoff_state (XMLNode& node) const
 }        
 
 void
-TearOff::set_tornoff_state (const XMLNode& node)
+TearOff::set_state (const XMLNode& node)
 {
         Glib::RefPtr<Gdk::Window> win;
         const XMLProperty* prop;
@@ -278,8 +279,10 @@ TearOff::set_tornoff_state (const XMLNode& node)
         }
 
         if (prop->value() == "yes") {
+                cerr << "Tearing off " << node.name() << endl;
                 tear_it_off ();
         } else {
+                cerr << "Putting back " << node.name() << endl;
                 put_it_back ();
         }
 
@@ -296,13 +299,20 @@ TearOff::set_tornoff_state (const XMLNode& node)
                 sscanf (prop->value().c_str(), "%d", &own_window_ypos);
         }
 
-        own_window.set_default_size (own_window_width, own_window_height);
-        own_window.move (own_window_xpos, own_window_ypos);
+        if (own_window.is_realized()) {
+                own_window.set_default_size (own_window_width, own_window_height);
+                own_window.move (own_window_xpos, own_window_ypos);
+        }
+        /* otherwise do it once the window is realized, see below */
 }        
 
 void
 TearOff::own_window_realized ()
 {
+        cerr << "tearoff realized\n";
+
+	own_window.get_window()->set_decorations (WMDecoration (DECOR_BORDER|DECOR_RESIZEH));
+
         if (own_window_width > 0) {
                 own_window.set_default_size (own_window_width, own_window_height);
                 own_window.move (own_window_xpos, own_window_ypos);
@@ -323,3 +333,15 @@ TearOff::own_window_configured (GdkEventConfigure*)
 
         return false;
 }
+
+void
+TearOff::hide_visible ()
+{
+        if (torn_off()) {
+                own_window.hide ();
+        }
+
+        hide ();
+}
+
+