Add custom step size support for CPULoadWidget

he29-net · Sep 1, 2023 · fe134b1 · fe134b1
1 parent aa222a5
commit fe134b1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/data/themes/classic/style.css b/data/themes/classic/style.css
@@ -209,6 +209,7 @@ lmms--gui--Oscilloscope {
 lmms--gui--CPULoadWidget {
 	border: none;
 	background: url(resources:cpuload_bg.png);
+	qproperty-stepSize: 4;
 }
 
 /* scrollbar: trough */

diff --git a/data/themes/default/style.css b/data/themes/default/style.css
@@ -241,6 +241,7 @@ lmms--gui--Oscilloscope {
 lmms--gui--CPULoadWidget {
 	border: none;
 	background: url(resources:cpuload_bg.png);
+	qproperty-stepSize: 1;
 }
 
 /* scrollbar: trough */

diff --git a/include/CPULoadWidget.h b/include/CPULoadWidget.h
@@ -40,6 +40,7 @@ namespace lmms::gui
 class CPULoadWidget : public QWidget
 {
 	Q_OBJECT
+	Q_PROPERTY(int stepSize MEMBER m_stepSize)
 public:
 	CPULoadWidget( QWidget * _parent );
 	~CPULoadWidget() override = default;
@@ -64,6 +65,9 @@ protected slots:
 
 	QTimer m_updateTimer;
 
+	int m_stepSize;
+	int stepSize() const { return m_stepSize > 0 ? m_stepSize : 1; }
+
 } ;
 
 

diff --git a/src/gui/widgets/CPULoadWidget.cpp b/src/gui/widgets/CPULoadWidget.cpp
@@ -72,7 +72,9 @@ void CPULoadWidget::paintEvent( QPaintEvent *  )
 		QPainter p( &m_temp );
 		p.drawPixmap( 0, 0, m_background );
 
-		int w = m_leds.width() * m_currentLoad / 100;
+		// Normally the CPU load indicator moves smoothly, with 1 pixel resolution. However, some themes may want to
+		// draw discrete elements (like LEDs), so the stepSize property can be used to specify a larger step size.
+		int w = (m_leds.width() * m_currentLoad / (stepSize() * 100)) * stepSize();
 		if( w > 0 )
 		{
 			p.drawPixmap( 23, 3, m_leds, 0, 0, w,