redesign toggling of editor/mixer stacking to use Gtkmm2ext::VisibilityTracker

2 files changed, 22 insertions, 1 deletions

diff --git a/libs/gtkmm2ext/gtkmm2ext/visibility_tracker.h b/libs/gtkmm2ext/gtkmm2ext/visibility_tracker.h
index 6415dd6d2b..f4ed62bb21 100644
--- a/libs/gtkmm2ext/gtkmm2ext/visibility_tracker.h
+++ b/libs/gtkmm2ext/gtkmm2ext/visibility_tracker.h
@@ -35,6 +35,10 @@ class VisibilityTracker {
     
     void cycle_visibility ();
 
+    bool fully_visible() const;
+    bool not_visible() const;
+    bool partially_visible() const;
+
   private:
     Gtk::Window& window;
     GdkVisibilityState _visibility;
diff --git a/libs/gtkmm2ext/visibility_tracker.cc b/libs/gtkmm2ext/visibility_tracker.cc
index c0aabdfca6..d5a020d370 100644
--- a/libs/gtkmm2ext/visibility_tracker.cc
+++ b/libs/gtkmm2ext/visibility_tracker.cc
@@ -41,10 +41,27 @@ VisibilityTracker::handle_visibility_notify_event (GdkEventVisibility* ev)
 void
 VisibilityTracker::cycle_visibility ()
 {
-	if (window.is_mapped() && (_visibility == GDK_VISIBILITY_UNOBSCURED)) {
+	if (fully_visible ()) {
 		window.hide ();
 	} else {
 		window.present ();
 	}
 }
 
+bool
+VisibilityTracker::fully_visible () const
+{
+	return window.is_mapped() && (_visibility == GDK_VISIBILITY_UNOBSCURED);
+}
+
+bool
+VisibilityTracker::not_visible () const
+{
+	return !window.is_mapped() || (_visibility == GDK_VISIBILITY_FULLY_OBSCURED);
+}
+
+bool
+VisibilityTracker::partially_visible () const
+{
+	return window.is_mapped() && (_visibility == GDK_VISIBILITY_PARTIAL);
+}