Fixup merge issues

JohannesLorenz · Jan 24, 2025 · adc1422 · adc1422
1 parent 21c3b67
commit adc1422
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/src/gui/EffectRackView.cpp b/src/gui/EffectRackView.cpp
@@ -284,13 +284,5 @@ QSize EffectRackView::sizeHint() const
 
 
 
-QSize EffectRackView::sizeHint() const
-{
-	// Use the formula from InstrumentTrackWindow.cpp
-	return QSize{EffectRackView::DEFAULT_WIDTH, 254 - 4 - 1};
-}
-
-
-
 
 } // namespace lmms::gui
diff --git a/src/gui/instrument/InstrumentView.cpp b/src/gui/instrument/InstrumentView.cpp
@@ -66,6 +66,8 @@ void InstrumentView::setModel( Model * _model, bool )
 	}
 	InstrumentTrackWindow* itw = instrumentTrackWindow();
 	SubWindow* subWindow = qobject_cast<SubWindow*>(itw->parent());
+/*	assert(subWindow);
+	assert(false);
 	if ( isResizable() )
 	{
 		subWindow->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
@@ -81,7 +83,7 @@ void InstrumentView::setModel( Model * _model, bool )
 		{
 			subWindow->layout()->setSizeConstraint(QLayout::SetFixedSize);
 		}
-	}
+	}*/
 }