diff options
| author | Robin Gareus <robin@gareus.org> | 2014-02-22 02:30:57 +0100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2014-02-22 03:11:49 +0100 |
| commit | 8843679e1fbf3d8b2989da65a61e26270c5f42c4 (patch) | |
| tree | 25d6195b6d344b97a6e9b7e0c74c165f1ec644df | |
| parent | dfdf9a35f1e990c45f35632eb993eb67f4f7abf8 (diff) | |
fix minimum VST GUI window size (gtk padding)
| -rw-r--r-- | gtk2_ardour/vst_plugin_ui.cc | 6 | ||||
| -rw-r--r-- | libs/ardour/ardour/vst_types.h | 1 | ||||
| -rw-r--r-- | libs/fst/vstwin.c | 6 |
3 files changed, 7 insertions, 6 deletions
diff --git a/gtk2_ardour/vst_plugin_ui.cc b/gtk2_ardour/vst_plugin_ui.cc index 2bd9724b87..35f59a71f5 100644 --- a/gtk2_ardour/vst_plugin_ui.cc +++ b/gtk2_ardour/vst_plugin_ui.cc @@ -61,15 +61,13 @@ VSTPluginUI::preset_selected () 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 diff --git a/libs/ardour/ardour/vst_types.h b/libs/ardour/ardour/vst_types.h index 2d273f1bc5..a393ef2b5a 100644 --- a/libs/ardour/ardour/vst_types.h +++ b/libs/ardour/ardour/vst_types.h @@ -97,6 +97,7 @@ struct LIBARDOUR_API _VSTState int wantIdle; int voffset; + int hoffset; int gui_shown; int destroy; int vst_version; diff --git a/libs/fst/vstwin.c b/libs/fst/vstwin.c index 75bf2372da..58ce0fd235 100644 --- a/libs/fst/vstwin.c +++ b/libs/fst/vstwin.c @@ -224,8 +224,10 @@ fst_new (void) fst->has_editor = 0; #ifdef PLATFORM_WINDOWS fst->voffset = 36; + fst->hoffset = 0; #else /* linux + wine */ fst->voffset = 24; + fst->hoffset = 6; #endif fst->program_set_without_editor = 0; return fst; @@ -463,9 +465,9 @@ fst_move_window_into_view (VSTState* fst) { if (fst->windows_window) { #ifdef PLATFORM_WINDOWS - SetWindowPos ((HWND)(fst->windows_window), 0, 0, fst->voffset, fst->width, fst->height, 0); + SetWindowPos ((HWND)(fst->windows_window), 0, fst->hoffset, fst->voffset, fst->width, fst->height, 0); #else /* linux + wine */ - SetWindowPos ((HWND)(fst->windows_window), 0, 0, 0, fst->width, fst->height, 0); + SetWindowPos ((HWND)(fst->windows_window), 0, 0, 0, fst->width + fst->hoffset, fst->height + fst->voffset, 0); #endif ShowWindow ((HWND)(fst->windows_window), SW_SHOWNA); } |