Refactor gui_templates.h (LMMS#7159)

* remove the gui_templates header where functions not used * refactor and replace template with function argument * refactor: merge pointSizeF function with pointSize * removed template per michael's review * use std::max for more readability * remove the QDesktopWidget header * cleanup arguments and remove parentheses from return
michaelgregorius · Mar 27, 2024 · 286d157 · 286d157
1 parent a41da81
commit 286d157
Show file tree

Hide file tree

Showing 47 changed files with 76 additions and 105 deletions.
diff --git a/include/gui_templates.h b/include/gui_templates.h
@@ -27,45 +27,33 @@
 
 #include "lmmsconfig.h"
 
+#include <algorithm>
 #include <QApplication>
 #include <QFont>
-#include <QDesktopWidget>
+#include <QGuiApplication>
 
-namespace lmms
+// TODO: remove once qt5 support is dropped
+#if (QT_VERSION < QT_VERSION_CHECK(6,0,0))
+	#include <QScreen>
+#endif
+
+namespace lmms::gui
 {
 
 
 // return DPI-independent font-size - font with returned font-size has always
 // the same size in pixels
-template<int SIZE>
-inline QFont pointSize( QFont _f )
+inline QFont pointSize(QFont fontPointer, float fontSize)
 {
-	static const float DPI = 96;
-#ifdef LMMS_BUILD_WIN32
-	_f.setPointSizeF( ((float) SIZE+0.5f) * DPI /
-			QApplication::desktop()->logicalDpiY() );
-#else
-	_f.setPointSizeF( (float) SIZE * DPI /
-			QApplication::desktop()->logicalDpiY() );
-#endif
-	return( _f );
-}
+	// to calculate DPI of a screen to make it HiDPI ready
+	qreal devicePixelRatio = QGuiApplication::primaryScreen()->devicePixelRatio();
+    qreal scaleFactor = std::max(devicePixelRatio, 1.0); // Ensure scaleFactor is at least 1.0
 
-
-inline QFont pointSizeF( QFont _f, float SIZE )
-{
-	static const float DPI = 96;
-#ifdef LMMS_BUILD_WIN32
-	_f.setPointSizeF( (SIZE+0.5f) * DPI /
-			QApplication::desktop()->logicalDpiY() );
-#else
-	_f.setPointSizeF( SIZE * DPI /
-			QApplication::desktop()->logicalDpiY() );
-#endif
-	return( _f );
+	fontPointer.setPointSizeF(fontSize * scaleFactor);
+	return fontPointer;
 }
 
 
-} // namespace lmms
+} // namespace lmms::gui
 
 #endif // LMMS_GUI_TEMPLATES_H
