From 62734e71df45004264f9c4049cd21022c9159cb5 Mon Sep 17 00:00:00 2001 From: Steffen Baranowsky Date: Mon, 6 Jun 2016 16:21:56 +0200 Subject: [PATCH 1/3] MDI Subwindow Decoration for VeSTige instruments closes #2824 --- plugins/vst_base/VstPlugin.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/vst_base/VstPlugin.cpp b/plugins/vst_base/VstPlugin.cpp index d21b230b9e6..38690d44188 100644 --- a/plugins/vst_base/VstPlugin.cpp +++ b/plugins/vst_base/VstPlugin.cpp @@ -30,7 +30,6 @@ #include #include #include -#include #ifdef LMMS_BUILD_LINUX #if QT_VERSION < 0x050000 #include @@ -49,16 +48,17 @@ #include "GuiApplication.h" #include "MainWindow.h" #include "Song.h" +#include "SubWindow.h" #include "templates.h" #include "FileDialog.h" #include -class vstSubWin : public QMdiSubWindow +class vstSubWin : public SubWindow { public: vstSubWin( QWidget * _parent ) : - QMdiSubWindow( _parent ) + SubWindow( _parent ) { setAttribute( Qt::WA_DeleteOnClose, false ); } From 6344da8541327050b6c99bacf634ea0b106eada5 Mon Sep 17 00:00:00 2001 From: Steffen Baranowksy Date: Wed, 26 Jun 2019 10:32:10 +0200 Subject: [PATCH 2/3] revert changes --- plugins/vst_base/VstPlugin.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/vst_base/VstPlugin.cpp b/plugins/vst_base/VstPlugin.cpp index 38690d44188..d21b230b9e6 100644 --- a/plugins/vst_base/VstPlugin.cpp +++ b/plugins/vst_base/VstPlugin.cpp @@ -30,6 +30,7 @@ #include #include #include +#include #ifdef LMMS_BUILD_LINUX #if QT_VERSION < 0x050000 #include @@ -48,17 +49,16 @@ #include "GuiApplication.h" #include "MainWindow.h" #include "Song.h" -#include "SubWindow.h" #include "templates.h" #include "FileDialog.h" #include -class vstSubWin : public SubWindow +class vstSubWin : public QMdiSubWindow { public: vstSubWin( QWidget * _parent ) : - SubWindow( _parent ) + QMdiSubWindow( _parent ) { setAttribute( Qt::WA_DeleteOnClose, false ); } From 83e54c8990f0c451378802625c64deeb7363f73a Mon Sep 17 00:00:00 2001 From: Steffen Baranowksy Date: Wed, 26 Jun 2019 10:53:44 +0200 Subject: [PATCH 3/3] change QMdiSubWindow to our SubWindow in Vestige --- plugins/vestige/vestige.cpp | 4 ++-- plugins/vestige/vestige.h | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/plugins/vestige/vestige.cpp b/plugins/vestige/vestige.cpp index 1d54538b63e..82d4d0407b6 100644 --- a/plugins/vestige/vestige.cpp +++ b/plugins/vestige/vestige.cpp @@ -82,11 +82,11 @@ Plugin::Descriptor Q_DECL_EXPORT vestige_plugin_descriptor = } -class vstSubWin : public QMdiSubWindow +class vstSubWin : public SubWindow { public: vstSubWin( QWidget * _parent ) : - QMdiSubWindow( _parent ) + SubWindow( _parent ) { setAttribute( Qt::WA_DeleteOnClose, false ); setWindowFlags( Qt::WindowCloseButtonHint ); diff --git a/plugins/vestige/vestige.h b/plugins/vestige/vestige.h index 3b92eea8ffc..e4ef11fce52 100644 --- a/plugins/vestige/vestige.h +++ b/plugins/vestige/vestige.h @@ -29,14 +29,13 @@ #include #include -#include #include #include "Instrument.h" #include "InstrumentView.h" #include "Note.h" #include "Knob.h" - +#include "SubWindow.h" #include "AutomatableModel.h"