more unfinished changes, process tab for dashboard

Plugins/ZShell/Internal/CMakeLists.txt

@@ -1,12 +1,12 @@
 qml_module(ZShell-internal
 	URI ZShell.Internal
+	INCLUDE_PREFIX internal
 	SOURCES
 		hyprextras.hpp hyprextras.cpp
 		hyprdevices.hpp hyprdevices.cpp
 		cachingimagemanager.hpp cachingimagemanager.cpp
 		circularindicatormanager.hpp circularindicatormanager.cpp
 		circularbuffer.hpp circularbuffer.cpp
-		sparklineitem.hpp sparklineitem.cpp
 		arcgauge.hpp arcgauge.cpp
 		wallpaperimage.hpp wallpaperimage.cpp
 		lidwatcher.hpp lidwatcher.cpp
@@ -14,6 +14,7 @@ qml_module(ZShell-internal
 		linearindicatormanager.hpp linearindicatormanager.cpp
 		strokecanvasitem.hpp strokecanvasitem.cpp
 		strokecanvasrenderer.hpp strokecanvasrenderer.cpp
+		cursor.hpp
 	LIBRARIES
 		Qt::Gui
 		Qt::Quick

Plugins/ZShell/Internal/circularbuffer.cpp

@@ -19,6 +19,8 @@ void CircularBuffer::setCapacity(int capacity) {
 	m_capacity = capacity;
 	m_data.resize(capacity);
 	m_data.fill(0.0);
+	m_smoothed.resize(capacity);
+	m_smoothed.fill(0.0);
 	m_head = 0;
 	m_count = 0;
 
@@ -30,6 +32,8 @@ void CircularBuffer::setCapacity(int capacity) {
 		m_count++;
 	}
 
+	recomputeAllSmoothed();
+
 	emit capacityChanged();
 	emit countChanged();
 	emit valuesChanged();
@@ -56,6 +60,19 @@ qreal CircularBuffer::maximum() const {
 	return maxVal;
 }
 
+int CircularBuffer::smoothingRadius() const {
+	return m_smoothingRadius;
+}
+
+void CircularBuffer::setSmoothingRadius(int radius) {
+	radius = std::max(0, radius);
+	if (m_smoothingRadius == radius) return;
+	m_smoothingRadius = radius;
+	recomputeAllSmoothed();
+	emit smoothingRadiusChanged();
+	emit valuesChanged();
+}
+
 void CircularBuffer::push(qreal value) {
 	if (m_capacity <= 0) return;
 
@@ -65,6 +82,9 @@ void CircularBuffer::push(qreal value) {
 		m_count++;
 		emit countChanged();
 	}
+
+	updateSmoothedTail();
+
 	emit valuesChanged();
 }
 
@@ -85,4 +105,44 @@ qreal CircularBuffer::at(int index) const {
 	return m_data[actualIndex];
 }
 
+qreal CircularBuffer::smoothedAt(int index) const {
+	if (index < 0 || index >= m_count) return 0.0;
+
+	const int actualIndex =
+		(m_head - m_count + index + m_capacity) % m_capacity;
+	return m_smoothed[actualIndex];
+}
+
+void CircularBuffer::writeSmoothedAt(int logicalIndex) {
+	const int actualIndex =
+		(m_head - m_count + logicalIndex + m_capacity) % m_capacity;
+
+	if (m_smoothingRadius <= 0) {
+		m_smoothed[actualIndex] = m_data[actualIndex];
+		return;
+	}
+
+	qreal sum = 0.0;
+	int sampleCount = 0;
+	for (int j = -m_smoothingRadius; j <= m_smoothingRadius; ++j) {
+		const int idx = logicalIndex + j;
+		if (idx < 0 || idx >= m_count) continue;
+		const int a = (m_head - m_count + idx + m_capacity) % m_capacity;
+		sum += m_data[a];
+		sampleCount++;
+	}
+	m_smoothed[actualIndex] = sampleCount > 0 ? sum / sampleCount : 0.0;
+}
+
+void CircularBuffer::updateSmoothedTail() {
+	const int start = std::max(0, m_count - 1 - m_smoothingRadius);
+	for (int i = start; i < m_count; ++i)
+		writeSmoothedAt(i);
+}
+
+void CircularBuffer::recomputeAllSmoothed() {
+	for (int i = 0; i < m_count; ++i)
+		writeSmoothedAt(i);
+}
+
 } // namespace ZShell::internal

Plugins/ZShell/Internal/circularbuffer.hpp

@@ -15,6 +15,9 @@ class CircularBuffer : public QObject {
 	Q_PROPERTY(int count READ count NOTIFY countChanged)
 	Q_PROPERTY(QList<qreal> values READ values NOTIFY valuesChanged)
 	Q_PROPERTY(qreal maximum READ maximum NOTIFY valuesChanged)
+	Q_PROPERTY(
+		int smoothingRadius READ smoothingRadius WRITE setSmoothingRadius NOTIFY
+			smoothingRadiusChanged)
 
 	public:
 	explicit CircularBuffer(QObject* parent = nullptr);
@@ -26,20 +29,34 @@ class CircularBuffer : public QObject {
 	[[nodiscard]] QList<qreal> values() const;
 	[[nodiscard]] qreal maximum() const;
 
+	[[nodiscard]] int smoothingRadius() const;
+	void setSmoothingRadius(int radius);
+
 	Q_INVOKABLE void push(qreal value);
 	Q_INVOKABLE void clear();
 	Q_INVOKABLE [[nodiscard]] qreal at(int index) const;
 
+	Q_INVOKABLE [[nodiscard]] qreal smoothedAt(int index) const;
+
 	signals:
 	void capacityChanged();
 	void countChanged();
 	void valuesChanged();
+	void smoothingRadiusChanged();
 
 	private:
+	void writeSmoothedAt(int logicalIndex);
+
+	void updateSmoothedTail();
+
+	void recomputeAllSmoothed();
+
 	QVector<qreal> m_data;
+	QVector<qreal> m_smoothed;
 	int m_head = 0;
 	int m_count = 0;
 	int m_capacity = 0;
+	int m_smoothingRadius = 0;
 };
 
 } // namespace ZShell::internal

Plugins/ZShell/Internal/cursor.hpp

@@ -0,0 +1,36 @@
+#pragma once
+
+#include <qcursor.h>
+#include <qguiapplication.h>
+#include <qobject.h>
+#include <qqmlintegration.h>
+
+namespace ZShell::internal {
+
+class Cursor : public QObject {
+	Q_OBJECT
+	QML_SINGLETON
+	QML_ELEMENT
+
+	public:
+	Q_INVOKABLE void setOverride(Qt::CursorShape shape) {
+		if (m_override)
+			QGuiApplication::changeOverrideCursor(QCursor(shape));
+		else {
+			QGuiApplication::setOverrideCursor(QCursor(shape));
+			m_override = true;
+		}
+	}
+
+	Q_INVOKABLE void clearOverride() {
+		if (!m_override) return;
+
+		QGuiApplication::restoreOverrideCursor();
+		m_override = false;
+	}
+
+	private:
+	bool m_override = false;
+};
+
+} // namespace ZShell::internal

Plugins/ZShell/Internal/sparklineitem.cpp

@@ -1,322 +0,0 @@
-#include "sparklineitem.hpp"
-
-#include <qmath.h>
-#include <qnumeric.h>
-#include <qpainter.h>
-#include <qpainterpath.h>
-#include <qpen.h>
-#include <qtypes.h>
-
-namespace ZShell::internal {
-
-SparklineItem::SparklineItem(QQuickItem* parent) : QQuickPaintedItem(parent) {
-	setAntialiasing(true);
-}
-
-void SparklineItem::paint(QPainter* painter) {
-	const bool has1 = m_line1 && m_line1->count() >= 2;
-	const bool has2 = m_line2 && m_line2->count() >= 2;
-	if (!has1 && !has2) return;
-
-	painter->setRenderHint(QPainter::Antialiasing, true);
-
-	// Draw line1 first (behind), then line2 (in front)
-	if (has1) drawLine(painter, m_line1, m_line1Color, m_line1FillAlpha);
-	if (has2) drawLine(painter, m_line2, m_line2Color, m_line2FillAlpha);
-}
-
-void SparklineItem::drawLine(
-	QPainter* painter,
-	CircularBuffer* buffer,
-	const QColor& color,
-	qreal fillAlpha) {
-	if (m_historyLength < 2) return;
-
-	const qreal w = width();
-	const qreal h = height();
-	const int len = buffer->count();
-	if (len < 2 || m_maxValue <= 0.0) return;
-
-	qreal stepX = 0.0;
-
-	if (m_sliding)
-		stepX = w / static_cast<qreal>(m_historyLength - 1);
-	else
-		stepX = w / static_cast<qreal>(len - 1);
-
-	qreal startX = 0.0;
-
-	if (m_sliding)
-		startX = w - (len - 1) * stepX - stepX * m_slideProgress + stepX;
-	else
-		startX = 0;
-
-	const qreal strokePad = qCeil(m_lineWidth / 2);
-	const qreal curvePad = 3.0;
-	const qreal topPad = strokePad + curvePad;
-	const qreal bottomPad = strokePad;
-	const qreal plotTop = topPad;
-	const qreal plotBottom = h - bottomPad;
-	const qreal fillBottom = h;
-	const qreal plotH = qMax<qreal>(1.0, plotBottom - plotTop);
-
-	QVector<QPointF> points;
-	points.reserve(len);
-
-	for (int i = 0; i < len; ++i) {
-		qreal value = 0.0;
-
-		if (m_smoothing > 0.0) {
-			const int radius = qRound(m_smoothing);
-			qreal sum = 0.0;
-			int count = 0;
-
-			for (int j = -radius; j <= radius; ++j) {
-				const int index = i + j;
-
-				if (index < 0 || index >= len) continue;
-
-				sum += buffer->at(index);
-				count++;
-			}
-
-			value = sum / static_cast<qreal>(count);
-		} else {
-			value = buffer->at(i);
-		}
-
-		value = qBound<qreal>(0.0, value, m_maxValue);
-
-		const qreal x = startX + i * stepX;
-		const qreal y = plotTop + (1.0 - (value / m_maxValue)) * plotH;
-
-		points.append(QPointF(x, y));
-	}
-
-	QPainterPath linePath;
-	linePath.moveTo(points[0]);
-
-	if (m_curveSmoothing && points.size() > 2) {
-		// 1.0 = standard uniform Catmull-Rom. Lower (e.g. 0.5) = tighter, less overshoot.
-		const qreal tension = 1.0;
-		const qreal k =
-			tension / 6.0; // Catmull-Rom -> Bezier factor (1/6 for uniform)
-
-		const int n = points.size();
-
-		for (int i = 0; i < n - 1; ++i) {
-			// Duplicate endpoints so the first/last segments are well-defined
-			const QPointF& p0 = points[qMax(i - 1, 0)];
-			const QPointF& p1 = points[i];
-			const QPointF& p2 = points[i + 1];
-			const QPointF& p3 = points[qMin(i + 2, n - 1)];
-
-			QPointF c1 = p1 + (p2 - p0) * k;
-			QPointF c2 = p2 - (p3 - p1) * k;
-
-			// Keep control points inside the vertical range of the segment's
-			// endpoints so we never overshoot (no dips below zero, no
-			// bulges above a peak). Remember: smaller y = higher value.
-			const qreal segMinY = qMin(p1.y(), p2.y());
-			const qreal segMaxY = qMax(p1.y(), p2.y());
-			c1.setY(qBound(segMinY, c1.y(), segMaxY));
-			c2.setY(qBound(segMinY, c2.y(), segMaxY));
-
-			linePath.cubicTo(c1, c2, p2);
-		}
-	} else {
-		// Existing horizontal-tangent (smoothstep-style) curve
-		for (int i = 0; i < points.size() - 1; ++i) {
-			const QPointF& p0 = points[i];
-			const QPointF& p1 = points[i + 1];
-
-			const qreal ctrlX = (p0.x() + p1.x()) * 0.5;
-			linePath.cubicTo(QPointF(ctrlX, p0.y()), QPointF(ctrlX, p1.y()), p1);
-		}
-	}
-
-	QPen pen(color, m_lineWidth);
-	pen.setCapStyle(Qt::RoundCap);
-	pen.setJoinStyle(Qt::RoundJoin);
-	painter->setPen(pen);
-	painter->setBrush(Qt::NoBrush);
-	painter->drawPath(linePath);
-
-	QPainterPath fillPath = linePath;
-	fillPath.lineTo(startX + (len - 1) * stepX, fillBottom);
-	fillPath.lineTo(startX, fillBottom);
-	fillPath.closeSubpath();
-
-	QColor fillColor = color;
-	fillColor.setAlphaF(static_cast<float>(fillAlpha));
-	painter->setPen(Qt::NoPen);
-	painter->setBrush(fillColor);
-	painter->drawPath(fillPath);
-}
-
-void SparklineItem::connectBuffer(CircularBuffer* buffer) {
-	if (!buffer) return;
-
-	connect(buffer, &CircularBuffer::valuesChanged, this, [this]() {
-		update();
-	});
-	connect(buffer, &QObject::destroyed, this, [this, buffer]() {
-		if (m_line1 == buffer) {
-			m_line1 = nullptr;
-			emit line1Changed();
-		}
-		if (m_line2 == buffer) {
-			m_line2 = nullptr;
-			emit line2Changed();
-		}
-		update();
-	});
-}
-
-CircularBuffer* SparklineItem::line1() const {
-	return m_line1;
-}
-
-void SparklineItem::setLine1(CircularBuffer* buffer) {
-	if (m_line1 == buffer) return;
-	if (m_line1) disconnect(m_line1, nullptr, this, nullptr);
-	m_line1 = buffer;
-	connectBuffer(buffer);
-	emit line1Changed();
-	update();
-}
-
-CircularBuffer* SparklineItem::line2() const {
-	return m_line2;
-}
-
-void SparklineItem::setLine2(CircularBuffer* buffer) {
-	if (m_line2 == buffer) return;
-	if (m_line2) disconnect(m_line2, nullptr, this, nullptr);
-	m_line2 = buffer;
-	connectBuffer(buffer);
-	emit line2Changed();
-	update();
-}
-
-QColor SparklineItem::line1Color() const {
-	return m_line1Color;
-}
-
-void SparklineItem::setLine1Color(const QColor& color) {
-	if (m_line1Color == color) return;
-	m_line1Color = color;
-	emit line1ColorChanged();
-	update();
-}
-
-QColor SparklineItem::line2Color() const {
-	return m_line2Color;
-}
-
-void SparklineItem::setLine2Color(const QColor& color) {
-	if (m_line2Color == color) return;
-	m_line2Color = color;
-	emit line2ColorChanged();
-	update();
-}
-
-qreal SparklineItem::line1FillAlpha() const {
-	return m_line1FillAlpha;
-}
-
-void SparklineItem::setLine1FillAlpha(qreal alpha) {
-	if (qFuzzyCompare(m_line1FillAlpha, alpha)) return;
-	m_line1FillAlpha = alpha;
-	emit line1FillAlphaChanged();
-	update();
-}
-
-qreal SparklineItem::line2FillAlpha() const {
-	return m_line2FillAlpha;
-}
-
-void SparklineItem::setLine2FillAlpha(qreal alpha) {
-	if (qFuzzyCompare(m_line2FillAlpha, alpha)) return;
-	m_line2FillAlpha = alpha;
-	emit line2FillAlphaChanged();
-	update();
-}
-
-qreal SparklineItem::maxValue() const {
-	return m_maxValue;
-}
-
-void SparklineItem::setMaxValue(qreal value) {
-	if (qFuzzyCompare(m_maxValue, value)) return;
-	m_maxValue = value;
-	emit maxValueChanged();
-	update();
-}
-
-qreal SparklineItem::slideProgress() const {
-	return m_slideProgress;
-}
-
-void SparklineItem::setSlideProgress(qreal progress) {
-	if (qFuzzyCompare(m_slideProgress, progress)) return;
-	m_slideProgress = progress;
-	emit slideProgressChanged();
-	update();
-}
-
-int SparklineItem::historyLength() const {
-	return m_historyLength;
-}
-
-void SparklineItem::setHistoryLength(int length) {
-	if (m_historyLength == length) return;
-	m_historyLength = length;
-	emit historyLengthChanged();
-	update();
-}
-
-qreal SparklineItem::lineWidth() const {
-	return m_lineWidth;
-}
-
-void SparklineItem::setLineWidth(qreal width) {
-	if (qFuzzyCompare(m_lineWidth, width)) return;
-	m_lineWidth = width;
-	emit lineWidthChanged();
-	update();
-}
-
-void SparklineItem::setSliding(bool sliding) {
-	if (m_sliding == sliding) return;
-	m_sliding = sliding;
-	emit slidingChanged();
-}
-
-bool SparklineItem::sliding() const {
-	return m_sliding;
-};
-
-void SparklineItem::setSmoothing(qreal smoothing) {
-	smoothing = qMax<qreal>(0.0, smoothing);
-
-	if (qFuzzyCompare(m_smoothing, smoothing)) return;
-	m_smoothing = smoothing;
-	emit smoothingChanged();
-}
-
-qreal SparklineItem::smoothing() const {
-	return m_smoothing;
-};
-
-void SparklineItem::setCurveSmoothing(bool sliding) {
-	if (m_curveSmoothing == sliding) return;
-	m_curveSmoothing = sliding;
-	emit curveSmoothingChanged();
-}
-
-bool SparklineItem::curveSmoothing() const {
-	return m_curveSmoothing;
-};
-
-} // namespace ZShell::internal

Plugins/ZShell/Internal/sparklineitem.hpp

@@ -1,134 +0,0 @@
-#pragma once
-
-#include <qcolor.h>
-#include <qobject.h>
-#include <qqmlintegration.h>
-#include <qquickpainteditem.h>
-#include <qtmetamacros.h>
-
-#include "circularbuffer.hpp"
-
-namespace ZShell::internal {
-
-class SparklineItem : public QQuickPaintedItem {
-	Q_OBJECT
-	QML_ELEMENT
-
-	Q_PROPERTY(
-		CircularBuffer* line1 READ line1 WRITE setLine1 NOTIFY line1Changed)
-	Q_PROPERTY(
-		CircularBuffer* line2 READ line2 WRITE setLine2 NOTIFY line2Changed)
-	Q_PROPERTY(
-		QColor line1Color READ line1Color WRITE setLine1Color NOTIFY
-			line1ColorChanged)
-	Q_PROPERTY(
-		QColor line2Color READ line2Color WRITE setLine2Color NOTIFY
-			line2ColorChanged)
-	Q_PROPERTY(
-		qreal line1FillAlpha READ line1FillAlpha WRITE setLine1FillAlpha NOTIFY
-			line1FillAlphaChanged)
-	Q_PROPERTY(
-		qreal line2FillAlpha READ line2FillAlpha WRITE setLine2FillAlpha NOTIFY
-			line2FillAlphaChanged)
-	Q_PROPERTY(
-		qreal maxValue READ maxValue WRITE setMaxValue NOTIFY maxValueChanged)
-	Q_PROPERTY(
-		qreal slideProgress READ slideProgress WRITE setSlideProgress NOTIFY
-			slideProgressChanged)
-	Q_PROPERTY(
-		int historyLength READ historyLength WRITE setHistoryLength NOTIFY
-			historyLengthChanged)
-	Q_PROPERTY(
-		qreal lineWidth READ lineWidth WRITE setLineWidth NOTIFY
-			lineWidthChanged)
-	Q_PROPERTY(bool sliding READ sliding WRITE setSliding NOTIFY slidingChanged)
-	Q_PROPERTY(
-		qreal smoothing READ smoothing WRITE setSmoothing NOTIFY
-			smoothingChanged)
-	Q_PROPERTY(
-		bool curveSmoothing READ curveSmoothing WRITE setCurveSmoothing NOTIFY
-			curveSmoothingChanged)
-
-	public:
-	explicit SparklineItem(QQuickItem* parent = nullptr);
-
-	void paint(QPainter* painter) override;
-
-	[[nodiscard]] CircularBuffer* line1() const;
-	void setLine1(CircularBuffer* buffer);
-
-	[[nodiscard]] CircularBuffer* line2() const;
-	void setLine2(CircularBuffer* buffer);
-
-	[[nodiscard]] QColor line1Color() const;
-	void setLine1Color(const QColor& color);
-
-	[[nodiscard]] QColor line2Color() const;
-	void setLine2Color(const QColor& color);
-
-	[[nodiscard]] qreal line1FillAlpha() const;
-	void setLine1FillAlpha(qreal alpha);
-
-	[[nodiscard]] qreal line2FillAlpha() const;
-	void setLine2FillAlpha(qreal alpha);
-
-	[[nodiscard]] qreal maxValue() const;
-	void setMaxValue(qreal value);
-
-	[[nodiscard]] qreal slideProgress() const;
-	void setSlideProgress(qreal progress);
-
-	[[nodiscard]] int historyLength() const;
-	void setHistoryLength(int length);
-
-	[[nodiscard]] qreal lineWidth() const;
-	void setLineWidth(qreal width);
-
-	[[nodiscard]] bool sliding() const;
-	void setSliding(bool sliding);
-
-	[[nodiscard]] qreal smoothing() const;
-	void setSmoothing(qreal smoothing);
-
-	[[nodiscard]] bool curveSmoothing() const;
-	void setCurveSmoothing(bool curveSmoothing);
-
-	signals:
-	void line1Changed();
-	void line2Changed();
-	void line1ColorChanged();
-	void line2ColorChanged();
-	void line1FillAlphaChanged();
-	void line2FillAlphaChanged();
-	void maxValueChanged();
-	void slideProgressChanged();
-	void historyLengthChanged();
-	void lineWidthChanged();
-	void slidingChanged();
-	void smoothingChanged();
-	void curveSmoothingChanged();
-
-	private:
-	void drawLine(
-		QPainter* painter,
-		CircularBuffer* buffer,
-		const QColor& color,
-		qreal fillAlpha);
-	void connectBuffer(CircularBuffer* buffer);
-
-	CircularBuffer* m_line1 = nullptr;
-	CircularBuffer* m_line2 = nullptr;
-	QColor m_line1Color;
-	QColor m_line2Color;
-	qreal m_line1FillAlpha = 0.15;
-	qreal m_line2FillAlpha = 0.2;
-	qreal m_maxValue = 1024.0;
-	qreal m_slideProgress = 0.0;
-	int m_historyLength = 30;
-	qreal m_lineWidth = 2.0;
-	bool m_sliding = true;
-	qreal m_smoothing = 0.0;
-	bool m_curveSmoothing = false;
-};
-
-} // namespace ZShell::internal