diff options
| author | Robin Gareus <robin@gareus.org> | 2017-03-07 18:38:01 +0100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2017-03-08 13:03:46 +0100 |
| commit | 819d9fa3cd2421bbf6918e456f443cfe86f635de (patch) | |
| tree | a064e022b10b7bd7164f502e9dcc5a807d07ece9 /gtk2_ardour/vst_plugin_ui.cc | |
| parent | 4b982ef895e1e5d36b0be0b20e7a2810e3f16945 (diff) | |
VST UI sizeing rework
* prefer signal over timer-poll for VST size changes
* properly offset VST window (Windows)
* constrain window size (Windows)
* explicitly notify re-parent'ed child window (Linux)
Diffstat (limited to 'gtk2_ardour/vst_plugin_ui.cc')
| -rw-r--r-- | gtk2_ardour/vst_plugin_ui.cc | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/gtk2_ardour/vst_plugin_ui.cc b/gtk2_ardour/vst_plugin_ui.cc index 532fcf6722..7d9e349466 100644 --- a/gtk2_ardour/vst_plugin_ui.cc +++ b/gtk2_ardour/vst_plugin_ui.cc @@ -51,6 +51,7 @@ VSTPluginUI::VSTPluginUI (boost::shared_ptr<ARDOUR::PluginInsert> insert, boost: bypass_button.set_active (!insert->active ()); pack_start (*box, false, false); + box->signal_size_allocate().connect (sigc::mem_fun (*this, &VSTPluginUI::top_box_allocated)); #ifdef GDK_WINDOWING_X11 pack_start (_socket, true, true); _socket.set_border_width (0); @@ -122,6 +123,7 @@ VSTPluginUI::configure_handler (GdkEventConfigure*) XEvent event; gint x, y; GdkWindow* w; + Window xw = _vst->state()->linux_plugin_ui_window; if ((w = _socket.gobj()->plug_window) == 0) { return false; @@ -150,8 +152,19 @@ VSTPluginUI::configure_handler (GdkEventConfigure*) gdk_error_trap_push (); XSendEvent (GDK_WINDOW_XDISPLAY (w), GDK_WINDOW_XWINDOW (w), False, StructureNotifyMask, &event); + /* if the plugin does adds itself to the parent, + * but ardour re-parents it, we have a pointer to + * the socket's child and need to resize the + * child window (e.g. JUCE, u-he) + */ + if (xw) { + XMoveResizeWindow (GDK_WINDOW_XDISPLAY (w), xw, + 0, 0, _vst->state()->width, _vst->state()->height); + XMapRaised (GDK_WINDOW_XDISPLAY (w), xw); + XFlush (GDK_WINDOW_XDISPLAY (w)); + } gdk_error_trap_pop (); - #endif + return false; } |