From ff4fa345c5119000809c8bbb1357285cfd168a1e Mon Sep 17 00:00:00 2001
From: Bernhard Sulzer <micraft.b+kde@gmail.com>
Date: Fri, 30 Apr 2021 16:14:50 +0000
Subject: [PATCH] Fix battery applet high-res scrolling

Rounding errors made scrolling behave weirdly for devices supplying very
low scroll delta values. This is fixed now. For non-high resolution devices,
scrolling is now also aligned to 5%, just like the keyboard shortcuts.

BUG: 432331
FIXED-IN: 5.22
---
 .../package/contents/ui/BrightnessItem.qml    |  2 +-
 .../contents/ui/CompactRepresentation.qml     | 24 +++++++++++++------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/applets/batterymonitor/package/contents/ui/BrightnessItem.qml b/applets/batterymonitor/package/contents/ui/BrightnessItem.qml
index 464f08f7d..5be991d8d 100644
--- a/applets/batterymonitor/package/contents/ui/BrightnessItem.qml
+++ b/applets/batterymonitor/package/contents/ui/BrightnessItem.qml
@@ -55,7 +55,7 @@ RowLayout {
             spacing: PlasmaCore.Units.smallSpacing
 
             function percentage(from, to, value) {
-                return Math.floor(100 * (value - from) / (to - from));
+                return Math.round(100 * (value - from) / (to - from));
             }
 
             PlasmaComponents3.Label {
diff --git a/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml b/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml
index 2f079ca7a..72714a281 100644
--- a/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml
+++ b/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml
@@ -28,25 +28,35 @@ MouseArea {
 
     property real itemSize: Math.min(root.height, root.width/view.count)
     readonly property bool isConstrained: plasmoid.formFactor === PlasmaCore.Types.Vertical || plasmoid.formFactor === PlasmaCore.Types.Horizontal
-    property int wheelDelta: 0
+    property real brightnessError: 0
 
 
     onClicked: plasmoid.expanded = !plasmoid.expanded
-    onEntered: wheelDelta = 0
-    onExited: wheelDelta = 0
+    
     onWheel: {
-        var delta = wheel.angleDelta.y || wheel.angleDelta.x
+        var delta = wheel.angleDelta.y
 
         var maximumBrightness = batterymonitor.maximumScreenBrightness
         // Don't allow the UI to turn off the screen
         // Please see https://git.reviewboard.kde.org/r/122505/ for more information
         var minimumBrightness = (maximumBrightness > 100 ? 1 : 0)
-        var steps = Math.max(1, Math.round(maximumBrightness / 20))
-        var deltaSteps = delta / 120;
-        batterymonitor.screenBrightness = Math.max(minimumBrightness, Math.min(maximumBrightness, batterymonitor.screenBrightness + deltaSteps * steps));
+        var stepSize = Math.max(1, maximumBrightness / 20)
+
+        if (Math.abs(delta) < 120) {
+            // Touchpad scrolling
+            brightnessError += delta * stepSize / 120
+            var change = Math.round(brightnessError);
+            var newBrightness = batterymonitor.screenBrightness + change
+            brightnessError -= change
+        } else {
+            // Discrete/wheel scrolling
+            var newBrightness = Math.round(batterymonitor.screenBrightness/stepSize + delta/120) * stepSize
+        }
+        batterymonitor.screenBrightness = Math.max(minimumBrightness, Math.min(maximumBrightness, newBrightness));
     }
 
 
+
     //Should we consider turning this into a Flow item?
     Row {
         anchors.centerIn: parent