add new clear-gray color theme

[ardour.git] / gtk2_ardour / vst_plugin_ui.cc

diff --git a/gtk2_ardour/vst_plugin_ui.cc b/gtk2_ardour/vst_plugin_ui.cc
index 2bd9724b871b6c72920cd747b6ce0271427abf97..a964e96b4ee920ecb08f233c6e8cb8f779ade326 100644 (file)
--- a/gtk2_ardour/vst_plugin_ui.cc
+++ b/gtk2_ardour/vst_plugin_ui.cc
@@ -17,10 +17,19 @@
 
 */
 
+#include <gtkmm.h>
 #include "ardour/vst_plugin.h"
 #include "ardour/vst_types.h"
+#include "ardour/plugin_insert.h"
 #include "vst_plugin_ui.h"
+
+#ifdef PLATFORM_WINDOWS
+#include <gdk/gdkwin32.h>
+#elif defined __APPLE__
+// TODO
+#else
 #include <gdk/gdkx.h>
+#endif
 
 VSTPluginUI::VSTPluginUI (boost::shared_ptr<ARDOUR::PluginInsert> insert, boost::shared_ptr<ARDOUR::VSTPlugin> plugin)
        : PlugUIBase (insert)
@@ -30,7 +39,8 @@ VSTPluginUI::VSTPluginUI (boost::shared_ptr<ARDOUR::PluginInsert> insert, boost:
        box->set_spacing (6);
        box->set_border_width (6);
        box->pack_end (focus_button, false, false);
-       box->pack_end (bypass_button, false, false, 10);
+       box->pack_end (bypass_button, false, false, 4);
+       box->pack_end (reset_button, false, false, 4);
        box->pack_end (delete_button, false, false);
        box->pack_end (save_button, false, false);
        box->pack_end (add_button, false, false);
@@ -41,6 +51,7 @@ VSTPluginUI::VSTPluginUI (boost::shared_ptr<ARDOUR::PluginInsert> insert, boost:
        pack_start (*box, false, false);
 #ifdef GDK_WINDOWING_X11
        pack_start (_socket, true, true);
+       _socket.set_border_width (0);
 #endif
 }
 
@@ -50,26 +61,24 @@ VSTPluginUI::~VSTPluginUI ()
 }
 
 void
-VSTPluginUI::preset_selected ()
+VSTPluginUI::preset_selected (ARDOUR::Plugin::PresetRecord preset)
 {
 #ifdef GDK_WINDOWING_X11
        _socket.grab_focus ();
 #endif
-       PlugUIBase::preset_selected ();
+       PlugUIBase::preset_selected (preset);
 }
 
 int
 VSTPluginUI::get_preferred_height ()
 {
-       int preferred_height = _vst->state()->height;
-       preferred_height += _vst->state()->voffset;
-       return preferred_height;
+       return _vst->state()->height + _vst->state()->voffset;
 }
 
 int
 VSTPluginUI::get_preferred_width ()
 {
-       return _vst->state()->width;
+       return _vst->state()->width + _vst->state()->hoffset;
 }
 
 int
@@ -81,8 +90,11 @@ VSTPluginUI::package (Gtk::Window& win)
 
        /* This assumes that the window's owner understands the XEmbed protocol */
        _socket.add_id (get_XID ());
+       _socket.set_size_request(
+                       _vst->state()->width + _vst->state()->hoffset,
+                       _vst->state()->height + _vst->state()->voffset);
 #endif
-       
+
        return 0;
 }
 
@@ -141,4 +153,3 @@ VSTPluginUI::configure_handler (GdkEventConfigure*)
 #endif
        return false;
 }
-