Merge remote-tracking branch 'upstream/master' into FadersWithDbScale

include/InstrumentTrackWindow.h

@@ -34,6 +34,7 @@
 class QLabel;
 class QLineEdit;
 class QWidget;
+class QMdiSubWindow;
 
 namespace lmms
 {
@@ -134,6 +135,9 @@ private:
 	//! required to keep the old look when using a variable sized tab widget
 	void adjustTabSize(QWidget *w);
 
+	QMdiSubWindow* findSubWindowInParents();
+	void updateSubWindow();
+
 	InstrumentTrack * m_track;
 	InstrumentTrackView * m_itv;
 

include/SubWindow.h

@@ -71,6 +71,10 @@ public:
 	int titleBarHeight() const;
 	int frameWidth() const;
 
+	// TODO Needed to update the title bar when replacing instruments.
+	// Update works automatically if QMdiSubWindows are used.
+	void updateTitleBar();
+
 protected:
 	// hook the QWidget move/resize events to update the tracked geometry
 	void moveEvent( QMoveEvent * event ) override;