biipadmin/Burn-My-Windows
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🔀 Merge pull request #368 from Schneegans/feature/colorful-wisps

Browse Source
This commit is contained in:
Simon Schneegans
2023-08-14 06:16:51 +02:00
committed by GitHub
parent 2d4a6635eb a6b47be34f
commit e8db78a8b0
11 changed files with 142 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kwin/wisps/config.ui
+11 -1
View File
@@ -71,7 +71,17 @@ SPDX-License-Identifier: GPL-3.0-or-later
</widget>
</item>
<item row="1" column="1">
<widget class="KColorButton" name="kcfg_Color"></widget>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="KColorButton" name="kcfg_Color1"></widget>
</item>
<item>
<widget class="KColorButton" name="kcfg_Color2"></widget>
</item>
<item>
<widget class="KColorButton" name="kcfg_Color3"></widget>
</item>
</layout>
</item>
</layout>
</widget>
kwin/wisps/main.xml
+8 -3
View File
@@ -5,8 +5,7 @@ SPDX-FileCopyrightText: Simon Schneegans <code@simonschneegans.de>
SPDX-License-Identifier: GPL-3.0-or-later
-->
<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
http://www.kde.org/standards/kcfg/1.0/kcfg.xsd">
<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 http://www.kde.org/standards/kcfg/1.0/kcfg.xsd">
<kcfgfile name="" />
<group name="">
<entry name="Duration" type="UInt">
@@ -15,8 +14,14 @@ SPDX-License-Identifier: GPL-3.0-or-later
<entry name="Scale" type="Double">
<default>1</default>
</entry>
<entry name="Color" type="Color">
<entry name="Color1" type="Color">
<default>#ff64c8</default>
</entry>
<entry name="Color2" type="Color">
<default>#6464ff</default>
</entry>
<entry name="Color3" type="Color">
<default>#64c8ff</default>
</entry>
</group>
</kcfg>
kwin/wisps/onSettingsChanged.js
+3 -1
View File
@@ -7,4 +7,6 @@
effect.setUniform(this.shader, 'uDuration', this.duration * 0.001);
effect.setUniform(this.shader, 'uScale', effect.readConfig('Scale', 1.0));
effect.setUniform(this.shader, 'uColor', this.readRGBConfig('Color'));
effect.setUniform(this.shader, 'uColor1', this.readRGBConfig('Color1'));
effect.setUniform(this.shader, 'uColor2', this.readRGBConfig('Color2'));
effect.setUniform(this.shader, 'uColor3', this.readRGBConfig('Color3'));