LMMS · messmerd · Nov 21, 2025 · Oct 16, 2025 · Oct 18, 2025 · Oct 18, 2025
diff --git a/data/themes/default/detach.svg b/data/themes/default/detach.svg
diff --git a/data/themes/default/window.svg b/data/themes/default/window.svg
diff --git a/include/ControllerDialog.h b/include/ControllerDialog.h
@@ -26,9 +26,11 @@
 #ifndef LMMS_GUI_CONTROLLER_DIALOG_H
 #define LMMS_GUI_CONTROLLER_DIALOG_H
 
-#include "DetachableWidget.h"
+#include <QWidget>
+
 #include "ModelView.h"
 
+
 namespace lmms
 {
 
@@ -37,7 +39,7 @@ class Controller;
 namespace gui
 {
 
-class ControllerDialog : public DetachableWidget, public ModelView
+class ControllerDialog : public QWidget, public ModelView
 {
 public:
 	ControllerDialog(Controller* controller, QWidget* parent);

diff --git a/include/ControllerRackView.h b/include/ControllerRackView.h
@@ -25,13 +25,15 @@
 #ifndef LMMS_GUI_CONTROLLER_RACK_VIEW_H
 #define LMMS_GUI_CONTROLLER_RACK_VIEW_H
 
-#include "DetachableWidget.h"
+#include <QWidget>
+
 #include "SerializingObject.h"
 
 class QPushButton;
 class QScrollArea;
 class QVBoxLayout;
 
+
 namespace lmms
 {
 
@@ -42,7 +44,7 @@ namespace gui
 
 class ControllerView;
 
-class ControllerRackView : public DetachableWidget, public SerializingObject
+class ControllerRackView : public QWidget, public SerializingObject
 {
 	Q_OBJECT
 public:

diff --git a/include/ControllerView.h b/include/ControllerView.h
@@ -64,7 +64,6 @@ class ControllerView : public QFrame, public ModelView
 public slots:
 	void editControls();
 	void removeController();
-	void closeControls();
 	void renameController();
 	void moveUp();
 	void moveDown();
@@ -85,7 +84,6 @@ public slots:
 	QMdiSubWindow * m_subWindow;
 	ControllerDialog * m_controllerDlg;
 	QLabel * m_nameLabel;
-	bool m_show;
 
 } ;
 

diff --git a/include/DetachableWidget.h b/include/DetachableWidget.h
diff --git a/include/DetachableWindow.h b/include/DetachableWindow.h
diff --git a/include/Editor.h b/include/Editor.h
@@ -25,10 +25,9 @@
 #ifndef LMMS_GUI_EDITOR_H
 #define LMMS_GUI_EDITOR_H
 
+#include <QMainWindow>
 #include <QToolBar>
 
-#include "DetachableWindow.h"
-
 class QAction;
 
 namespace lmms::gui
@@ -46,7 +45,7 @@ class DropToolBar;
 ///
 /// Those editors include the Song Editor, the Automation Editor, B&B Editor,
 /// and the Piano Roll.
-class Editor : public DetachableWindow
+class Editor : public QMainWindow
 {
 	Q_OBJECT
 public:

diff --git a/include/EffectControlDialog.h b/include/EffectControlDialog.h
@@ -26,9 +26,11 @@
 #ifndef LMMS_GUI_EFFECT_CONTROL_DIALOG_H
 #define LMMS_GUI_EFFECT_CONTROL_DIALOG_H
 
-#include "DetachableWidget.h"
+#include <QWidget>
+
 #include "ModelView.h"
 
+
 namespace lmms
 {
 
@@ -37,14 +39,12 @@ class EffectControls;
 namespace gui
 {
 
-class LMMS_EXPORT EffectControlDialog : public DetachableWidget, public ModelView
+class LMMS_EXPORT EffectControlDialog : public QWidget, public ModelView
 {
 public:
 	EffectControlDialog(EffectControls* controls);
 	~EffectControlDialog() override = default;
 
-	virtual bool isResizable() const { return false; }
-
 protected:
 	EffectControls* m_effectControls;
 };

diff --git a/include/EffectView.h b/include/EffectView.h
@@ -73,7 +73,6 @@ public slots:
 	void moveUp();
 	void moveDown();
 	void deletePlugin();
-	void closeEffects();
 
 
 signals:

diff --git a/include/MainWindow.h b/include/MainWindow.h
@@ -141,9 +141,13 @@ class MainWindow : public QMainWindow
 
 	static void saveWidgetState( QWidget * _w, QDomElement & _de );
 	static void restoreWidgetState( QWidget * _w, const QDomElement & _de );
+	void setAllSubWindowsDetached(bool detached);
 
 	bool eventFilter(QObject* watched, QEvent* event) override;
 
+signals:
+	void detachAllSubWindows(bool detached);
+
 public slots:
 	void resetWindowTitle();
 

diff --git a/include/MicrotunerConfig.h b/include/MicrotunerConfig.h
@@ -25,9 +25,10 @@
 #ifndef LMMS_GUI_MICROTUNER_CONFIG_H
 #define LMMS_GUI_MICROTUNER_CONFIG_H
 
+#include <QWidget>
+
 #include "AutomatableModel.h"
 #include "ComboBoxModel.h"
-#include "DetachableWidget.h"
 #include "SerializingObject.h"
 
 class QLineEdit;
@@ -37,7 +38,7 @@ namespace lmms::gui
 {
 
 
-class LMMS_EXPORT MicrotunerConfig : public DetachableWidget, public SerializingObject
+class LMMS_EXPORT MicrotunerConfig : public QWidget, public SerializingObject
 {
 	Q_OBJECT
 public:

diff --git a/include/MixerView.h b/include/MixerView.h
@@ -25,8 +25,9 @@
 #ifndef LMMS_GUI_MIXER_VIEW_H
 #define LMMS_GUI_MIXER_VIEW_H
 
+#include <QWidget>
+
 #include "MixerChannelView.h"
-#include "DetachableWidget.h"
 #include "ModelView.h"
 #include "SerializingObject.h"
 
@@ -45,7 +46,7 @@ namespace lmms::gui
 {
 
 class LMMS_EXPORT MixerView
-	: public DetachableWidget
+	: public QWidget
 	, public ModelView
 	, public SerializingObjectHook
 {