Code review changes

Parameter whitespaces in the builder methods of `Knob`. Use `adjustedToPixelSize` in `InstrumentTrackView` and `SampleTrackView`.
michaelgregorius · Sep 30, 2024 · 39e1e9f · 39e1e9f
1 parent d31c90e
commit 39e1e9f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/include/Knob.h b/include/Knob.h
@@ -81,8 +81,8 @@ class LMMS_EXPORT Knob : public FloatModelEditorBase
 	Knob( QWidget * _parent = nullptr, const QString & _name = QString() ); //!< default ctor
 	Knob( const Knob& other ) = delete;
 
-	static Knob* buildLegacyKnob(KnobType knob_num, const QString& label, QWidget* parent, const QString & _name = QString());
-	static Knob* buildKnobWithSmallPixelFont(KnobType knob_num, const QString& label, QWidget* parent, const QString & _name = QString());
+	static Knob* buildLegacyKnob(KnobType knob_num, const QString& label, QWidget* parent, const QString& name = QString());
+	static Knob* buildKnobWithSmallPixelFont(KnobType knob_num, const QString& label, QWidget* parent, const QString& name = QString());
 
 	void setLabel(const QString & txt);
 	void setHtmlLabel( const QString &htmltxt );

diff --git a/src/gui/tracks/InstrumentTrackView.cpp b/src/gui/tracks/InstrumentTrackView.cpp
@@ -35,6 +35,7 @@
 #include "ConfigManager.h"
 #include "Engine.h"
 #include "FadeButton.h"
+#include "FontHelper.h"
 #include "Knob.h"
 #include "MidiCCRackView.h"
 #include "Mixer.h"
@@ -77,8 +78,8 @@ InstrumentTrackView::InstrumentTrackView( InstrumentTrack * _it, TrackContainerV
 	m_mixerChannelNumber = new MixerChannelLcdSpinBox(2, getTrackSettingsWidget(), tr("Mixer channel"), this);
 	m_mixerChannelNumber->show();
 
-	auto f = font();
-	f.setPixelSize(9);
+	const auto f = adjustedToPixelSize(font(), 9);
+
 	m_volumeKnob = new Knob(KnobType::Small17, getTrackSettingsWidget(), tr("Volume"));
 	m_volumeKnob->setFont(f);
 	m_volumeKnob->setLabel(tr("VOL"));

diff --git a/src/gui/tracks/SampleTrackView.cpp b/src/gui/tracks/SampleTrackView.cpp
@@ -31,6 +31,7 @@
 #include "embed.h"
 #include "Engine.h"
 #include "FadeButton.h"
+#include "FontHelper.h"
 #include "Mixer.h"
 #include "MixerView.h"
 #include "GuiApplication.h"
@@ -61,8 +62,8 @@ SampleTrackView::SampleTrackView( SampleTrack * _t, TrackContainerView* tcv ) :
 	m_mixerChannelNumber = new MixerChannelLcdSpinBox(2, getTrackSettingsWidget(), tr("Mixer channel"), this);
 	m_mixerChannelNumber->show();
 
-	auto f = font();
-	f.setPixelSize(9);
+	const auto f = adjustedToPixelSize(font(), 9);
+
 	m_volumeKnob = new Knob(KnobType::Small17, getTrackSettingsWidget(), tr("Track volume"));
 	m_volumeKnob->setFont(f);
 	m_volumeKnob->setLabel(tr("VOL"));

diff --git a/src/gui/widgets/Knob.cpp b/src/gui/widgets/Knob.cpp
@@ -57,7 +57,7 @@ Knob::Knob( QWidget * _parent, const QString & _name ) :
 {
 }
 
-Knob* Knob::buildLegacyKnob(KnobType knob_num, const QString& label, QWidget * parent, const QString & name)
+Knob* Knob::buildLegacyKnob(KnobType knob_num, const QString& label, QWidget* parent, const QString& name)
 {
 	auto result = new Knob(knob_num, parent, name);
 	result->setLegacyMode(true);
@@ -67,7 +67,7 @@ Knob* Knob::buildLegacyKnob(KnobType knob_num, const QString& label, QWidget * p
 	return result;
 }
 
-Knob* Knob::buildKnobWithSmallPixelFont(KnobType knob_num, const QString& label, QWidget * parent, const QString & name)
+Knob* Knob::buildKnobWithSmallPixelFont(KnobType knob_num, const QString& label, QWidget* parent, const QString& name)
 {
 	auto result = new Knob(knob_num, parent, name);
 	result->setFont(adjustedToPixelSize(result->font(), SMALL_FONT_SIZE));