LMMS · messmerd · Nov 21, 2025 · Oct 16, 2025 · Oct 18, 2025 · Oct 18, 2025
diff --git a/include/ControllerDialog.h b/include/ControllerDialog.h
@@ -26,9 +26,10 @@
 #ifndef LMMS_GUI_CONTROLLER_DIALOG_H
 #define LMMS_GUI_CONTROLLER_DIALOG_H
 
-#include "DetachableWidget.h"
 #include "ModelView.h"
 
+#include <QWidget>
+
 namespace lmms
 {
 
@@ -37,7 +38,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,9 +25,10 @@
 #ifndef LMMS_GUI_CONTROLLER_RACK_VIEW_H
 #define LMMS_GUI_CONTROLLER_RACK_VIEW_H
 
-#include "DetachableWidget.h"
 #include "SerializingObject.h"
 
+#include <QWidget>
+
 class QPushButton;
 class QScrollArea;
 class QVBoxLayout;
@@ -42,7 +43,7 @@ namespace gui
 
 class ControllerView;
 
-class ControllerRackView : public DetachableWidget, public SerializingObject
+class ControllerRackView : public QWidget, public SerializingObject
 {
 	Q_OBJECT
 public:

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,10 @@
 #ifndef LMMS_GUI_EFFECT_CONTROL_DIALOG_H
 #define LMMS_GUI_EFFECT_CONTROL_DIALOG_H
 
-#include "DetachableWidget.h"
 #include "ModelView.h"
 
+#include <QWidget>
+
 namespace lmms
 {
 
@@ -37,7 +38,7 @@ class EffectControls;
 namespace gui
 {
 
-class LMMS_EXPORT EffectControlDialog : public DetachableWidget, public ModelView
+class LMMS_EXPORT EffectControlDialog : public QWidget, public ModelView
 {
 public:
 	EffectControlDialog(EffectControls* controls);

diff --git a/include/MicrotunerConfig.h b/include/MicrotunerConfig.h
@@ -27,17 +27,18 @@
 
 #include "AutomatableModel.h"
 #include "ComboBoxModel.h"
-#include "DetachableWidget.h"
 #include "SerializingObject.h"
 
+#include <QWidget>
+
 class QLineEdit;
 class QPlainTextEdit;
 
 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
@@ -26,10 +26,11 @@
 #define LMMS_GUI_MIXER_VIEW_H
 
 #include "MixerChannelView.h"
-#include "DetachableWidget.h"
 #include "ModelView.h"
 #include "SerializingObject.h"
 
+#include <QWidget>
+
 class QDomDocument;  // IWYU pragma: keep
 class QDomElement;  // IWYU pragma: keep
 class QHBoxLayout;
@@ -45,7 +46,7 @@ namespace lmms::gui
 {
 
 class LMMS_EXPORT MixerView
-	: public DetachableWidget
+	: public QWidget
 	, public ModelView
 	, public SerializingObjectHook
 {

diff --git a/include/ProjectNotes.h b/include/ProjectNotes.h
@@ -25,9 +25,10 @@
 #ifndef LMMS_GUI_PROJECT_NOTES_H
 #define LMMS_GUI_PROJECT_NOTES_H
 
-#include "DetachableWindow.h"
 #include "SerializingObject.h"
 
+#include <QMainWindow>
+
 class QAction;
 class QComboBox;
 class QTextCharFormat;
@@ -37,7 +38,7 @@ namespace lmms::gui
 {
 
 
-class LMMS_EXPORT ProjectNotes : public DetachableWindow, public SerializingObject
+class LMMS_EXPORT ProjectNotes : public QMainWindow, public SerializingObject
 {
 	Q_OBJECT
 public:

diff --git a/include/SampleTrackWindow.h b/include/SampleTrackWindow.h
@@ -25,11 +25,12 @@
 #ifndef LMMS_GUI_SAMPLE_TRACK_WINDOW_H
 #define LMMS_GUI_SAMPLE_TRACK_WINDOW_H
 
-#include "DetachableWidget.h"
 #include "ModelView.h"
 #include "SampleTrack.h"
 #include "SerializingObject.h"
 
+#include <QWidget>
+
 class QLineEdit;
 
 namespace lmms::gui
@@ -42,7 +43,7 @@ class MixerChannelLcdSpinBox;
 class SampleTrackView;
 
 
-class SampleTrackWindow : public DetachableWidget, public ModelView, public SerializingObjectHook
+class SampleTrackWindow : public QWidget, public ModelView, public SerializingObjectHook
 {
 	Q_OBJECT
 public:

diff --git a/include/SubWindow.h b/include/SubWindow.h
@@ -63,11 +63,15 @@ class LMMS_EXPORT SubWindow : public QMdiSubWindow
 	QBrush activeColor() const;
 	QColor textShadowColor() const;
 	QColor borderColor() const;
+	QMargins decorationMargins() const;
 	void setActiveColor( const QBrush & b );
 	void setTextShadowColor( const QColor &c );
 	void setBorderColor( const QColor &c );
 	int titleBarHeight() const;
 	int frameWidth() const;
+	void setWidget(QWidget* widget);  // Hook for QMdiSubWindow::setWidget
+	bool isDetached() const;
+	void setDetached(bool on);
 
 	// TODO Needed to update the title bar when replacing instruments.
 	// Update works automatically if QMdiSubWindows are used.
@@ -80,14 +84,13 @@ public slots:
 
 protected:
 	// hook the QWidget move/resize events to update the tracked geometry
-	void moveEvent( QMoveEvent * event ) override;
-	void resizeEvent( QResizeEvent * event ) override;
-	void paintEvent( QPaintEvent * pe ) override;
-	void changeEvent( QEvent * event ) override;
+	void moveEvent(QMoveEvent* event) override;
+	void resizeEvent(QResizeEvent* event) override;
+	void paintEvent(QPaintEvent* pe) override;
+	void changeEvent(QEvent* event) override;
+	void showEvent(QShowEvent* e) override;
 	bool eventFilter(QObject* obj, QEvent* event) override;
 
-	bool isDetached() const;
-
 signals:
 	void focusLost();
 
@@ -106,6 +109,7 @@ public slots:
 	QLabel * m_windowTitle;
 	QGraphicsDropShadowEffect * m_shadow;
 	bool m_hasFocus;
+	QRect m_childGeom;
 
 	static void elideText( QLabel *label, QString text );
 	void adjustTitleBar();

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -9,8 +9,6 @@ SET(LMMS_SRCS
 	gui/ControllerRackView.cpp
 	gui/ControllerView.cpp
 	gui/Controls.cpp
-	gui/DetachableWidget.cpp
-	gui/DetachableWindow.cpp
 	gui/EffectControlDialog.cpp
 	gui/EffectRackView.cpp
 	gui/EffectView.cpp

diff --git a/src/gui/ControllerDialog.cpp b/src/gui/ControllerDialog.cpp
@@ -31,7 +31,7 @@ namespace lmms::gui
 {
 
 ControllerDialog::ControllerDialog(Controller* controller, QWidget* parent)
-	: DetachableWidget{parent}
+	: QWidget{parent}
 	, ModelView{controller, this}
 {
 }

diff --git a/src/gui/ControllerRackView.cpp b/src/gui/ControllerRackView.cpp
@@ -47,7 +47,7 @@ namespace lmms::gui
 
 
 ControllerRackView::ControllerRackView()
-	: DetachableWidget{}
+	: QWidget{}
 	, m_nextIndex{0}
 {
 	setWindowIcon( embed::getIconPixmap( "controller" ) );

diff --git a/src/gui/DetachableWidget.cpp b/src/gui/DetachableWidget.cpp