Merge branch 'variable-tab-widget'

src/gui/EffectControlDialog.cpp

@@ -36,6 +36,7 @@ EffectControlDialog::EffectControlDialog( EffectControls * _controls ) :
 	m_effectControls( _controls )
 {
 	setWindowTitle( m_effectControls->effect()->displayName() );
+	setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred );
 }
 
 

src/gui/InstrumentView.cpp

@@ -70,3 +70,10 @@ InstrumentTrackWindow * InstrumentView::instrumentTrackWindow( void )
 					parentWidget()->parentWidget() ) );
 }
 
+
+
+
+InstrumentViewFixedSize::~InstrumentViewFixedSize()
+{
+}
+

src/gui/SubWindow.cpp

@@ -1,4 +1,4 @@
-/*
+/*
  * SubWindow.cpp - Implementation of QMdiSubWindow that correctly tracks
  *   the geometry that windows should be restored to.
  *   Workaround for https://bugreports.qt.io/browse/QTBUG-256
@@ -349,10 +349,10 @@ void SubWindow::focusChanged( QMdiSubWindow *subWindow )
 /**
  * @brief SubWindow::resizeEvent
  * 
- *  On every rezise event we have to adjust our title label.
- * 
- *  At next we give the event to QMdiSubWindow::resizeEvent() which handles 
+ *  At first we give the event to QMdiSubWindow::resizeEvent() which handles
  *  the event on its behavior.
+ *
+ *  On every resize event we have to adjust our title label.
  * 
  *  At last we store the current size into m_trackedNormalGeom. This size
  *  will be saved with the project because of an Qt bug wich doesn't

src/gui/widgets/TabWidget.cpp

@@ -333,6 +333,14 @@ QSize TabWidget::minimumSizeHint() const
 
 
 
+QSize TabWidget::sizeHint() const
+{
+	return minimumSizeHint();
+}
+
+
+
+
 // Return the color to be used to draw a TabWidget's title text (if any)
 QColor TabWidget::tabTitleText() const
 {