adjust plugin-UI height when toggling expanders

diff --git a/gtk2_ardour/plugin_ui.cc b/gtk2_ardour/plugin_ui.cc
index 711b1f555fc1d430bf53cec56192135f1a7f6c87..1f70537a41dc4cc402c09a7e47faba3dc1e593b4 100644 (file)
--- a/gtk2_ardour/plugin_ui.cc
+++ b/gtk2_ardour/plugin_ui.cc
@@ -710,7 +710,19 @@ PlugUIBase::toggle_description()
        }
 
        if (!description_expander.get_expanded()) {
+               const int child_height = description_expander.get_child ()->get_height ();
+
                description_expander.remove();
+
+               Gtk::Window *toplevel = (Gtk::Window*) description_expander.get_ancestor (GTK_TYPE_WINDOW);
+
+               if (toplevel) {
+                       Gtk::Requisition wr;
+                       toplevel->get_size (wr.width, wr.height);
+                       wr.height -= child_height;
+                       toplevel->resize (wr.width, wr.height);
+               }
+
        }
 }
 
@@ -725,12 +737,6 @@ PlugUIBase::toggle_plugin_analysis()
                        eqgui = new PluginEqGui (insert);
                }
 
-               Gtk::Window *toplevel = (Gtk::Window*) plugin_analysis_expander.get_ancestor (GTK_TYPE_WINDOW);
-
-               if (toplevel) {
-                       toplevel->get_size (pre_eq_size.width, pre_eq_size.height);
-               }
-
                plugin_analysis_expander.add (*eqgui);
                plugin_analysis_expander.show_all ();
                eqgui->start_listening ();
@@ -738,6 +744,7 @@ PlugUIBase::toggle_plugin_analysis()
 
        if (!plugin_analysis_expander.get_expanded()) {
                // Hide & remove from expander
+               const int child_height = plugin_analysis_expander.get_child ()->get_height ();
 
                eqgui->hide ();
                eqgui->stop_listening ();
@@ -746,7 +753,10 @@ PlugUIBase::toggle_plugin_analysis()
                Gtk::Window *toplevel = (Gtk::Window*) plugin_analysis_expander.get_ancestor (GTK_TYPE_WINDOW);
 
                if (toplevel) {
-                       toplevel->resize (pre_eq_size.width, pre_eq_size.height);
+                       Gtk::Requisition wr;
+                       toplevel->get_size (wr.width, wr.height);
+                       wr.height -= child_height;
+                       toplevel->resize (wr.width, wr.height);
                }
        }
 }

diff --git a/gtk2_ardour/plugin_ui.h b/gtk2_ardour/plugin_ui.h
index d07b287e6a68541aa5b7a518f44fbf09165ec982..895d8681ab1dbcb0b9501bbc8602a73357dfed4f 100644 (file)
--- a/gtk2_ardour/plugin_ui.h
+++ b/gtk2_ardour/plugin_ui.h
@@ -153,7 +153,6 @@ class PlugUIBase : public virtual sigc::trackable, public PBD::ScopedConnectionL
        ArdourWindow* latency_dialog;
 
        PluginEqGui* eqgui;
-       Gtk::Requisition pre_eq_size;
 
        Gtk::Image* focus_out_image;
        Gtk::Image* focus_in_image;