diff options
| -rw-r--r-- | gtk2_ardour/plugin_ui.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/windows_vst_plugin_ui.cc | 16 | ||||
| -rw-r--r-- | gtk2_ardour/windows_vst_plugin_ui.h | 2 | ||||
| -rw-r--r-- | libs/fst/vstwin.c | 4 |
4 files changed, 10 insertions, 14 deletions
diff --git a/gtk2_ardour/plugin_ui.cc b/gtk2_ardour/plugin_ui.cc index ac5f7fd9a6..190fd2ad96 100644 --- a/gtk2_ardour/plugin_ui.cc +++ b/gtk2_ardour/plugin_ui.cc @@ -227,7 +227,7 @@ PluginUIWindow::create_windows_vst_editor(boost::shared_ptr<PluginInsert>) << endmsg; throw failed_constructor (); } else { - WindowsVSTPluginUI* vpu = new WindowsVSTPluginUI (insert, vp); + WindowsVSTPluginUI* vpu = new WindowsVSTPluginUI (insert, vp, GTK_WIDGET(this->gobj())); _pluginui = vpu; _pluginui->KeyboardFocused.connect (sigc::mem_fun (*this, &PluginUIWindow::keyboard_focused)); diff --git a/gtk2_ardour/windows_vst_plugin_ui.cc b/gtk2_ardour/windows_vst_plugin_ui.cc index 1ce83f8992..45111f840d 100644 --- a/gtk2_ardour/windows_vst_plugin_ui.cc +++ b/gtk2_ardour/windows_vst_plugin_ui.cc @@ -38,22 +38,18 @@ using namespace Gtk; using namespace ARDOUR; using namespace PBD; -WindowsVSTPluginUI::WindowsVSTPluginUI (boost::shared_ptr<PluginInsert> pi, boost::shared_ptr<VSTPlugin> vp) +WindowsVSTPluginUI::WindowsVSTPluginUI (boost::shared_ptr<PluginInsert> pi, boost::shared_ptr<VSTPlugin> vp, GtkWidget *parent) : VSTPluginUI (pi, vp) { #ifdef GDK_WINDOWING_WIN32 - -#if 0 // TODO verify window vs vbox-widget WRT to plugin_analysis_expander - GtkWindow* wobj = GTK_WINDOW(gtk_widget_get_toplevel(this->gobj())); -#else - GtkVBox* wobj = this->gobj(); -#endif - - gtk_widget_realize(GTK_WIDGET(wobj)); - void* hWndHost = gdk_win32_drawable_get_handle(GTK_WIDGET(wobj)->window); + gtk_widget_realize(parent); + void* hWndHost = gdk_win32_drawable_get_handle(parent->window); fst_run_editor (_vst->state(), hWndHost); + // TODO pack a placeholder (compare to VSTPluginUI::VSTPluginUI X11 socket) + // have placeholder use VSTPluginUI::get_preferred_height(), width() + // TODO pack plugin_analysis_expander at the bottom. #else fst_run_editor (_vst->state(), NULL); pack_start (plugin_analysis_expander, true, true); diff --git a/gtk2_ardour/windows_vst_plugin_ui.h b/gtk2_ardour/windows_vst_plugin_ui.h index 7b23f2cb33..2fa0bbc705 100644 --- a/gtk2_ardour/windows_vst_plugin_ui.h +++ b/gtk2_ardour/windows_vst_plugin_ui.h @@ -22,7 +22,7 @@ class WindowsVSTPluginUI : public VSTPluginUI { public: - WindowsVSTPluginUI (boost::shared_ptr<ARDOUR::PluginInsert>, boost::shared_ptr<ARDOUR::VSTPlugin>); + WindowsVSTPluginUI (boost::shared_ptr<ARDOUR::PluginInsert>, boost::shared_ptr<ARDOUR::VSTPlugin>, GtkWidget *parent); ~WindowsVSTPluginUI (); bool start_updating (GdkEventAny*) { return false; } diff --git a/libs/fst/vstwin.c b/libs/fst/vstwin.c index a55d4e59aa..27fb3cbead 100644 --- a/libs/fst/vstwin.c +++ b/libs/fst/vstwin.c @@ -223,7 +223,7 @@ fst_new (void) fst->n_pending_keys = 0; fst->has_editor = 0; #ifdef PLATFORM_WINDOWS - fst->voffset = 36; + fst->voffset = 50; fst->hoffset = 0; #else /* linux + wine */ fst->voffset = 24; @@ -465,7 +465,7 @@ fst_move_window_into_view (VSTState* fst) { if (fst->windows_window) { #ifdef PLATFORM_WINDOWS - SetWindowPos ((HWND)(fst->windows_window), 0, fst->hoffset, fst->voffset, fst->width, fst->height, 0); + SetWindowPos ((HWND)(fst->windows_window), 0, fst->hoffset, fst->voffset, fst->width + fst->hoffset, fst->height + fst->voffset, 0); #else /* linux + wine */ SetWindowPos ((HWND)(fst->windows_window), 0, 0, 0, fst->width + fst->hoffset, fst->height + fst->voffset, 0); #endif |