From 34daf0378bc83e63ff687dbcd8aefe4ce59c4fe7 Mon Sep 17 00:00:00 2001
From: enp2s0 <noahb2713@gmail.com>
Date: Wed, 7 Aug 2024 12:29:35 -0400
Subject: [PATCH 01/16] mini fx rewrite without merge conflicts

---
 include/Effect.h                      |   7 --
 include/EffectLabelButton.h           |  55 ++++++++++++
 include/EffectView.h                  |  14 ++-
 src/core/Effect.cpp                   |  11 +--
 src/gui/CMakeLists.txt                |   1 +
 src/gui/EffectView.cpp                | 119 +++++++++++++-------------
 src/gui/widgets/EffectLabelButton.cpp |  73 ++++++++++++++++
 7 files changed, 205 insertions(+), 75 deletions(-)
 create mode 100644 include/EffectLabelButton.h
 create mode 100644 src/gui/widgets/EffectLabelButton.cpp

diff --git a/include/Effect.h b/include/Effect.h
index 34f8be00a07..6105b60b97e 100644
--- a/include/Effect.h
+++ b/include/Effect.h
@@ -125,12 +125,6 @@ class LMMS_EXPORT Effect : public Plugin
 		return 1.0f - m_wetDryModel.value();
 	}
 
-	inline float gate() const
-	{
-		const float level = m_gateModel.value();
-		return level*level * m_processors;
-	}
-
 	inline f_cnt_t bufferCount() const
 	{
 		return m_bufferCount;
@@ -227,7 +221,6 @@ class LMMS_EXPORT Effect : public Plugin
 
 	BoolModel m_enabledModel;
 	FloatModel m_wetDryModel;
-	FloatModel m_gateModel;
 	TempoSyncKnobModel m_autoQuitModel;
 	
 	bool m_autoQuitDisabled;
diff --git a/include/EffectLabelButton.h b/include/EffectLabelButton.h
new file mode 100644
index 00000000000..7d76ac7ddff
--- /dev/null
+++ b/include/EffectLabelButton.h
@@ -0,0 +1,55 @@
+/*
+ * EffectLabelButton.h - class trackLabelButton
+ *
+ * Copyright (c) 2004-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ *
+ * This file is part of LMMS - https://lmms.io
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program (see COPYING); if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ */
+
+#ifndef LMMS_GUI_EFFECT_LABEL_BUTTON_H
+#define LMMS_GUI_EFFECT_LABEL_BUTTON_H
+
+#include <QPushButton>
+
+namespace lmms::gui
+{
+
+class EffectView;
+
+class EffectLabelButton : public QPushButton
+{
+	Q_OBJECT
+public:
+	EffectLabelButton( EffectView * _tv, QWidget * _parent );
+	~EffectLabelButton() override = default;
+
+protected:
+	void paintEvent(QPaintEvent* pe) override;
+
+private:
+	EffectView * m_effectView;
+	QString m_iconName;
+	QRect m_buttonRect;
+	QString elideName( const QString &name );
+} ;
+
+
+} // namespace lmms::gui
+
+#endif // LMMS_GUI_EFFECT_LABEL_BUTTON_H
\ No newline at end of file
diff --git a/include/EffectView.h b/include/EffectView.h
index 805e4a4279c..a9a836a9f13 100644
--- a/include/EffectView.h
+++ b/include/EffectView.h
@@ -29,12 +29,16 @@
 #include "AutomatableModel.h"
 #include "PluginView.h"
 #include "Effect.h"
+#include "EffectLabelButton.h"
 
 class QGraphicsOpacityEffect;
 class QGroupBox;
 class QLabel;
 class QPushButton;
 class QMdiSubWindow;
+class QHBoxLayout;
+class QLabel;
+class QToolButton;
 
 namespace lmms::gui
 {
@@ -62,12 +66,14 @@ class EffectView : public PluginView
 	}
 
 	static constexpr int DEFAULT_WIDTH = 215;
-	static constexpr int DEFAULT_HEIGHT = 60;
+	static constexpr int DEFAULT_HEIGHT = 35;
 	
 	void mouseMoveEvent(QMouseEvent* event) override;
 	void mousePressEvent(QMouseEvent* event) override;
 	void mouseReleaseEvent(QMouseEvent* event) override;
 
+	void setViewWidth(int px);
+
 public slots:
 	void editControls();
 	void moveUp();
@@ -88,17 +94,19 @@ public slots:
 
 
 private:
-	QPixmap m_bg;
+	QHBoxLayout* m_mainLayout;
 	LedCheckBox * m_bypass;
+	EffectLabelButton* m_label;
 	Knob * m_wetDry;
 	TempoSyncKnob * m_autoQuit;
-	Knob * m_gate;
 	QMdiSubWindow * m_subWindow;
 	EffectControlDialog * m_controlView;
 	
+	int m_viewWidth;
 	bool m_dragging;
 	QGraphicsOpacityEffect* m_opacityEffect;
 
+	friend class EffectLabelButton;
 } ;
 
 