diff --git a/plugins/AudioFileProcessor/AudioFileProcessorView.cpp b/plugins/AudioFileProcessor/AudioFileProcessorView.cpp
@@ -134,7 +134,7 @@ AudioFileProcessorView::AudioFileProcessorView(Instrument* instrument,
 // interpolation selector
 	m_interpBox = new ComboBox(this);
 	m_interpBox->setGeometry(142, 62, 82, ComboBox::DEFAULT_HEIGHT);
-	m_interpBox->setFont(pointSize<8>(m_interpBox->font()));
+	m_interpBox->setFont(pointSize(m_interpBox->font(), 8));
 
 // wavegraph
 	m_waveView = 0;
@@ -228,7 +228,7 @@ void AudioFileProcessorView::paintEvent(QPaintEvent*)
 
 	int idx = a->sample().sampleFile().length();
 
-	p.setFont(pointSize<8>(font()));
+	p.setFont(pointSize(font(), 8));
 
 	QFontMetrics fm(p.font());
 

diff --git a/plugins/AudioFileProcessor/AudioFileProcessorWaveView.cpp b/plugins/AudioFileProcessor/AudioFileProcessorWaveView.cpp
@@ -273,7 +273,7 @@ void AudioFileProcessorWaveView::paintEvent(QPaintEvent * pe)
 	p.fillRect(s_padding, s_padding, m_graph.width(), 14, g);
 
 	p.setPen(QColor(255, 255, 255));
-	p.setFont(pointSize<8>(font()));
+	p.setFont(pointSize(font(), 8));
 
 	QString length_text;
 	const int length = m_sample->sampleDuration().count();

diff --git a/plugins/CarlaBase/Carla.cpp b/plugins/CarlaBase/Carla.cpp
@@ -632,7 +632,7 @@ CarlaInstrumentView::CarlaInstrumentView(CarlaInstrument* const instrument, QWid
     m_toggleUIButton->setCheckable( true );
     m_toggleUIButton->setChecked( false );
     m_toggleUIButton->setIcon( embed::getIconPixmap( "zoom" ) );
-    m_toggleUIButton->setFont( pointSize<8>( m_toggleUIButton->font() ) );
+    m_toggleUIButton->setFont(pointSize(m_toggleUIButton->font(), 8));
     connect( m_toggleUIButton, SIGNAL( clicked(bool) ), this, SLOT( toggleUI( bool ) ) );
 
     m_toggleUIButton->setToolTip(
@@ -642,7 +642,7 @@ CarlaInstrumentView::CarlaInstrumentView(CarlaInstrument* const instrument, QWid
     m_toggleParamsWindowButton = new QPushButton(tr("Params"), this);
     m_toggleParamsWindowButton->setIcon(embed::getIconPixmap("controller"));
     m_toggleParamsWindowButton->setCheckable(true);
-    m_toggleParamsWindowButton->setFont(pointSize<8>(m_toggleParamsWindowButton->font()));
+    m_toggleParamsWindowButton->setFont(pointSize(m_toggleParamsWindowButton->font(), 8));
 #if CARLA_VERSION_HEX < CARLA_MIN_PARAM_VERSION
     m_toggleParamsWindowButton->setEnabled(false);
     m_toggleParamsWindowButton->setToolTip(tr("Available from Carla version 2.1 and up."));

diff --git a/plugins/DualFilter/DualFilterControlDialog.cpp b/plugins/DualFilter/DualFilterControlDialog.cpp
@@ -76,12 +76,12 @@ DualFilterControlDialog::DualFilterControlDialog( DualFilterControls* controls )
 
 	auto m_filter1ComboBox = new ComboBox(this);
 	m_filter1ComboBox->setGeometry( 19, 70, 137, ComboBox::DEFAULT_HEIGHT );
-	m_filter1ComboBox->setFont( pointSize<8>( m_filter1ComboBox->font() ) );
+	m_filter1ComboBox->setFont(pointSize(m_filter1ComboBox->font(), 8));
 	m_filter1ComboBox->setModel( &controls->m_filter1Model );
 
 	auto m_filter2ComboBox = new ComboBox(this);
 	m_filter2ComboBox->setGeometry( 217, 70, 137, ComboBox::DEFAULT_HEIGHT );
-	m_filter2ComboBox->setFont( pointSize<8>( m_filter2ComboBox->font() ) );
+	m_filter2ComboBox->setFont(pointSize(m_filter2ComboBox->font(), 8));
 	m_filter2ComboBox->setModel( &controls->m_filter2Model );
 }
 

diff --git a/plugins/LadspaBrowser/LadspaBrowser.cpp b/plugins/LadspaBrowser/LadspaBrowser.cpp
@@ -172,7 +172,7 @@ QWidget * LadspaBrowserView::createTab( QWidget * _parent, const QString & _txt,
 	auto title = new QLabel(type + _txt, tab);
 	QFont f = title->font();
 	f.setBold( true );
-	title->setFont( pointSize<12>( f ) );
+	title->setFont(pointSize(f, 12));
 
 	layout->addSpacing( 5 );
 	layout->addWidget( title );

diff --git a/plugins/Monstro/Monstro.cpp b/plugins/Monstro/Monstro.cpp
@@ -1694,7 +1694,7 @@ QWidget * MonstroView::setupOperatorsView( QWidget * _parent )
 
 	m_osc2WaveBox = new ComboBox( view );
 	m_osc2WaveBox -> setGeometry( 204, O2ROW + 7, 42, ComboBox::DEFAULT_HEIGHT );
-	m_osc2WaveBox->setFont( pointSize<8>( m_osc2WaveBox->font() ) );
+	m_osc2WaveBox->setFont(pointSize(m_osc2WaveBox->font(), 8));
 
 	maketinyled( m_osc2SyncHButton, 212, O2ROW - 3, tr( "Hard sync oscillator 2" ) )
 	maketinyled( m_osc2SyncRButton, 191, O2ROW - 3, tr( "Reverse sync oscillator 2" ) )
@@ -1709,26 +1709,26 @@ QWidget * MonstroView::setupOperatorsView( QWidget * _parent )
 
 	m_osc3Wave1Box = new ComboBox( view );
 	m_osc3Wave1Box -> setGeometry( 160, O3ROW + 7, 42, ComboBox::DEFAULT_HEIGHT );
-	m_osc3Wave1Box->setFont( pointSize<8>( m_osc3Wave1Box->font() ) );
+	m_osc3Wave1Box->setFont(pointSize(m_osc3Wave1Box->font(), 8));
 
 	m_osc3Wave2Box = new ComboBox( view );
 	m_osc3Wave2Box -> setGeometry( 204, O3ROW + 7, 42, ComboBox::DEFAULT_HEIGHT );
-	m_osc3Wave2Box->setFont( pointSize<8>( m_osc3Wave2Box->font() ) );
+	m_osc3Wave2Box->setFont(pointSize(m_osc3Wave2Box->font(), 8));
 
 	maketinyled( m_osc3SyncHButton, 212, O3ROW - 3, tr( "Hard sync oscillator 3" ) )
 	maketinyled( m_osc3SyncRButton, 191, O3ROW - 3, tr( "Reverse sync oscillator 3" ) )
 
 	m_lfo1WaveBox = new ComboBox( view );
 	m_lfo1WaveBox -> setGeometry( 2, LFOROW + 7, 42, ComboBox::DEFAULT_HEIGHT );
-	m_lfo1WaveBox->setFont( pointSize<8>( m_lfo1WaveBox->font() ) );
+	m_lfo1WaveBox->setFont(pointSize(m_lfo1WaveBox->font(), 8));
 
 	maketsknob( m_lfo1AttKnob, LFOCOL1, LFOROW, tr( "Attack" ), " ms", "lfoKnob" )
 	maketsknob( m_lfo1RateKnob, LFOCOL2, LFOROW, tr( "Rate" ), " ms", "lfoKnob" )
 	makeknob( m_lfo1PhsKnob, LFOCOL3, LFOROW, tr( "Phase" ), tr( " deg" ), "lfoKnob" )
 
 	m_lfo2WaveBox = new ComboBox( view );
 	m_lfo2WaveBox -> setGeometry( 127, LFOROW + 7, 42, ComboBox::DEFAULT_HEIGHT );
-	m_lfo2WaveBox->setFont( pointSize<8>( m_lfo2WaveBox->font() ) );
+	m_lfo2WaveBox->setFont(pointSize(m_lfo2WaveBox->font(), 8));
 
 	maketsknob(m_lfo2AttKnob, LFOCOL4, LFOROW, tr("Attack"), " ms", "lfoKnob")
 	maketsknob(m_lfo2RateKnob, LFOCOL5, LFOROW, tr("Rate"), " ms", "lfoKnob")

diff --git a/plugins/Patman/Patman.cpp b/plugins/Patman/Patman.cpp
@@ -548,7 +548,7 @@ void PatmanView::updateFilename()
  	m_displayFilename = "";
 	int idx = m_pi->m_patchFile.length();
 
-	QFontMetrics fm( pointSize<8>( font() ) );
+	QFontMetrics fm(pointSize(font(), 8));
 
 	// simple algorithm for creating a text from the filename that
 	// matches in the white rectangle
@@ -618,7 +618,7 @@ void PatmanView::paintEvent( QPaintEvent * )
 {
 	QPainter p( this );
 
-	p.setFont( pointSize<8>( font() ) );
+	p.setFont(pointSize(font() ,8));
 	p.drawText( 8, 116, 235, 16,
 			Qt::AlignLeft | Qt::TextSingleLine | Qt::AlignVCenter,
 			m_displayFilename );

diff --git a/plugins/Stk/Mallets/Mallets.cpp b/plugins/Stk/Mallets/Mallets.cpp
@@ -450,7 +450,7 @@ MalletsInstrumentView::MalletsInstrumentView( MalletsInstrument * _instrument,
 
 	m_presetsCombo = new ComboBox( this, tr( "Instrument" ) );
 	m_presetsCombo->setGeometry( 140, 50, 99, ComboBox::DEFAULT_HEIGHT );
-	m_presetsCombo->setFont( pointSize<8>( m_presetsCombo->font() ) );
+	m_presetsCombo->setFont(pointSize(m_presetsCombo->font(), 8));
 
 	connect( &_instrument->m_presetsModel, SIGNAL( dataChanged() ),
 		 this, SLOT( changePreset() ) );

diff --git a/plugins/Vestige/Vestige.cpp b/plugins/Vestige/Vestige.cpp
@@ -587,7 +587,7 @@ VestigeInstrumentView::VestigeInstrumentView( Instrument * _instrument,
 	m_toggleGUIButton = new QPushButton( tr( "Show/hide GUI" ), this );
 	m_toggleGUIButton->setGeometry( 20, 130, 200, 24 );
 	m_toggleGUIButton->setIcon( embed::getIconPixmap( "zoom" ) );
-	m_toggleGUIButton->setFont( pointSize<8>( m_toggleGUIButton->font() ) );
+	m_toggleGUIButton->setFont(pointSize(m_toggleGUIButton->font(), 8));
 	connect( m_toggleGUIButton, SIGNAL( clicked() ), this,
 							SLOT( toggleGUI() ) );
 
@@ -596,7 +596,7 @@ VestigeInstrumentView::VestigeInstrumentView( Instrument * _instrument,
 		this);
 	note_off_all_btn->setGeometry( 20, 160, 200, 24 );
 	note_off_all_btn->setIcon( embed::getIconPixmap( "stop" ) );
-	note_off_all_btn->setFont( pointSize<8>( note_off_all_btn->font() ) );
+	note_off_all_btn->setFont(pointSize(note_off_all_btn->font(), 8));
 	connect( note_off_all_btn, SIGNAL( clicked() ), this,
 							SLOT( noteOffAll() ) );
 
@@ -881,7 +881,7 @@ void VestigeInstrumentView::paintEvent( QPaintEvent * )
 				tr( "No VST plugin loaded" );
 	QFont f = p.font();
 	f.setBold( true );
-	p.setFont( pointSize<10>( f ) );
+	p.setFont(pointSize(f, 10));
 	p.setPen( QColor( 255, 255, 255 ) );
 	p.drawText( 10, 100, plugin_name );
 
@@ -893,7 +893,7 @@ void VestigeInstrumentView::paintEvent( QPaintEvent * )
 	{
 		p.setPen( QColor( 0, 0, 0 ) );
 		f.setBold( false );
-		p.setFont( pointSize<8>( f ) );
+		p.setFont(pointSize(f, 8));
 		p.drawText( 10, 114, tr( "by " ) +
 					m_vi->m_plugin->vendorString() );
 		p.setPen( QColor( 255, 255, 255 ) );

diff --git a/plugins/VstEffect/VstEffectControlDialog.cpp b/plugins/VstEffect/VstEffectControlDialog.cpp
@@ -246,7 +246,7 @@ VstEffectControlDialog::VstEffectControlDialog( VstEffectControls * _ctl ) :
 		tb->addWidget(space1);
 
 		tbLabel = new QLabel( tr( "Effect by: " ), this );
-		tbLabel->setFont( pointSize<7>( f ) );
+		tbLabel->setFont(pointSize(f, 7));
 		tbLabel->setTextFormat(Qt::RichText);
 		tbLabel->setAlignment( Qt::AlignTop | Qt::AlignLeft );
 		tb->addWidget( tbLabel );

diff --git a/plugins/ZynAddSubFx/ZynAddSubFx.cpp b/plugins/ZynAddSubFx/ZynAddSubFx.cpp
@@ -541,7 +541,7 @@ ZynAddSubFxView::ZynAddSubFxView( Instrument * _instrument, QWidget * _parent )
 	m_toggleUIButton->setCheckable( true );
 	m_toggleUIButton->setChecked( false );
 	m_toggleUIButton->setIcon( embed::getIconPixmap( "zoom" ) );
-	m_toggleUIButton->setFont( pointSize<8>( m_toggleUIButton->font() ) );
+	m_toggleUIButton->setFont(pointSize(m_toggleUIButton->font(), 8));
 	connect( m_toggleUIButton, SIGNAL( toggled( bool ) ), this,
 							SLOT( toggleUI() ) );
 

diff --git a/src/core/audio/AudioJack.cpp b/src/core/audio/AudioJack.cpp
@@ -37,7 +37,6 @@
 #include "LcdSpinBox.h"
 #include "MainWindow.h"
 #include "MidiJack.h"
-#include "gui_templates.h"
 
 namespace lmms
 {

diff --git a/src/core/audio/AudioOss.cpp b/src/core/audio/AudioOss.cpp
@@ -34,7 +34,6 @@
 #include "LcdSpinBox.h"
 #include "AudioEngine.h"
 #include "Engine.h"
-#include "gui_templates.h"
 
 #ifdef LMMS_HAVE_UNISTD_H
 #include <unistd.h>

diff --git a/src/core/audio/AudioPortAudio.cpp b/src/core/audio/AudioPortAudio.cpp
@@ -53,7 +53,6 @@ void AudioPortAudioSetupUtil::updateChannels()
 
 #include "Engine.h"
 #include "ConfigManager.h"
-#include "gui_templates.h"
 #include "ComboBox.h"
 #include "AudioEngine.h"
 

diff --git a/src/core/audio/AudioPulseAudio.cpp b/src/core/audio/AudioPulseAudio.cpp
@@ -32,7 +32,6 @@
 #include "ConfigManager.h"
 #include "LcdSpinBox.h"
 #include "AudioEngine.h"
-#include "gui_templates.h"
 #include "Engine.h"
 
 namespace lmms

diff --git a/src/core/audio/AudioSdl.cpp b/src/core/audio/AudioSdl.cpp
@@ -32,7 +32,6 @@
 
 #include "AudioEngine.h"
 #include "ConfigManager.h"
-#include "gui_templates.h"
 
 namespace lmms
 {

diff --git a/src/core/audio/AudioSndio.cpp b/src/core/audio/AudioSndio.cpp
@@ -35,7 +35,6 @@
 #include "LcdSpinBox.h"
 #include "AudioEngine.h"
 #include "Engine.h"
-#include "gui_templates.h"
 
 #include "ConfigManager.h"
 

diff --git a/src/core/audio/AudioSoundIo.cpp b/src/core/audio/AudioSoundIo.cpp
@@ -32,7 +32,6 @@
 #include "Engine.h"
 #include "debug.h"
 #include "ConfigManager.h"
-#include "gui_templates.h"
 #include "ComboBox.h"
 #include "AudioEngine.h"
 

diff --git a/src/gui/AudioAlsaSetupWidget.cpp b/src/gui/AudioAlsaSetupWidget.cpp
@@ -31,7 +31,6 @@
 
 #include "ConfigManager.h"
 #include "LcdSpinBox.h"
-#include "gui_templates.h"
 
 namespace lmms::gui
 {

diff --git a/src/gui/EffectView.cpp b/src/gui/EffectView.cpp
@@ -90,7 +90,7 @@ EffectView::EffectView( Effect * _model, QWidget * _parent ) :
 	{
 		auto ctls_btn = new QPushButton(tr("Controls"), this);
 		QFont f = ctls_btn->font();
-		ctls_btn->setFont( pointSize<8>( f ) );
+		ctls_btn->setFont(pointSize(f, 8));
 		ctls_btn->setGeometry( 150, 14, 50, 20 );
 		connect( ctls_btn, SIGNAL(clicked()),
 					this, SLOT(editControls()));
@@ -257,7 +257,7 @@ void EffectView::paintEvent( QPaintEvent * )
 	QPainter p( this );
 	p.drawPixmap( 0, 0, m_bg );
 
-	QFont f = pointSizeF( font(), 7.5f );
+	QFont f = pointSize(font(), 7.5f);
 	f.setBold( true );
 	p.setFont( f );
 

diff --git a/src/gui/Lv2ViewBase.cpp b/src/gui/Lv2ViewBase.cpp
@@ -157,8 +157,7 @@ Lv2ViewBase::Lv2ViewBase(QWidget* meAsWidget, Lv2ControlBase *ctrlBase) :
 		m_toggleUIButton->setCheckable(true);
 		m_toggleUIButton->setChecked(false);
 		m_toggleUIButton->setIcon(embed::getIconPixmap("zoom"));
-		m_toggleUIButton->setFont(
-			pointSize<8>(m_toggleUIButton->font()));
+		m_toggleUIButton->setFont(pointSize(m_toggleUIButton->font(), 8));
 		btnBox->addWidget(m_toggleUIButton, 0);
 	}
 	btnBox->addStretch(1);

diff --git a/src/gui/MidiSetupWidget.cpp b/src/gui/MidiSetupWidget.cpp
@@ -28,7 +28,6 @@
 #include <QLineEdit>
 
 #include "ConfigManager.h"
-#include "gui_templates.h"
 
 
 namespace lmms::gui

diff --git a/src/gui/MixerChannelView.cpp b/src/gui/MixerChannelView.cpp
@@ -76,7 +76,7 @@ namespace lmms::gui
 
         m_renameLineEdit = new QLineEdit{mixerName, nullptr};
         m_renameLineEdit->setFixedWidth(65);
-        m_renameLineEdit->setFont(pointSizeF(font(), 7.5f));
+        m_renameLineEdit->setFont(pointSize(font(), 7.5f));
         m_renameLineEdit->setReadOnly(true);
         m_renameLineEdit->installEventFilter(this);
 

diff --git a/src/gui/SampleTrackWindow.cpp b/src/gui/SampleTrackWindow.cpp
@@ -33,7 +33,6 @@
 
 #include "EffectRackView.h"
 #include "embed.h"
-#include "gui_templates.h"
 #include "GuiApplication.h"
 #include "Knob.h"
 #include "MainWindow.h"

diff --git a/src/gui/editors/AutomationEditor.cpp b/src/gui/editors/AutomationEditor.cpp
@@ -1065,7 +1065,7 @@ void AutomationEditor::paintEvent(QPaintEvent * pe )
 	p.fillRect( 0, 0, width(), height(), bgColor );
 
 	// set font-size to 8
-	p.setFont( pointSize<8>( p.font() ) );
+	p.setFont(pointSize(p.font(), 8));
 
 	int grid_height = height() - TOP_MARGIN - SCROLLBAR_SIZE;
 
@@ -1423,7 +1423,7 @@ void AutomationEditor::paintEvent(QPaintEvent * pe )
 	{
 		QFont f = p.font();
 		f.setBold( true );
-		p.setFont( pointSize<14>( f ) );
+		p.setFont(pointSize(f, 14));
 		p.setPen( QApplication::palette().color( QPalette::Active,
 							QPalette::BrightText ) );
 		p.drawText( VALUES_WIDTH + 20, TOP_MARGIN + 40,