From 3f55c23aff3eb9295c1b92deee6e7eee0dcafb74 Mon Sep 17 00:00:00 2001
From: Simon Schneegans <code@simonschneegans.de>
Date: Thu, 22 Dec 2022 21:21:39 +0100
Subject: [PATCH] :beetle: Fix KWin portal effect config UI

---
 kwin/portal/config.ui            | 214 ++++++++++++++++++++-----------
 kwin/portal/onSettingsChanged.js |   6 +-
 2 files changed, 143 insertions(+), 77 deletions(-)

diff --git a/kwin/portal/config.ui b/kwin/portal/config.ui
index f1e7281..b25ce67 100755
--- a/kwin/portal/config.ui
+++ b/kwin/portal/config.ui
@@ -1,77 +1,143 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-SPDX-FileCopyrightText: Simon Schneegans <code@simonschneegans.de>
-SPDX-License-Identifier: GPL-3.0-or-later
--->
-
 <ui version="4.0">
-    <class>BMWConfigForm</class>
-    <widget class="QWidget" name="BMWConfigForm">
-        <property name="geometry">
-            <rect>
-                <x>0</x>
-                <y>0</y>
-                <width>562</width>
-                <height>365</height>
-            </rect>
-        </property>
-        <layout class="QGridLayout" name="gridLayout">
-            <item row="0" column="0">
-                <widget class="QLabel" name="label">
-                    <property name="text">
-                        <string>Duration:</string>
-                    </property>
-                    <property name="alignment">
-                        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                    </property>
-                </widget>
-            </item>
-            <item row="1" column="0">
-                <widget class="QLabel" name="label_2">
-                    <property name="text">
-                        <string>Color:</string>
-                    </property>
-                    <property name="alignment">
-                        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                    </property>
-                    <property name="buddy">
-                        <cstring>kcfg_Color</cstring>
-                    </property>
-                </widget>
-            </item>
-            <item row="1" column="1">
-                <widget class="KColorButton" name="kcfg_Color">
-                    <property name="alphaChannelEnabled">
-                        <bool>true</bool>
-                    </property>
-                </widget>
-            </item>
-            <item row="0" column="1">
-                <widget class="QSpinBox" name="kcfg_Duration">
-                    <property name="suffix">
-                        <string> milliseconds</string>
-                    </property>
-                    <property name="minimum">
-                        <number>100</number>
-                    </property>
-                    <property name="maximum">
-                        <number>9999</number>
-                    </property>
-                    <property name="singleStep">
-                        <number>100</number>
-                    </property>
-                </widget>
-            </item>
-        </layout>
+ <class>BMWConfigForm</class>
+ <widget class="QWidget" name="BMWConfigForm">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>562</width>
+    <height>365</height>
+   </rect>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="4" column="0">
+    <widget class="QLabel" name="label_2">
+     <property name="text">
+      <string>Color:</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+     </property>
+     <property name="buddy">
+      <cstring>kcfg_Color</cstring>
+     </property>
     </widget>
-    <customwidgets>
-        <customwidget>
-            <class>KColorButton</class>
-            <extends>QPushButton</extends>
-            <header>kcolorbutton.h</header>
-        </customwidget>
-    </customwidgets>
-    <resources />
-    <connections />
-</ui>
\ No newline at end of file
+   </item>
+   <item row="0" column="0">
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>Duration:</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="label_3">
+     <property name="text">
+      <string>Rotation Speed</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1">
+    <widget class="QSpinBox" name="kcfg_Duration">
+     <property name="suffix">
+      <string> milliseconds</string>
+     </property>
+     <property name="minimum">
+      <number>1000</number>
+     </property>
+     <property name="maximum">
+      <number>5000</number>
+     </property>
+     <property name="singleStep">
+      <number>100</number>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="1">
+    <widget class="KColorButton" name="kcfg_Color">
+     <property name="alphaChannelEnabled" stdset="0">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0">
+    <widget class="QLabel" name="label_4">
+     <property name="text">
+      <string>Whirl</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0">
+    <widget class="QLabel" name="label_5">
+     <property name="text">
+      <string>Details</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="1">
+    <widget class="QDoubleSpinBox" name="kcfg_Details">
+     <property name="minimum">
+      <double>1.000000000000000</double>
+     </property>
+     <property name="maximum">
+      <double>100.000000000000000</double>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1">
+    <widget class="QDoubleSpinBox" name="kcfg_Whirl">
+     <property name="minimum">
+      <double>-2.000000000000000</double>
+     </property>
+     <property name="maximum">
+      <double>2.000000000000000</double>
+     </property>
+     <property name="singleStep">
+      <double>0.100000000000000</double>
+     </property>
+     <property name="stepType">
+      <enum>QAbstractSpinBox::AdaptiveDecimalStepType</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QDoubleSpinBox" name="kcfg_RotationSpeed">
+     <property name="minimum">
+      <double>-2.000000000000000</double>
+     </property>
+     <property name="maximum">
+      <double>2.000000000000000</double>
+     </property>
+     <property name="singleStep">
+      <double>0.100000000000000</double>
+     </property>
+     <property name="stepType">
+      <enum>QAbstractSpinBox::AdaptiveDecimalStepType</enum>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>KColorButton</class>
+   <extends>QPushButton</extends>
+   <header>kcolorbutton.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/kwin/portal/onSettingsChanged.js b/kwin/portal/onSettingsChanged.js
index bcfb6be..35c2818 100644
--- a/kwin/portal/onSettingsChanged.js
+++ b/kwin/portal/onSettingsChanged.js
@@ -7,6 +7,6 @@
 
 effect.setUniform(this.shader, 'uDuration', this.duration * 0.001);
 effect.setUniform(this.shader, 'uColor', this.readRGBConfig('Color'));
-effect.setUniform(this.shader, 'uDetails', this.readConfig('Details', 1.0));
-effect.setUniform(this.shader, 'uRotationSpeed', this.readConfig('RotationSpeed', 1.0));
-effect.setUniform(this.shader, 'uWhirl', this.readConfig('Whirl', 1.0));
\ No newline at end of file
+effect.setUniform(this.shader, 'uDetails', effect.readConfig('Details', 1.0));
+effect.setUniform(this.shader, 'uRotationSpeed', effect.readConfig('RotationSpeed', 1.0));
+effect.setUniform(this.shader, 'uWhirl', effect.readConfig('Whirl', 1.0));