diff --git a/src/core/Effect.cpp b/src/core/Effect.cpp
index b6b2840515a..e9d8e6be1ce 100644
--- a/src/core/Effect.cpp
+++ b/src/core/Effect.cpp
@@ -50,7 +50,6 @@ Effect::Effect( const Plugin::Descriptor * _desc,
 	m_bufferCount( 0 ),
 	m_enabledModel( true, this, tr( "Effect enabled" ) ),
 	m_wetDryModel( 1.0f, -1.0f, 1.0f, 0.01f, this, tr( "Wet/Dry mix" ) ),
-	m_gateModel( 0.0f, 0.0f, 1.0f, 0.01f, this, tr( "Gate" ) ),
 	m_autoQuitModel( 1.0f, 1.0f, 8000.0f, 100.0f, 1.0f, this, tr( "Decay" ) ),
 	m_autoQuitDisabled( false )
 {
@@ -91,7 +90,6 @@ void Effect::saveSettings( QDomDocument & _doc, QDomElement & _this )
 	m_enabledModel.saveSettings( _doc, _this, "on" );
 	m_wetDryModel.saveSettings( _doc, _this, "wet" );
 	m_autoQuitModel.saveSettings( _doc, _this, "autoquit" );
-	m_gateModel.saveSettings( _doc, _this, "gate" );
 	controls()->saveState( _doc, _this );
 }
 
@@ -103,7 +101,6 @@ void Effect::loadSettings( const QDomElement & _this )
 	m_enabledModel.loadSettings( _this, "on" );
 	m_wetDryModel.loadSettings( _this, "wet" );
 	m_autoQuitModel.loadSettings( _this, "autoquit" );
-	m_gateModel.loadSettings( _this, "gate" );
 
 	QDomNode node = _this.firstChild();
 	while( !node.isNull() )
@@ -146,19 +143,19 @@ Effect * Effect::instantiate( const QString& pluginName,
 
 
 
-void Effect::checkGate( double _out_sum )
+void Effect::checkGate(double _out_sum)
 {
-	if( m_autoQuitDisabled )
+	if(m_autoQuitDisabled)
 	{
 		return;
 	}
 
 	// Check whether we need to continue processing input.  Restart the
 	// counter if the threshold has been exceeded.
-	if (_out_sum - gate() <= F_EPSILON)
+	if (_out_sum <= F_EPSILON)
 	{
 		incrementBufferCount();
-		if( bufferCount() > timeout() )
+		if(bufferCount() > timeout())
 		{
 			stopRunning();
 			resetBufferCount();
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 4195ec58c1a..d4a5a4446b9 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -103,6 +103,7 @@ SET(LMMS_SRCS
 	gui/widgets/CaptionMenu.cpp
 	gui/widgets/ComboBox.cpp
 	gui/widgets/CustomTextKnob.cpp
+	gui/widgets/EffectLabelButton.cpp
 	gui/widgets/Fader.cpp
 	gui/widgets/FloatModelEditorBase.cpp
 	gui/widgets/Graph.cpp
diff --git a/src/gui/EffectView.cpp b/src/gui/EffectView.cpp
index 6f2b984c32a..242462f802a 100644
--- a/src/gui/EffectView.cpp
+++ b/src/gui/EffectView.cpp
@@ -28,6 +28,10 @@
 #include <QMouseEvent>
 #include <QPushButton>
 #include <QPainter>
+#include <QPainterPath>
+#include <QBoxLayout>
+#include <QLabel>
+#include <QToolButton>
 
 #include "EffectView.h"
 #include "DummyEffect.h"
@@ -47,63 +51,57 @@ namespace lmms::gui
 
 EffectView::EffectView( Effect * _model, QWidget * _parent ) :
 	PluginView( _model, _parent ),
-	m_bg( embed::getIconPixmap( "effect_plugin" ) ),
 	m_subWindow( nullptr ),
 	m_controlView(nullptr),
 	m_dragging(false)
 {
-	setFixedSize(EffectView::DEFAULT_WIDTH, EffectView::DEFAULT_HEIGHT);
 	setFocusPolicy(Qt::StrongFocus);
+	setViewWidth(EffectView::DEFAULT_WIDTH);
+	
+	m_mainLayout = new QHBoxLayout();
+	m_mainLayout->setContentsMargins(8, 2, 8, 2);
 
-	// Disable effects that are of type "DummyEffect"
+	bool hasControls = effect()->controls()->controlCount() > 0;
 	bool isEnabled = !dynamic_cast<DummyEffect *>( effect() );
-	m_bypass = new LedCheckBox( this, "", isEnabled ? LedCheckBox::LedColor::Green : LedCheckBox::LedColor::Red );
-	m_bypass->move( 3, 3 );
-	m_bypass->setEnabled( isEnabled );
 
+	m_bypass = new LedCheckBox(this, "", isEnabled ? LedCheckBox::LedColor::Green : LedCheckBox::LedColor::Red);
+	m_bypass->setEnabled(isEnabled);
 	m_bypass->setToolTip(tr("On/Off"));
+	m_mainLayout->addWidget(m_bypass);
+
+	QFont labelFont = adjustedToPixelSize(font(), 10);
+	m_label = new EffectLabelButton(this, this);
+	m_label->setText(model()->displayName());
+	m_label->setFont(labelFont);
+	m_label->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Maximum);
+	if(hasControls)
+	{
+		connect(m_label, SIGNAL(clicked()), this, SLOT(editControls()));
+	}
+	m_mainLayout->addWidget(m_label);
 
+	m_wetDry = new Knob(KnobType::Small17, this);
+	m_wetDry->setEnabled(isEnabled);
+	m_wetDry->setHintText(tr("Wet Level:"), "");
+	m_mainLayout->addWidget(m_wetDry);
 
-	m_wetDry = new Knob( KnobType::Bright26, this );
-	m_wetDry->setLabel( tr( "W/D" ) );
-	m_wetDry->move( 40 - m_wetDry->width() / 2, 5 );
-	m_wetDry->setEnabled( isEnabled );
-	m_wetDry->setHintText( tr( "Wet Level:" ), "" );
-
-
-	m_autoQuit = new TempoSyncKnob( KnobType::Bright26, this );
-	m_autoQuit->setLabel( tr( "DECAY" ) );
-	m_autoQuit->move( 78 - m_autoQuit->width() / 2, 5 );
-	m_autoQuit->setEnabled( isEnabled && !effect()->m_autoQuitDisabled );
-	m_autoQuit->setHintText( tr( "Time:" ), "ms" );
-
-
-	m_gate = new Knob( KnobType::Bright26, this );
-	m_gate->setLabel( tr( "GATE" ) );
-	m_gate->move( 116 - m_gate->width() / 2, 5 );
-	m_gate->setEnabled( isEnabled && !effect()->m_autoQuitDisabled );
-	m_gate->setHintText( tr( "Gate:" ), "" );
-
+	m_autoQuit = new TempoSyncKnob(KnobType::Small17, this);
+	m_autoQuit->setEnabled(isEnabled && !effect()->m_autoQuitDisabled);
+	m_autoQuit->setVisible(isEnabled && !effect()->m_autoQuitDisabled);
+	m_autoQuit->setHintText(tr("Stop after:"), "ms");
+	m_mainLayout->addWidget(m_autoQuit);
 
-	setModel( _model );
+	setModel(_model);
 
-	if( effect()->controls()->controlCount() > 0 )
+	if(hasControls)
 	{
-		auto ctls_btn = new QPushButton(tr("Controls"), this);
-		QFont f = ctls_btn->font();
-		ctls_btn->setFont(adjustedToPixelSize(f, 10));
-		ctls_btn->setGeometry( 150, 14, 50, 20 );
-		connect( ctls_btn, SIGNAL(clicked()),
-					this, SLOT(editControls()));
-
 		m_controlView = effect()->controls()->createView();
-		if( m_controlView )
+		if(m_controlView)
 		{
-			m_subWindow = getGUI()->mainWindow()->addWindowedWidget( m_controlView );
-
-			if ( !m_controlView->isResizable() )
+			m_subWindow = getGUI()->mainWindow()->addWindowedWidget(m_controlView);
+			if (!m_controlView->isResizable())
 			{
-				m_subWindow->setSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed );
+				m_subWindow->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
 				if (m_subWindow->layout())
 				{
 					m_subWindow->layout()->setSizeConstraint(QLayout::SetFixedSize);
@@ -112,9 +110,9 @@ EffectView::EffectView( Effect * _model, QWidget * _parent ) :
 
 			Qt::WindowFlags flags = m_subWindow->windowFlags();
 			flags &= ~Qt::WindowMaximizeButtonHint;
-			m_subWindow->setWindowFlags( flags );
+			m_subWindow->setWindowFlags(flags);
 
-			connect( m_controlView, SIGNAL(closed()),
+			connect(m_controlView, SIGNAL(closed()),
 					this, SLOT(closeEffects()));
 
 			m_subWindow->hide();
@@ -125,8 +123,7 @@ EffectView::EffectView( Effect * _model, QWidget * _parent ) :
 	m_opacityEffect->setOpacity(1);
 	setGraphicsEffect(m_opacityEffect);
 
-	//move above vst effect view creation
-	//setModel( _model );
+	setLayout(m_mainLayout);
 }
 
 
@@ -148,12 +145,14 @@ void EffectView::editControls()
 		{
 			m_subWindow->show();
 			m_subWindow->raise();
-			effect()->controls()->setViewVisible( true );
+			effect()->controls()->setViewVisible(true);
+			m_label->setDown(true);
 		}
 		else
 		{
 			m_subWindow->hide();
-			effect()->controls()->setViewVisible( false );
+			effect()->controls()->setViewVisible(false);
+			m_label->setDown(false);
 		}
 	}
 }
@@ -255,19 +254,15 @@ void EffectView::mouseMoveEvent(QMouseEvent* event)
 
 void EffectView::paintEvent( QPaintEvent * )
 {
-	QPainter p( this );
-	p.drawPixmap( 0, 0, m_bg );
-
-	QFont f = adjustedToPixelSize(font(), 10);
-	f.setBold( true );
-	p.setFont( f );
+	QPainter p(this);
+	QPainterPath path;
 
-	QString elidedText = p.fontMetrics().elidedText( model()->displayName(), Qt::ElideRight, width() - 22 );
+	path.addRoundedRect(QRectF(2, 2, m_viewWidth - 4, EffectView::DEFAULT_HEIGHT - 4), 2, 2);
 
-	p.setPen( palette().shadow().color() );
-	p.drawText( 6, 55, elidedText );
-	p.setPen( palette().text().color() );
-	p.drawText( 5, 54, elidedText );
+	QPen pen(Qt::black, 1);
+	p.setPen(pen);
+	p.fillPath(path, QColor(0x3b, 0x42, 0x4a));
+	p.drawPath(path);
 }
 
 
@@ -278,7 +273,15 @@ void EffectView::modelChanged()
 	m_bypass->setModel( &effect()->m_enabledModel );
 	m_wetDry->setModel( &effect()->m_wetDryModel );
 	m_autoQuit->setModel( &effect()->m_autoQuitModel );
-	m_gate->setModel( &effect()->m_gateModel );
+}
+
+
+
+
+void EffectView::setViewWidth(int px)
+{
+	m_viewWidth = px;
+	setFixedSize(m_viewWidth, EffectView::DEFAULT_HEIGHT);
 }
 
 } // namespace lmms::gui
diff --git a/src/gui/widgets/EffectLabelButton.cpp b/src/gui/widgets/EffectLabelButton.cpp
new file mode 100644
index 00000000000..3943fbd674e
--- /dev/null
+++ b/src/gui/widgets/EffectLabelButton.cpp
@@ -0,0 +1,73 @@
+/*
+ * EffectLabelButton.cpp - implementation of class trackLabelButton, a label
+ *                          which is renamable by double-clicking it
+ *
+ * Copyright (c) 2004-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * 
+ * This file is part of LMMS - https://lmms.io
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program (see COPYING); if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ */
+
+
+#include "EffectLabelButton.h"
+
+#include <QMouseEvent>
+#include <QMdiSubWindow>
+
+#include "ConfigManager.h"
+#include "embed.h"
+#include "EffectView.h"
+#include "Effect.h"
+
+namespace lmms::gui
+{
+
+EffectLabelButton::EffectLabelButton( EffectView * _tv, QWidget * _parent ) :
+	QPushButton( _parent ),
+	m_effectView( _tv ),
+	m_iconName()
+{
+	setAttribute(Qt::WA_OpaquePaintEvent, true);
+	setAcceptDrops(false);
+
+	setCursor( QCursor( embed::getIconPixmap( "hand" ), 3, 3 ) );
+	setStyleSheet("text-align:left;padding:2px;");
+
+	//setFixedSize( 160, 29 );
+	//setIconSize( QSize( 24, 24 ) );
+}
+
+void EffectLabelButton::paintEvent(QPaintEvent* pe)
+{
+	//setDown(!m_effectView->m_subWindow->isVisible());
+	QPushButton::paintEvent(pe);
+}
+
+QString EffectLabelButton::elideName( const QString &name )
+{
+	const int spacing = 16;
+	const int maxTextWidth = width() - spacing - iconSize().width();
+
+	setToolTip(name);
+
+	QFontMetrics metrics( font() );
+	QString elidedName = metrics.elidedText( name, Qt::ElideRight, maxTextWidth );
+	return elidedName;
+}
+
+} // namespace lmms::gui
\ No newline at end of file

From 124a894a99b87d968e0a3deaceca8bd09ff627e1 Mon Sep 17 00:00:00 2001
From: enp2s0 <noahb2713@gmail.com>
Date: Wed, 7 Aug 2024 16:29:52 -0400
Subject: [PATCH 02/16] clear checked status of label button when fx window is
 closed

---
 src/gui/EffectView.cpp | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/gui/EffectView.cpp b/src/gui/EffectView.cpp
index 242462f802a..d72164e529d 100644
--- a/src/gui/EffectView.cpp
+++ b/src/gui/EffectView.cpp
@@ -49,15 +49,15 @@
 namespace lmms::gui
 {
 
-EffectView::EffectView( Effect * _model, QWidget * _parent ) :
-	PluginView( _model, _parent ),
-	m_subWindow( nullptr ),
+EffectView::EffectView(Effect * _model, QWidget * _parent) :
+	PluginView(_model, _parent),
+	m_subWindow(nullptr),
 	m_controlView(nullptr),
 	m_dragging(false)
 {
 	setFocusPolicy(Qt::StrongFocus);
 	setViewWidth(EffectView::DEFAULT_WIDTH);
-	
+
 	m_mainLayout = new QHBoxLayout();
 	m_mainLayout->setContentsMargins(8, 2, 8, 2);
 
@@ -73,6 +73,7 @@ EffectView::EffectView( Effect * _model, QWidget * _parent ) :
 	m_label = new EffectLabelButton(this, this);
 	m_label->setText(model()->displayName());
 	m_label->setFont(labelFont);
+	m_label->setCheckable(true);
 	m_label->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Maximum);
 	if(hasControls)
 	{
@@ -146,13 +147,13 @@ void EffectView::editControls()
 			m_subWindow->show();
 			m_subWindow->raise();
 			effect()->controls()->setViewVisible(true);
-			m_label->setDown(true);
+			m_label->setChecked(true);
 		}
 		else
 		{
 			m_subWindow->hide();
 			effect()->controls()->setViewVisible(false);
-			m_label->setDown(false);
+			m_label->setChecked(false);
 		}
 	}
 }
@@ -189,7 +190,8 @@ void EffectView::closeEffects()
 	{
 		m_subWindow->hide();
 	}
-	effect()->controls()->setViewVisible( false );
+	effect()->controls()->setViewVisible(false);
+	m_label->setChecked(false);
 }
 
 

From 9d019452f2b18b588114ba647f9404a07a259aec Mon Sep 17 00:00:00 2001
From: enp2s0 <noahb2713@gmail.com>
Date: Thu, 8 Aug 2024 09:56:38 -0400
Subject: [PATCH 03/16] style & cleanup

---
 include/EffectView.h   |  3 ---
 src/core/Effect.cpp    |  6 +++---
 src/gui/EffectView.cpp | 17 ++++-------------
 3 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/include/EffectView.h b/include/EffectView.h
index a9a836a9f13..035681671a0 100644
--- a/include/EffectView.h
+++ b/include/EffectView.h
@@ -72,8 +72,6 @@ class EffectView : public PluginView
 	void mousePressEvent(QMouseEvent* event) override;
 	void mouseReleaseEvent(QMouseEvent* event) override;
 
-	void setViewWidth(int px);
-
 public slots:
 	void editControls();
 	void moveUp();
@@ -102,7 +100,6 @@ public slots:
 	QMdiSubWindow * m_subWindow;
 	EffectControlDialog * m_controlView;
 	
-	int m_viewWidth;
 	bool m_dragging;
 	QGraphicsOpacityEffect* m_opacityEffect;
 
diff --git a/src/core/Effect.cpp b/src/core/Effect.cpp
index e9d8e6be1ce..d581a7c73d2 100644
--- a/src/core/Effect.cpp
+++ b/src/core/Effect.cpp
@@ -143,9 +143,9 @@ Effect * Effect::instantiate( const QString& pluginName,
 
 
 
-void Effect::checkGate(double _out_sum)
+void Effect::checkGate( double _out_sum )
 {
-	if(m_autoQuitDisabled)
+	if( m_autoQuitDisabled )
 	{
 		return;
 	}
@@ -155,7 +155,7 @@ void Effect::checkGate(double _out_sum)
 	if (_out_sum <= F_EPSILON)
 	{
 		incrementBufferCount();
-		if(bufferCount() > timeout())
+		if( bufferCount() > timeout() )
 		{
 			stopRunning();
 			resetBufferCount();
diff --git a/src/gui/EffectView.cpp b/src/gui/EffectView.cpp
index d72164e529d..8e471f7add9 100644
--- a/src/gui/EffectView.cpp
+++ b/src/gui/EffectView.cpp
@@ -55,9 +55,9 @@ EffectView::EffectView(Effect * _model, QWidget * _parent) :
 	m_controlView(nullptr),
 	m_dragging(false)
 {
+	setFixedSize(EffectView::DEFAULT_WIDTH, EffectView::DEFAULT_HEIGHT);
 	setFocusPolicy(Qt::StrongFocus);
-	setViewWidth(EffectView::DEFAULT_WIDTH);
-
+	
 	m_mainLayout = new QHBoxLayout();
 	m_mainLayout->setContentsMargins(8, 2, 8, 2);
 
@@ -92,7 +92,7 @@ EffectView::EffectView(Effect * _model, QWidget * _parent) :
 	m_autoQuit->setHintText(tr("Stop after:"), "ms");
 	m_mainLayout->addWidget(m_autoQuit);
 
-	setModel(_model);
+	setModel( _model );
 
 	if(hasControls)
 	{
@@ -259,7 +259,7 @@ void EffectView::paintEvent( QPaintEvent * )
 	QPainter p(this);
 	QPainterPath path;
 
-	path.addRoundedRect(QRectF(2, 2, m_viewWidth - 4, EffectView::DEFAULT_HEIGHT - 4), 2, 2);
+	path.addRoundedRect(QRectF(2, 2, EffectView::DEFAULT_WIDTH - 4, EffectView::DEFAULT_HEIGHT - 4), 2, 2);
 
 	QPen pen(Qt::black, 1);
 	p.setPen(pen);
@@ -277,13 +277,4 @@ void EffectView::modelChanged()
 	m_autoQuit->setModel( &effect()->m_autoQuitModel );
 }
 
-
-
-
-void EffectView::setViewWidth(int px)
-{
-	m_viewWidth = px;
-	setFixedSize(m_viewWidth, EffectView::DEFAULT_HEIGHT);
-}
-
 } // namespace lmms::gui

From efd8cfec4360e0a65483ab7fc52a7450e015e1e7 Mon Sep 17 00:00:00 2001
From: enp2s0 <noahb2713@gmail.com>
Date: Thu, 8 Aug 2024 10:04:32 -0400
Subject: [PATCH 04/16] add spaces

---
 src/gui/EffectView.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/gui/EffectView.cpp b/src/gui/EffectView.cpp
index 8e471f7add9..9cff3010fc6 100644
--- a/src/gui/EffectView.cpp
+++ b/src/gui/EffectView.cpp
@@ -99,10 +99,10 @@ EffectView::EffectView(Effect * _model, QWidget * _parent) :
 		m_controlView = effect()->controls()->createView();
 		if(m_controlView)
 		{
-			m_subWindow = getGUI()->mainWindow()->addWindowedWidget(m_controlView);
-			if (!m_controlView->isResizable())
+			m_subWindow = getGUI()->mainWindow()->addWindowedWidget( m_controlView );
+			if ( !m_controlView->isResizable() )
 			{
-				m_subWindow->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+				m_subWindow->setSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed );
 				if (m_subWindow->layout())
 				{
 					m_subWindow->layout()->setSizeConstraint(QLayout::SetFixedSize);
@@ -111,9 +111,9 @@ EffectView::EffectView(Effect * _model, QWidget * _parent) :
 
 			Qt::WindowFlags flags = m_subWindow->windowFlags();
 			flags &= ~Qt::WindowMaximizeButtonHint;
-			m_subWindow->setWindowFlags(flags);
+			m_subWindow->setWindowFlags( flags );
 
-			connect(m_controlView, SIGNAL(closed()),
+			connect( m_controlView, SIGNAL(closed()),
 					this, SLOT(closeEffects()));
 
 			m_subWindow->hide();
@@ -146,13 +146,13 @@ void EffectView::editControls()
 		{
 			m_subWindow->show();
 			m_subWindow->raise();
-			effect()->controls()->setViewVisible(true);
+			effect()->controls()->setViewVisible( true );
 			m_label->setChecked(true);
 		}
 		else
 		{
 			m_subWindow->hide();
-			effect()->controls()->setViewVisible(false);
+			effect()->controls()->setViewVisible( false );
 			m_label->setChecked(false);
 		}
 	}

From eaf94e4f5bac964fd7aed6677c1a2f5c5c5a7697 Mon Sep 17 00:00:00 2001
From: enp2s0 <noahb2713@gmail.com>
Date: Thu, 8 Aug 2024 10:07:04 -0400
Subject: [PATCH 05/16] more

---
 src/gui/EffectView.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gui/EffectView.cpp b/src/gui/EffectView.cpp
index 9cff3010fc6..8d62d790eda 100644
--- a/src/gui/EffectView.cpp
+++ b/src/gui/EffectView.cpp
@@ -97,7 +97,7 @@ EffectView::EffectView(Effect * _model, QWidget * _parent) :
 	if(hasControls)
 	{
 		m_controlView = effect()->controls()->createView();
-		if(m_controlView)
+		if( m_controlView )
 		{
 			m_subWindow = getGUI()->mainWindow()->addWindowedWidget( m_controlView );
 			if ( !m_controlView->isResizable() )
@@ -190,7 +190,7 @@ void EffectView::closeEffects()
 	{
 		m_subWindow->hide();
 	}
-	effect()->controls()->setViewVisible(false);
+	effect()->controls()->setViewVisible( false );
 	m_label->setChecked(false);
 }
 

From 889818ab08602cf5741efa0344b372db50d41077 Mon Sep 17 00:00:00 2001
From: enp2s0 <noahb2713@gmail.com>
Date: Thu, 8 Aug 2024 10:12:55 -0400
Subject: [PATCH 06/16] effectlabelbutton style cleanup

---
 include/EffectLabelButton.h           |  8 ++++----
 src/gui/widgets/EffectLabelButton.cpp | 18 +++++++-----------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/include/EffectLabelButton.h b/include/EffectLabelButton.h
index 7d76ac7ddff..6ddb9d6d7ba 100644
--- a/include/EffectLabelButton.h
+++ b/include/EffectLabelButton.h
@@ -36,18 +36,18 @@ class EffectLabelButton : public QPushButton
 {
 	Q_OBJECT
 public:
-	EffectLabelButton( EffectView * _tv, QWidget * _parent );
+	EffectLabelButton(EffectView* _tv, QWidget* _parent);
 	~EffectLabelButton() override = default;
 
 protected:
 	void paintEvent(QPaintEvent* pe) override;
 
 private:
-	EffectView * m_effectView;
+	EffectView* m_effectView;
 	QString m_iconName;
 	QRect m_buttonRect;
-	QString elideName( const QString &name );
-} ;
+	QString elideName(const QString &name);
+};
 
 
 } // namespace lmms::gui
diff --git a/src/gui/widgets/EffectLabelButton.cpp b/src/gui/widgets/EffectLabelButton.cpp
index 3943fbd674e..f1ca867f477 100644
--- a/src/gui/widgets/EffectLabelButton.cpp
+++ b/src/gui/widgets/EffectLabelButton.cpp
@@ -37,36 +37,32 @@
 namespace lmms::gui
 {
 
-EffectLabelButton::EffectLabelButton( EffectView * _tv, QWidget * _parent ) :
-	QPushButton( _parent ),
-	m_effectView( _tv ),
+EffectLabelButton::EffectLabelButton(EffectView* _tv, QWidget* _parent) :
+	QPushButton(_parent),
+	m_effectView(_tv),
 	m_iconName()
 {
 	setAttribute(Qt::WA_OpaquePaintEvent, true);
 	setAcceptDrops(false);
 
-	setCursor( QCursor( embed::getIconPixmap( "hand" ), 3, 3 ) );
+	setCursor(QCursor(embed::getIconPixmap("hand"), 3, 3));
 	setStyleSheet("text-align:left;padding:2px;");
-
-	//setFixedSize( 160, 29 );
-	//setIconSize( QSize( 24, 24 ) );
 }
 
 void EffectLabelButton::paintEvent(QPaintEvent* pe)
 {
-	//setDown(!m_effectView->m_subWindow->isVisible());
 	QPushButton::paintEvent(pe);
 }
 
-QString EffectLabelButton::elideName( const QString &name )
+QString EffectLabelButton::elideName(const QString &name)
 {
 	const int spacing = 16;
 	const int maxTextWidth = width() - spacing - iconSize().width();
 
 	setToolTip(name);
 
-	QFontMetrics metrics( font() );
-	QString elidedName = metrics.elidedText( name, Qt::ElideRight, maxTextWidth );
+	QFontMetrics metrics(font());
+	QString elidedName = metrics.elidedText(name, Qt::ElideRight, maxTextWidth);
 	return elidedName;
 }
 

From 5b3ce79e0bf6c13108bf6791fecbb0455675ed78 Mon Sep 17 00:00:00 2001
From: enp2s0 <noahb2713@gmail.com>
Date: Thu, 8 Aug 2024 10:19:57 -0400
Subject: [PATCH 07/16] remove unused graphics

---
 data/themes/classic/effect_plugin.png | Bin 14355 -> 0 bytes
 data/themes/default/effect_plugin.png | Bin 443 -> 0 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 data/themes/classic/effect_plugin.png
 delete mode 100644 data/themes/default/effect_plugin.png

diff --git a/data/themes/classic/effect_plugin.png b/data/themes/classic/effect_plugin.png
deleted file mode 100644
index 6a759672ff59121a87eaf6dcd08bd8424d88f372..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 14355
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
N002ovPDHLkV1fX2eboQ}

diff --git a/data/themes/default/effect_plugin.png b/data/themes/default/effect_plugin.png
deleted file mode 100644
index 4c312037984b87f1cfe71c4b1b2191a9ab17e9bb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 443
zcmeAS@N?(olHy`uVBq!ia0vp^*MQiPgAGV}eY{!;q}Y<Y-Cck*5d3uBT@R!<3p^r=
zfjX{(Fr$;k><XYDdx@v7EBg~}7EyKaUmncf3=E7Oo-U3d6}R5r+30&XK&0*B{XXer
zH-{$8nAFv0CLa7CqHwXDDPu!2*A&h_IyX;Q^8TG{ceh%%bye=}<VnSo><$DuPYS-e
z?e6Q#pS}NIu&ok`c=7zVw*32i=gCXvuRHnl)639=h08K0Em=P~MaEs9iS<s@DqGem
z>N*k0s(=0)S95B}UR$HRfvai5fnL@r+}_~<b~>?*p#o;-k8=x%y~z~a!s+yLLs}|O
zsD(98XF*KFsisefC%NuKDCq3CFMZm-<KU5|SRb9wTs}Gl$&H<?9NcDmxuRGSd!@aj
zHaJD>Vlo%w;C@#s`o&%!XhWEzfLK6*=oW6Ep((7{J~|+Sx19sql_C0tISFV6$R?mE
zwaI7q#Wi%Y?&dgsq{%2x*VMBu^UvGYhYzkk;B-CHYtq83+wW#PnX}}(&W0Nko_t|X
W>U00^!J{PsiUUtqKbLh*2~7Y(Dy|d&


From af9ed03464c23c4d1a2ba3dc895cccf8034802d6 Mon Sep 17 00:00:00 2001
From: enp2s0 <noahb2713@gmail.com>
Date: Thu, 8 Aug 2024 23:26:38 -0400
Subject: [PATCH 08/16] effectlabelbutton cleanup

---
 include/EffectLabelButton.h           |  8 +-------
 src/gui/EffectView.cpp                |  2 --
 src/gui/widgets/EffectLabelButton.cpp | 24 ++++--------------------
 3 files changed, 5 insertions(+), 29 deletions(-)

diff --git a/include/EffectLabelButton.h b/include/EffectLabelButton.h
index 6ddb9d6d7ba..4831414bba3 100644
--- a/include/EffectLabelButton.h
+++ b/include/EffectLabelButton.h
@@ -1,7 +1,7 @@
 /*
  * EffectLabelButton.h - class trackLabelButton
  *
- * Copyright (c) 2004-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2024 Noah Brecht <noahb2713/at/gmail/dot/com>
  *
  * This file is part of LMMS - https://lmms.io
  *
@@ -39,14 +39,8 @@ class EffectLabelButton : public QPushButton
 	EffectLabelButton(EffectView* _tv, QWidget* _parent);
 	~EffectLabelButton() override = default;
 
-protected:
-	void paintEvent(QPaintEvent* pe) override;
-
 private:
 	EffectView* m_effectView;
-	QString m_iconName;
-	QRect m_buttonRect;
-	QString elideName(const QString &name);
 };
 
 
diff --git a/src/gui/EffectView.cpp b/src/gui/EffectView.cpp
index 8d62d790eda..2488f545453 100644
--- a/src/gui/EffectView.cpp
+++ b/src/gui/EffectView.cpp
@@ -73,8 +73,6 @@ EffectView::EffectView(Effect * _model, QWidget * _parent) :
 	m_label = new EffectLabelButton(this, this);
 	m_label->setText(model()->displayName());
 	m_label->setFont(labelFont);
-	m_label->setCheckable(true);
-	m_label->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Maximum);
 	if(hasControls)
 	{
 		connect(m_label, SIGNAL(clicked()), this, SLOT(editControls()));
diff --git a/src/gui/widgets/EffectLabelButton.cpp b/src/gui/widgets/EffectLabelButton.cpp
index f1ca867f477..c43d9b7172b 100644
--- a/src/gui/widgets/EffectLabelButton.cpp
+++ b/src/gui/widgets/EffectLabelButton.cpp
@@ -2,7 +2,7 @@
  * EffectLabelButton.cpp - implementation of class trackLabelButton, a label
  *                          which is renamable by double-clicking it
  *
- * Copyright (c) 2004-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2024 Noah Brecht <noahb2713/at/gmail/dot/com>
  * 
  * This file is part of LMMS - https://lmms.io
  *
@@ -39,31 +39,15 @@ namespace lmms::gui
 
 EffectLabelButton::EffectLabelButton(EffectView* _tv, QWidget* _parent) :
 	QPushButton(_parent),
-	m_effectView(_tv),
-	m_iconName()
+	m_effectView(_tv)
 {
 	setAttribute(Qt::WA_OpaquePaintEvent, true);
 	setAcceptDrops(false);
 
 	setCursor(QCursor(embed::getIconPixmap("hand"), 3, 3));
 	setStyleSheet("text-align:left;padding:2px;");
-}
-
-void EffectLabelButton::paintEvent(QPaintEvent* pe)
-{
-	QPushButton::paintEvent(pe);
-}
-
-QString EffectLabelButton::elideName(const QString &name)
-{
-	const int spacing = 16;
-	const int maxTextWidth = width() - spacing - iconSize().width();
-
-	setToolTip(name);
-
-	QFontMetrics metrics(font());
-	QString elidedName = metrics.elidedText(name, Qt::ElideRight, maxTextWidth);
-	return elidedName;
+	setCheckable(true);
+	setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Maximum);
 }
 
 } // namespace lmms::gui
\ No newline at end of file

From 34a48d82aa318aa00389672b51b2a54feffb75be Mon Sep 17 00:00:00 2001
From: enp2s0 <noahb2713@gmail.com>
Date: Thu, 8 Aug 2024 23:35:05 -0400
Subject: [PATCH 09/16] classes are no longer friends, they hate eachother now

---
 include/EffectView.h   | 3 +--
 src/gui/EffectView.cpp | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/include/EffectView.h b/include/EffectView.h
index 035681671a0..2f6d5334085 100644
--- a/include/EffectView.h
+++ b/include/EffectView.h
@@ -48,7 +48,6 @@ class Knob;
 class LedCheckBox;
 class TempoSyncKnob;
 
-
 class EffectView : public PluginView
 {
 	Q_OBJECT
@@ -103,7 +102,7 @@ public slots:
 	bool m_dragging;
 	QGraphicsOpacityEffect* m_opacityEffect;
 
-	friend class EffectLabelButton;
+	//friend class EffectLabelButton;
 } ;
 
 
diff --git a/src/gui/EffectView.cpp b/src/gui/EffectView.cpp
index 2488f545453..8074b9b0552 100644
--- a/src/gui/EffectView.cpp
+++ b/src/gui/EffectView.cpp
@@ -45,7 +45,6 @@
 #include "SubWindow.h"
 #include "TempoSyncKnob.h"
 
-
 namespace lmms::gui
 {
 

From 7f541f5fde825933232ebc24ba173f2362b07e16 Mon Sep 17 00:00:00 2001
From: enp2s0 <noahb2713@gmail.com>
Date: Thu, 8 Aug 2024 23:43:42 -0400
Subject: [PATCH 10/16] simpler margin calc and connect()

---
 src/gui/EffectView.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gui/EffectView.cpp b/src/gui/EffectView.cpp
index 8074b9b0552..dab33cad90e 100644
--- a/src/gui/EffectView.cpp
+++ b/src/gui/EffectView.cpp
@@ -74,7 +74,7 @@ EffectView::EffectView(Effect * _model, QWidget * _parent) :
 	m_label->setFont(labelFont);
 	if(hasControls)
 	{
-		connect(m_label, SIGNAL(clicked()), this, SLOT(editControls()));
+		connect(m_label, &EffectLabelButton::clicked, this, &EffectView::editControls);
 	}
 	m_mainLayout->addWidget(m_label);
 
@@ -256,7 +256,7 @@ void EffectView::paintEvent( QPaintEvent * )
 	QPainter p(this);
 	QPainterPath path;
 
-	path.addRoundedRect(QRectF(2, 2, EffectView::DEFAULT_WIDTH - 4, EffectView::DEFAULT_HEIGHT - 4), 2, 2);
+	path.addRoundedRect(rect().marginsRemoved(QMargins(2, 2, 2, 2)), 2, 2);
 
 	QPen pen(Qt::black, 1);
 	p.setPen(pen);

From 5127544b4850e08703ee140b0e42e5ce1c4d920e Mon Sep 17 00:00:00 2001
From: enp2s0 <noahb2713@gmail.com>
Date: Thu, 8 Aug 2024 23:45:34 -0400
Subject: [PATCH 11/16] missing space

---
 src/gui/EffectView.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/gui/EffectView.cpp b/src/gui/EffectView.cpp
index dab33cad90e..36530c8f5c3 100644
--- a/src/gui/EffectView.cpp
+++ b/src/gui/EffectView.cpp
@@ -45,6 +45,7 @@
 #include "SubWindow.h"
 #include "TempoSyncKnob.h"
 
+
 namespace lmms::gui
 {
 

From 89cb23f451bbe96a539a15c80d10f9f743e30b17 Mon Sep 17 00:00:00 2001
From: enp2s0 <noahb2713@gmail.com>
Date: Thu, 8 Aug 2024 23:56:52 -0400
Subject: [PATCH 12/16] one more space

---
 include/EffectView.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/EffectView.h b/include/EffectView.h
index 2f6d5334085..c7b1f245b8c 100644
--- a/include/EffectView.h
+++ b/include/EffectView.h
@@ -40,6 +40,7 @@ class QHBoxLayout;
 class QLabel;
 class QToolButton;
 
+
 namespace lmms::gui
 {
 

From 809a15203432c19323920926eb79e7c57b73b560 Mon Sep 17 00:00:00 2001
From: enp2s0 <noahb2713@gmail.com>
Date: Thu, 8 Aug 2024 23:58:42 -0400
Subject: [PATCH 13/16] wrong place

---
 include/EffectView.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/EffectView.h b/include/EffectView.h
index c7b1f245b8c..3fb4bad35b9 100644
--- a/include/EffectView.h
+++ b/include/EffectView.h
@@ -40,7 +40,6 @@ class QHBoxLayout;
 class QLabel;
 class QToolButton;
 
-
 namespace lmms::gui
 {
 
@@ -49,6 +48,7 @@ class Knob;
 class LedCheckBox;
 class TempoSyncKnob;
 
+
 class EffectView : public PluginView
 {
 	Q_OBJECT

From e6aa0ea051035fa72217ed84c2d862b2618f6e86 Mon Sep 17 00:00:00 2001
From: Michael Gregorius <michael.gregorius.git@arcor.de>
Date: Fri, 9 Aug 2024 20:04:15 +0200
Subject: [PATCH 14/16] Code cleanup

Newline at the end of the `EffectLabelButton` files.

Cleanup of includes and forward declarations. Remove commented out
friend declaration.
---
 include/EffectLabelButton.h           |  2 +-
 include/EffectView.h                  | 15 ++++++---------
 src/gui/EffectView.cpp                |  2 ++
 src/gui/widgets/EffectLabelButton.cpp |  2 +-
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/include/EffectLabelButton.h b/include/EffectLabelButton.h
index 4831414bba3..0bd076eaf74 100644
--- a/include/EffectLabelButton.h
+++ b/include/EffectLabelButton.h
@@ -46,4 +46,4 @@ class EffectLabelButton : public QPushButton
 
 } // namespace lmms::gui
 
-#endif // LMMS_GUI_EFFECT_LABEL_BUTTON_H
\ No newline at end of file
+#endif // LMMS_GUI_EFFECT_LABEL_BUTTON_H
diff --git a/include/EffectView.h b/include/EffectView.h
index 3fb4bad35b9..725a5c43f40 100644
--- a/include/EffectView.h
+++ b/include/EffectView.h
@@ -26,20 +26,18 @@
 #ifndef LMMS_GUI_EFFECT_VIEW_H
 #define LMMS_GUI_EFFECT_VIEW_H
 
-#include "AutomatableModel.h"
 #include "PluginView.h"
-#include "Effect.h"
-#include "EffectLabelButton.h"
 
 class QGraphicsOpacityEffect;
-class QGroupBox;
-class QLabel;
-class QPushButton;
 class QMdiSubWindow;
 class QHBoxLayout;
-class QLabel;
 class QToolButton;
 
+namespace lmms
+{
+class Effect;
+}
+
 namespace lmms::gui
 {
 
@@ -47,6 +45,7 @@ class EffectControlDialog;
 class Knob;
 class LedCheckBox;
 class TempoSyncKnob;
+class EffectLabelButton;
 
 
 class EffectView : public PluginView
@@ -102,8 +101,6 @@ public slots:
 	
 	bool m_dragging;
 	QGraphicsOpacityEffect* m_opacityEffect;
-
-	//friend class EffectLabelButton;
 } ;
 
 
diff --git a/src/gui/EffectView.cpp b/src/gui/EffectView.cpp
index 36530c8f5c3..cdc187d023e 100644
--- a/src/gui/EffectView.cpp
+++ b/src/gui/EffectView.cpp
@@ -33,9 +33,11 @@
 #include <QLabel>
 #include <QToolButton>
 
+#include "Effect.h"
 #include "EffectView.h"
 #include "DummyEffect.h"
 #include "CaptionMenu.h"
+#include "EffectLabelButton.h"
 #include "embed.h"
 #include "GuiApplication.h"
 #include "gui_templates.h"
diff --git a/src/gui/widgets/EffectLabelButton.cpp b/src/gui/widgets/EffectLabelButton.cpp
index c43d9b7172b..63ee2a80a36 100644
--- a/src/gui/widgets/EffectLabelButton.cpp
+++ b/src/gui/widgets/EffectLabelButton.cpp
@@ -50,4 +50,4 @@ EffectLabelButton::EffectLabelButton(EffectView* _tv, QWidget* _parent) :
 	setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Maximum);
 }
 
-} // namespace lmms::gui
\ No newline at end of file
+} // namespace lmms::gui

From b09286e86e77c4fcffe387bfc7cf31b26c22e91c Mon Sep 17 00:00:00 2001
From: enp2s0 <noahb2713@gmail.com>
Date: Sun, 11 Aug 2024 20:58:21 -0400
Subject: [PATCH 15/16] bring back knob labels

---
 include/EffectView.h   | 2 +-
 src/gui/EffectView.cpp | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/include/EffectView.h b/include/EffectView.h
index 725a5c43f40..b964bbd018c 100644
--- a/include/EffectView.h
+++ b/include/EffectView.h
@@ -65,7 +65,7 @@ class EffectView : public PluginView
 	}
 
 	static constexpr int DEFAULT_WIDTH = 215;
-	static constexpr int DEFAULT_HEIGHT = 35;
+	static constexpr int DEFAULT_HEIGHT = 47;
 	
 	void mouseMoveEvent(QMouseEvent* event) override;
 	void mousePressEvent(QMouseEvent* event) override;
diff --git a/src/gui/EffectView.cpp b/src/gui/EffectView.cpp
index cdc187d023e..4ef433383a1 100644
--- a/src/gui/EffectView.cpp
+++ b/src/gui/EffectView.cpp
@@ -61,7 +61,7 @@ EffectView::EffectView(Effect * _model, QWidget * _parent) :
 	setFocusPolicy(Qt::StrongFocus);
 	
 	m_mainLayout = new QHBoxLayout();
-	m_mainLayout->setContentsMargins(8, 2, 8, 2);
+	m_mainLayout->setContentsMargins(8, 0, 8, 0);
 
 	bool hasControls = effect()->controls()->controlCount() > 0;
 	bool isEnabled = !dynamic_cast<DummyEffect *>( effect() );
@@ -74,7 +74,6 @@ EffectView::EffectView(Effect * _model, QWidget * _parent) :
 	QFont labelFont = adjustedToPixelSize(font(), 10);
 	m_label = new EffectLabelButton(this, this);
 	m_label->setText(model()->displayName());
-	m_label->setFont(labelFont);
 	if(hasControls)
 	{
 		connect(m_label, &EffectLabelButton::clicked, this, &EffectView::editControls);
@@ -84,12 +83,15 @@ EffectView::EffectView(Effect * _model, QWidget * _parent) :
 	m_wetDry = new Knob(KnobType::Small17, this);
 	m_wetDry->setEnabled(isEnabled);
 	m_wetDry->setHintText(tr("Wet Level:"), "");
+	m_wetDry->setLabel("W/D");
 	m_mainLayout->addWidget(m_wetDry);
 
 	m_autoQuit = new TempoSyncKnob(KnobType::Small17, this);
 	m_autoQuit->setEnabled(isEnabled && !effect()->m_autoQuitDisabled);
 	m_autoQuit->setVisible(isEnabled && !effect()->m_autoQuitDisabled);
 	m_autoQuit->setHintText(tr("Stop after:"), "ms");
+	m_autoQuit->setLabel("STOP");
+	m_autoQuit->setFont(labelFont);
 	m_mainLayout->addWidget(m_autoQuit);
 
 	setModel( _model );

From 082e06825e6fa10e7d0cf44e261f7baaf5faa304 Mon Sep 17 00:00:00 2001
From: Rossmaxx <74815851+Rossmaxx@users.noreply.github.com>
Date: Sat, 28 Sep 2024 20:38:28 +0530
Subject: [PATCH 16/16] Fix build

---
 src/core/Effect.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/Effect.cpp b/src/core/Effect.cpp
index 92bef0e96d6..7b11494d0a0 100644
--- a/src/core/Effect.cpp
+++ b/src/core/Effect.cpp
@@ -187,7 +187,7 @@ void Effect::checkGate(double outSum)
 
 	// Check whether we need to continue processing input.  Restart the
 	// counter if the threshold has been exceeded.
-	if (out_sum <= F_EPSILON)
+	if (outSum <= F_EPSILON)
 	{
 		incrementBufferCount();
 		if( bufferCount() > timeout() )