BlueGit

timfa kwin-marble

Mix colour dropdown (incl. random, per window for minimize/restore) and fixed marble size (MarbleSize px)

timfa Tim Falken · pushed by timfa

Authored 2026-11-02 · 2 weeks ago

Hash
ea1b1bd129194573a2e524e1ba0d1566d81baa0f
Parent
4282d6cb
11 files changed +66 −8
README.md +2 −0
@@ -41,6 +41,8 @@ it does not show up.
41 41 | `Gravity` | 4500 px/s² | Fall acceleration; fall time = sqrt(2·distance / g) (close: 1.5 screen heights; minimize: distance to taskbar entry) |
42 42 | `BlackMixOuter` | 80 % | Black mix on the outer/lower part of the marble (dull "black glass") |
43 43 | `BlackMixCenter` | 5 % | Black mix on the upper-middle part, where the window shows through; soft gradient between both zones |
44 | `MixColor` | 0 (Zwart) | Colour the mix blends towards: 0 Zwart #000000, 1 Blauw #0000aa, 2 Rood #aa0000, 3 Groen #00aa00, 4 Paars #6600aa, 5 Geel #aaaa00, 6 Oranje #aa5500, 7 Cyaan #00aaaa, 8 Roze #aa0066, 9 Grijs #555555, 10 Wit #ffffff, 11 Bruin #553300, 12 Willekeurig (random per animation; minimize and the following restore of the same window reuse the same colour) |
45 | `MarbleSize` | 56 px | Final marble diameter, independent of the window size (capped at 90 % of the window's smallest side) |
44 46
45 47 All durations are scaled by Plasma's global animation speed.
46 48
@@ -41,6 +41,8 @@ it does not show up.
41| `Gravity` | 4500 px/s² | Fall acceleration; fall time = sqrt(2·distance / g) (close: 1.5 screen heights; minimize: distance to taskbar entry) |
41| `Gravity` | 4500 px/s² | Fall acceleration; fall time = sqrt(2·distance / g) (close: 1.5 screen heights; minimize: distance to taskbar entry) |
42| `BlackMixOuter` | 80 % | Black mix on the outer/lower part of the marble (dull "black glass") |
42| `BlackMixOuter` | 80 % | Black mix on the outer/lower part of the marble (dull "black glass") |
43| `BlackMixCenter` | 5 % | Black mix on the upper-middle part, where the window shows through; soft gradient between both zones |
43| `BlackMixCenter` | 5 % | Black mix on the upper-middle part, where the window shows through; soft gradient between both zones |
44| `MixColor` | 0 (Zwart) | Colour the mix blends towards: 0 Zwart #000000, 1 Blauw #0000aa, 2 Rood #aa0000, 3 Groen #00aa00, 4 Paars #6600aa, 5 Geel #aaaa00, 6 Oranje #aa5500, 7 Cyaan #00aaaa, 8 Roze #aa0066, 9 Grijs #555555, 10 Wit #ffffff, 11 Bruin #553300, 12 Willekeurig (random per animation; minimize and the following restore of the same window reuse the same colour) |
45| `MarbleSize` | 56 px | Final marble diameter, independent of the window size (capped at 90 % of the window's smallest side) |
44
46
45All durations are scaled by Plasma's global animation speed.
47All durations are scaled by Plasma's global animation speed.
46
48
kwin6_effect_marble/contents/code/main.js +18 −0
@@ -87,11 +87,27 @@ class BurnMyWindowsMarbleEffect {
87 87 // free fall from rest: d = 0.5 g t^2 -> t = sqrt(2d/g); scaled by the global speed factor
88 88 this.fallDuration = animationTime(Math.round(1000 * Math.sqrt(2 * this.fallDistance / this.gravity)));
89 89 effect.setUniform(this.shader, 'uDuration', (this.duration + this.pause + this.fallDuration) * 0.001);
90 this.tintMode = Math.max(0, Math.min(12, Number(effect.readConfig('MixColor', 0)) | 0));
91 this.applyTint(null, false);
92 effect.setUniform(this.shader, 'uMarbleSize', Math.max(4, Number(effect.readConfig('MarbleSize', 56))));
90 93 effect.setUniform(this.shader, 'uMixOuter', Math.min(100, Math.max(0, Number(effect.readConfig('BlackMixOuter', 80)))) / 100);
91 94 effect.setUniform(this.shader, 'uMixCenter', Math.min(100, Math.max(0, Number(effect.readConfig('BlackMixCenter', 5)))) / 100);
92 95 effect.setUniform(this.shader, 'uCrumpleEnd', this.duration / Math.max(1, this.duration + this.pause + this.fallDuration));
93 96 }
94 97
98 // Mix target colour. tintMode 12 = random; with reuse, a random colour picked for this
99 // window (e.g. at minimize) is used again (e.g. at unminimize) and then forgotten.
100 applyTint(window, reuse) {
101 const C = [[0.0000,0.0000,0.0000],[0.0000,0.0000,0.6667],[0.6667,0.0000,0.0000],[0.0000,0.6667,0.0000],[0.4000,0.0000,0.6667],[0.6667,0.6667,0.0000],[0.6667,0.3333,0.0000],[0.0000,0.6667,0.6667],[0.6667,0.0000,0.4000],[0.3333,0.3333,0.3333],[1.0000,1.0000,1.0000],[0.3333,0.2000,0.0000]];
102 let c;
103 if (this.tintMode < C.length) c = C[this.tintMode];
104 else if (window && reuse && window.bmwTint) { c = window.bmwTint; window.bmwTint = null; }
105 else { c = C[Math.floor(Math.random() * C.length)]; if (window) window.bmwTint = c; }
106 effect.setUniform(this.shader, 'uTintR', c[0]);
107 effect.setUniform(this.shader, 'uTintG', c[1]);
108 effect.setUniform(this.shader, 'uTintB', c[2]);
109 }
110
95 111 static shouldAnimateWindow(window) {
96 112
97 113 // We don't want to animate most of plasmashell's windows, yet, some
@@ -169,6 +185,7 @@ class BurnMyWindowsMarbleEffect {
169 185 }
170 186 this.setupForcedRoles(window);
171 187
188 this.applyTint(window, false);
172 189 effect.setUniform(this.shader, 'uForOpening', 1.0);
173 190 effect.setUniform(this.shader, 'uIsFullscreen', window.fullScreen ? 1.0 : 0.0);
174 191
@@ -207,6 +224,7 @@ class BurnMyWindowsMarbleEffect {
207 224 }
208 225 this.setupForcedRoles(window);
209 226
227 this.applyTint(window, false);
210 228 effect.setUniform(this.shader, 'uForOpening', 0.0);
211 229 effect.setUniform(this.shader, 'uIsFullscreen', window.fullScreen ? 1.0 : 0.0);
212 230
@@ -87,11 +87,27 @@ class BurnMyWindowsMarbleEffect {
87 // free fall from rest: d = 0.5 g t^2 -> t = sqrt(2d/g); scaled by the global speed factor
87 // free fall from rest: d = 0.5 g t^2 -> t = sqrt(2d/g); scaled by the global speed factor
88 this.fallDuration = animationTime(Math.round(1000 * Math.sqrt(2 * this.fallDistance / this.gravity)));
88 this.fallDuration = animationTime(Math.round(1000 * Math.sqrt(2 * this.fallDistance / this.gravity)));
89 effect.setUniform(this.shader, 'uDuration', (this.duration + this.pause + this.fallDuration) * 0.001);
89 effect.setUniform(this.shader, 'uDuration', (this.duration + this.pause + this.fallDuration) * 0.001);
90 this.tintMode = Math.max(0, Math.min(12, Number(effect.readConfig('MixColor', 0)) | 0));
91 this.applyTint(null, false);
92 effect.setUniform(this.shader, 'uMarbleSize', Math.max(4, Number(effect.readConfig('MarbleSize', 56))));
90 effect.setUniform(this.shader, 'uMixOuter', Math.min(100, Math.max(0, Number(effect.readConfig('BlackMixOuter', 80)))) / 100);
93 effect.setUniform(this.shader, 'uMixOuter', Math.min(100, Math.max(0, Number(effect.readConfig('BlackMixOuter', 80)))) / 100);
91 effect.setUniform(this.shader, 'uMixCenter', Math.min(100, Math.max(0, Number(effect.readConfig('BlackMixCenter', 5)))) / 100);
94 effect.setUniform(this.shader, 'uMixCenter', Math.min(100, Math.max(0, Number(effect.readConfig('BlackMixCenter', 5)))) / 100);
92 effect.setUniform(this.shader, 'uCrumpleEnd', this.duration / Math.max(1, this.duration + this.pause + this.fallDuration));
95 effect.setUniform(this.shader, 'uCrumpleEnd', this.duration / Math.max(1, this.duration + this.pause + this.fallDuration));
93 }
96 }
94
97
98 // Mix target colour. tintMode 12 = random; with reuse, a random colour picked for this
99 // window (e.g. at minimize) is used again (e.g. at unminimize) and then forgotten.
100 applyTint(window, reuse) {
101 const C = [[0.0000,0.0000,0.0000],[0.0000,0.0000,0.6667],[0.6667,0.0000,0.0000],[0.0000,0.6667,0.0000],[0.4000,0.0000,0.6667],[0.6667,0.6667,0.0000],[0.6667,0.3333,0.0000],[0.0000,0.6667,0.6667],[0.6667,0.0000,0.4000],[0.3333,0.3333,0.3333],[1.0000,1.0000,1.0000],[0.3333,0.2000,0.0000]];
102 let c;
103 if (this.tintMode < C.length) c = C[this.tintMode];
104 else if (window && reuse && window.bmwTint) { c = window.bmwTint; window.bmwTint = null; }
105 else { c = C[Math.floor(Math.random() * C.length)]; if (window) window.bmwTint = c; }
106 effect.setUniform(this.shader, 'uTintR', c[0]);
107 effect.setUniform(this.shader, 'uTintG', c[1]);
108 effect.setUniform(this.shader, 'uTintB', c[2]);
109 }
110
95 static shouldAnimateWindow(window) {
111 static shouldAnimateWindow(window) {
96
112
97 // We don't want to animate most of plasmashell's windows, yet, some
113 // We don't want to animate most of plasmashell's windows, yet, some
@@ -169,6 +185,7 @@ class BurnMyWindowsMarbleEffect {
169 }
185 }
170 this.setupForcedRoles(window);
186 this.setupForcedRoles(window);
171
187
188 this.applyTint(window, false);
172 effect.setUniform(this.shader, 'uForOpening', 1.0);
189 effect.setUniform(this.shader, 'uForOpening', 1.0);
173 effect.setUniform(this.shader, 'uIsFullscreen', window.fullScreen ? 1.0 : 0.0);
190 effect.setUniform(this.shader, 'uIsFullscreen', window.fullScreen ? 1.0 : 0.0);
174
191
@@ -207,6 +224,7 @@ class BurnMyWindowsMarbleEffect {
207 }
224 }
208 this.setupForcedRoles(window);
225 this.setupForcedRoles(window);
209
226
227 this.applyTint(window, false);
210 effect.setUniform(this.shader, 'uForOpening', 0.0);
228 effect.setUniform(this.shader, 'uForOpening', 0.0);
211 effect.setUniform(this.shader, 'uIsFullscreen', window.fullScreen ? 1.0 : 0.0);
229 effect.setUniform(this.shader, 'uIsFullscreen', window.fullScreen ? 1.0 : 0.0);
212
230
kwin6_effect_marble/contents/config/main.xml +2 −0
@@ -7,5 +7,7 @@
7 7 <entry name="Gravity" type="UInt"><default>4500</default></entry>
8 8 <entry name="BlackMixOuter" type="UInt"><default>80</default></entry>
9 9 <entry name="BlackMixCenter" type="UInt"><default>5</default></entry>
10 <entry name="MixColor" type="Int"><default>0</default></entry>
11 <entry name="MarbleSize" type="UInt"><default>56</default></entry>
10 12 </group>
11 13 </kcfg>
@@ -7,5 +7,7 @@
7 <entry name="Gravity" type="UInt"><default>4500</default></entry>
7 <entry name="Gravity" type="UInt"><default>4500</default></entry>
8 <entry name="BlackMixOuter" type="UInt"><default>80</default></entry>
8 <entry name="BlackMixOuter" type="UInt"><default>80</default></entry>
9 <entry name="BlackMixCenter" type="UInt"><default>5</default></entry>
9 <entry name="BlackMixCenter" type="UInt"><default>5</default></entry>
10 <entry name="MixColor" type="Int"><default>0</default></entry>
11 <entry name="MarbleSize" type="UInt"><default>56</default></entry>
10 </group>
12 </group>
11</kcfg>
13</kcfg>
kwin6_effect_marble/contents/shaders/marble.frag +4 −2
@@ -746,6 +746,8 @@ vec4 remap(vec4 value, vec4 oldMin, vec4 oldMax, vec4 newMin, vec4 newMax) {
746 746 // The fall happens in main.js (Translation, constant gravity) after the marble is done.
747 747 uniform float uCrumpleEnd;
748 748 uniform float uMixOuter; // 0..1 black mix, outer/bottom zone
749 uniform float uTintR; uniform float uTintG; uniform float uTintB; // mix target colour
750 uniform float uMarbleSize; // marble diameter in px
749 751 uniform float uMixCenter; // 0..1 black mix, centre/top zone
750 752
751 753 void main() {
@@ -755,7 +757,7 @@ void main() {
755 757
756 758 vec2 hs = 0.5 * uSize;
757 759 vec2 p = iTexCoord * uSize - hs;
758 float R0 = 0.035 * min(uSize.x, uSize.y);
760 float R0 = min(0.5 * uMarbleSize, 0.45 * min(uSize.x, uSize.y)); // fixed px diameter, capped for tiny windows
759 761 vec2 b = mix(hs, vec2(R0), e); // half size of the morphing shape
760 762 float rad = mix(0.0, R0, e * e); // corner radius grows to a full circle
761 763 vec2 dq = max(abs(p) - (b - rad), 0.0);
@@ -782,7 +784,7 @@ void main() {
782 784 // outer/bottom (red zone) strongly; soft elliptic gradient around a point above centre
783 785 vec2 bz = (q - vec2(0.05, -0.22)) * vec2(1.0, 1.45);
784 786 float outer = smoothstep(0.2, 0.85, length(bz));
785 col.rgb *= 1.0 - e * mix(uMixCenter, uMixOuter, outer);
787 col.rgb = mix(col.rgb, vec3(uTintR, uTintG, uTintB), e * mix(uMixCenter, uMixOuter, outer));
786 788 // bent rounded-square shine top-left (superellipse in a rotated, curved frame), sharp edge
787 789 vec2 sv = q - vec2(-0.40, -0.47);
788 790 vec2 sr = vec2(0.766 * sv.x - 0.643 * sv.y, 0.643 * sv.x + 0.766 * sv.y); // rotate -40deg
@@ -746,6 +746,8 @@ vec4 remap(vec4 value, vec4 oldMin, vec4 oldMax, vec4 newMin, vec4 newMax) {
746// The fall happens in main.js (Translation, constant gravity) after the marble is done.
746// The fall happens in main.js (Translation, constant gravity) after the marble is done.
747uniform float uCrumpleEnd;
747uniform float uCrumpleEnd;
748uniform float uMixOuter; // 0..1 black mix, outer/bottom zone
748uniform float uMixOuter; // 0..1 black mix, outer/bottom zone
749uniform float uTintR; uniform float uTintG; uniform float uTintB; // mix target colour
750uniform float uMarbleSize; // marble diameter in px
749uniform float uMixCenter; // 0..1 black mix, centre/top zone
751uniform float uMixCenter; // 0..1 black mix, centre/top zone
750
752
751void main() {
753void main() {
@@ -755,7 +757,7 @@ void main() {
755
757
756 vec2 hs = 0.5 * uSize;
758 vec2 hs = 0.5 * uSize;
757 vec2 p = iTexCoord * uSize - hs;
759 vec2 p = iTexCoord * uSize - hs;
758 float R0 = 0.035 * min(uSize.x, uSize.y);
760 float R0 = min(0.5 * uMarbleSize, 0.45 * min(uSize.x, uSize.y)); // fixed px diameter, capped for tiny windows
759 vec2 b = mix(hs, vec2(R0), e); // half size of the morphing shape
761 vec2 b = mix(hs, vec2(R0), e); // half size of the morphing shape
760 float rad = mix(0.0, R0, e * e); // corner radius grows to a full circle
762 float rad = mix(0.0, R0, e * e); // corner radius grows to a full circle
761 vec2 dq = max(abs(p) - (b - rad), 0.0);
763 vec2 dq = max(abs(p) - (b - rad), 0.0);
@@ -782,7 +784,7 @@ void main() {
782 // outer/bottom (red zone) strongly; soft elliptic gradient around a point above centre
784 // outer/bottom (red zone) strongly; soft elliptic gradient around a point above centre
783 vec2 bz = (q - vec2(0.05, -0.22)) * vec2(1.0, 1.45);
785 vec2 bz = (q - vec2(0.05, -0.22)) * vec2(1.0, 1.45);
784 float outer = smoothstep(0.2, 0.85, length(bz));
786 float outer = smoothstep(0.2, 0.85, length(bz));
785 col.rgb *= 1.0 - e * mix(uMixCenter, uMixOuter, outer);
787 col.rgb = mix(col.rgb, vec3(uTintR, uTintG, uTintB), e * mix(uMixCenter, uMixOuter, outer));
786 // bent rounded-square shine top-left (superellipse in a rotated, curved frame), sharp edge
788 // bent rounded-square shine top-left (superellipse in a rotated, curved frame), sharp edge
787 vec2 sv = q - vec2(-0.40, -0.47);
789 vec2 sv = q - vec2(-0.40, -0.47);
788 vec2 sr = vec2(0.766 * sv.x - 0.643 * sv.y, 0.643 * sv.x + 0.766 * sv.y); // rotate -40deg
790 vec2 sr = vec2(0.766 * sv.x - 0.643 * sv.y, 0.643 * sv.x + 0.766 * sv.y); // rotate -40deg
kwin6_effect_marble/contents/shaders/marble_core.frag +4 −2
@@ -747,6 +747,8 @@ vec4 remap(vec4 value, vec4 oldMin, vec4 oldMax, vec4 newMin, vec4 newMax) {
747 747 // The fall happens in main.js (Translation, constant gravity) after the marble is done.
748 748 uniform float uCrumpleEnd;
749 749 uniform float uMixOuter; // 0..1 black mix, outer/bottom zone
750 uniform float uTintR; uniform float uTintG; uniform float uTintB; // mix target colour
751 uniform float uMarbleSize; // marble diameter in px
750 752 uniform float uMixCenter; // 0..1 black mix, centre/top zone
751 753
752 754 void main() {
@@ -756,7 +758,7 @@ void main() {
756 758
757 759 vec2 hs = 0.5 * uSize;
758 760 vec2 p = iTexCoord * uSize - hs;
759 float R0 = 0.035 * min(uSize.x, uSize.y);
761 float R0 = min(0.5 * uMarbleSize, 0.45 * min(uSize.x, uSize.y)); // fixed px diameter, capped for tiny windows
760 762 vec2 b = mix(hs, vec2(R0), e); // half size of the morphing shape
761 763 float rad = mix(0.0, R0, e * e); // corner radius grows to a full circle
762 764 vec2 dq = max(abs(p) - (b - rad), 0.0);
@@ -783,7 +785,7 @@ void main() {
783 785 // outer/bottom (red zone) strongly; soft elliptic gradient around a point above centre
784 786 vec2 bz = (q - vec2(0.05, -0.22)) * vec2(1.0, 1.45);
785 787 float outer = smoothstep(0.2, 0.85, length(bz));
786 col.rgb *= 1.0 - e * mix(uMixCenter, uMixOuter, outer);
788 col.rgb = mix(col.rgb, vec3(uTintR, uTintG, uTintB), e * mix(uMixCenter, uMixOuter, outer));
787 789 // bent rounded-square shine top-left (superellipse in a rotated, curved frame), sharp edge
788 790 vec2 sv = q - vec2(-0.40, -0.47);
789 791 vec2 sr = vec2(0.766 * sv.x - 0.643 * sv.y, 0.643 * sv.x + 0.766 * sv.y); // rotate -40deg
@@ -747,6 +747,8 @@ vec4 remap(vec4 value, vec4 oldMin, vec4 oldMax, vec4 newMin, vec4 newMax) {
747// The fall happens in main.js (Translation, constant gravity) after the marble is done.
747// The fall happens in main.js (Translation, constant gravity) after the marble is done.
748uniform float uCrumpleEnd;
748uniform float uCrumpleEnd;
749uniform float uMixOuter; // 0..1 black mix, outer/bottom zone
749uniform float uMixOuter; // 0..1 black mix, outer/bottom zone
750uniform float uTintR; uniform float uTintG; uniform float uTintB; // mix target colour
751uniform float uMarbleSize; // marble diameter in px
750uniform float uMixCenter; // 0..1 black mix, centre/top zone
752uniform float uMixCenter; // 0..1 black mix, centre/top zone
751
753
752void main() {
754void main() {
@@ -756,7 +758,7 @@ void main() {
756
758
757 vec2 hs = 0.5 * uSize;
759 vec2 hs = 0.5 * uSize;
758 vec2 p = iTexCoord * uSize - hs;
760 vec2 p = iTexCoord * uSize - hs;
759 float R0 = 0.035 * min(uSize.x, uSize.y);
761 float R0 = min(0.5 * uMarbleSize, 0.45 * min(uSize.x, uSize.y)); // fixed px diameter, capped for tiny windows
760 vec2 b = mix(hs, vec2(R0), e); // half size of the morphing shape
762 vec2 b = mix(hs, vec2(R0), e); // half size of the morphing shape
761 float rad = mix(0.0, R0, e * e); // corner radius grows to a full circle
763 float rad = mix(0.0, R0, e * e); // corner radius grows to a full circle
762 vec2 dq = max(abs(p) - (b - rad), 0.0);
764 vec2 dq = max(abs(p) - (b - rad), 0.0);
@@ -783,7 +785,7 @@ void main() {
783 // outer/bottom (red zone) strongly; soft elliptic gradient around a point above centre
785 // outer/bottom (red zone) strongly; soft elliptic gradient around a point above centre
784 vec2 bz = (q - vec2(0.05, -0.22)) * vec2(1.0, 1.45);
786 vec2 bz = (q - vec2(0.05, -0.22)) * vec2(1.0, 1.45);
785 float outer = smoothstep(0.2, 0.85, length(bz));
787 float outer = smoothstep(0.2, 0.85, length(bz));
786 col.rgb *= 1.0 - e * mix(uMixCenter, uMixOuter, outer);
788 col.rgb = mix(col.rgb, vec3(uTintR, uTintG, uTintB), e * mix(uMixCenter, uMixOuter, outer));
787 // bent rounded-square shine top-left (superellipse in a rotated, curved frame), sharp edge
789 // bent rounded-square shine top-left (superellipse in a rotated, curved frame), sharp edge
788 vec2 sv = q - vec2(-0.40, -0.47);
790 vec2 sv = q - vec2(-0.40, -0.47);
789 vec2 sr = vec2(0.766 * sv.x - 0.643 * sv.y, 0.643 * sv.x + 0.766 * sv.y); // rotate -40deg
791 vec2 sr = vec2(0.766 * sv.x - 0.643 * sv.y, 0.643 * sv.x + 0.766 * sv.y); // rotate -40deg
kwin6_effect_marble/contents/ui/config.ui +4 −0
@@ -13,6 +13,10 @@
13 13 <item row="3" column="1"><widget class="QSpinBox" name="kcfg_BlackMixOuter"><property name="maximum"><number>100</number></property></widget></item>
14 14 <item row="4" column="0"><widget class="QLabel" name="l5"><property name="text"><string>Black mix center (%)</string></property></widget></item>
15 15 <item row="4" column="1"><widget class="QSpinBox" name="kcfg_BlackMixCenter"><property name="maximum"><number>100</number></property></widget></item>
16 <item row="5" column="0"><widget class="QLabel" name="l6"><property name="text"><string>Mix colour</string></property></widget></item>
17 <item row="5" column="1"><widget class="QComboBox" name="kcfg_MixColor"><item><property name="text"><string>Zwart (#000000)</string></property></item><item><property name="text"><string>Blauw (#0000aa)</string></property></item><item><property name="text"><string>Rood (#aa0000)</string></property></item><item><property name="text"><string>Groen (#00aa00)</string></property></item><item><property name="text"><string>Paars (#6600aa)</string></property></item><item><property name="text"><string>Geel (#aaaa00)</string></property></item><item><property name="text"><string>Oranje (#aa5500)</string></property></item><item><property name="text"><string>Cyaan (#00aaaa)</string></property></item><item><property name="text"><string>Roze (#aa0066)</string></property></item><item><property name="text"><string>Grijs (#555555)</string></property></item><item><property name="text"><string>Wit (#ffffff)</string></property></item><item><property name="text"><string>Bruin (#553300)</string></property></item><item><property name="text"><string>Willekeurig</string></property></item></widget></item>
18 <item row="6" column="0"><widget class="QLabel" name="l7"><property name="text"><string>Marble size (px)</string></property></widget></item>
19 <item row="6" column="1"><widget class="QSpinBox" name="kcfg_MarbleSize"><property name="minimum"><number>4</number></property><property name="maximum"><number>1000</number></property></widget></item>
16 20 </layout>
17 21 </widget>
18 22 </ui>
@@ -13,6 +13,10 @@
13 <item row="3" column="1"><widget class="QSpinBox" name="kcfg_BlackMixOuter"><property name="maximum"><number>100</number></property></widget></item>
13 <item row="3" column="1"><widget class="QSpinBox" name="kcfg_BlackMixOuter"><property name="maximum"><number>100</number></property></widget></item>
14 <item row="4" column="0"><widget class="QLabel" name="l5"><property name="text"><string>Black mix center (%)</string></property></widget></item>
14 <item row="4" column="0"><widget class="QLabel" name="l5"><property name="text"><string>Black mix center (%)</string></property></widget></item>
15 <item row="4" column="1"><widget class="QSpinBox" name="kcfg_BlackMixCenter"><property name="maximum"><number>100</number></property></widget></item>
15 <item row="4" column="1"><widget class="QSpinBox" name="kcfg_BlackMixCenter"><property name="maximum"><number>100</number></property></widget></item>
16 <item row="5" column="0"><widget class="QLabel" name="l6"><property name="text"><string>Mix colour</string></property></widget></item>
17 <item row="5" column="1"><widget class="QComboBox" name="kcfg_MixColor"><item><property name="text"><string>Zwart (#000000)</string></property></item><item><property name="text"><string>Blauw (#0000aa)</string></property></item><item><property name="text"><string>Rood (#aa0000)</string></property></item><item><property name="text"><string>Groen (#00aa00)</string></property></item><item><property name="text"><string>Paars (#6600aa)</string></property></item><item><property name="text"><string>Geel (#aaaa00)</string></property></item><item><property name="text"><string>Oranje (#aa5500)</string></property></item><item><property name="text"><string>Cyaan (#00aaaa)</string></property></item><item><property name="text"><string>Roze (#aa0066)</string></property></item><item><property name="text"><string>Grijs (#555555)</string></property></item><item><property name="text"><string>Wit (#ffffff)</string></property></item><item><property name="text"><string>Bruin (#553300)</string></property></item><item><property name="text"><string>Willekeurig</string></property></item></widget></item>
18 <item row="6" column="0"><widget class="QLabel" name="l7"><property name="text"><string>Marble size (px)</string></property></widget></item>
19 <item row="6" column="1"><widget class="QSpinBox" name="kcfg_MarbleSize"><property name="minimum"><number>4</number></property><property name="maximum"><number>1000</number></property></widget></item>
16 </layout>
20 </layout>
17 </widget>
21 </widget>
18</ui>
22</ui>
kwin6_effect_marble_minimize/contents/code/main.js +18 −0
@@ -93,11 +93,27 @@ class BurnMyWindowsMarbleMinimizeEffect {
93 93 // free fall from rest: d = 0.5 g t^2 -> t = sqrt(2d/g); scaled by the global speed factor
94 94 this.fallDuration = animationTime(Math.round(1000 * Math.sqrt(2 * this.fallDistance / this.gravity)));
95 95 effect.setUniform(this.shader, 'uDuration', (this.duration + this.pause + this.fallDuration) * 0.001);
96 this.tintMode = Math.max(0, Math.min(12, Number(effect.readConfig('MixColor', 0)) | 0));
97 this.applyTint(null, false);
98 effect.setUniform(this.shader, 'uMarbleSize', Math.max(4, Number(effect.readConfig('MarbleSize', 56))));
96 99 effect.setUniform(this.shader, 'uMixOuter', Math.min(100, Math.max(0, Number(effect.readConfig('BlackMixOuter', 80)))) / 100);
97 100 effect.setUniform(this.shader, 'uMixCenter', Math.min(100, Math.max(0, Number(effect.readConfig('BlackMixCenter', 5)))) / 100);
98 101 effect.setUniform(this.shader, 'uCrumpleEnd', this.duration / Math.max(1, this.duration + this.pause + this.fallDuration));
99 102 }
100 103
104 // Mix target colour. tintMode 12 = random; with reuse, a random colour picked for this
105 // window (e.g. at minimize) is used again (e.g. at unminimize) and then forgotten.
106 applyTint(window, reuse) {
107 const C = [[0.0000,0.0000,0.0000],[0.0000,0.0000,0.6667],[0.6667,0.0000,0.0000],[0.0000,0.6667,0.0000],[0.4000,0.0000,0.6667],[0.6667,0.6667,0.0000],[0.6667,0.3333,0.0000],[0.0000,0.6667,0.6667],[0.6667,0.0000,0.4000],[0.3333,0.3333,0.3333],[1.0000,1.0000,1.0000],[0.3333,0.2000,0.0000]];
108 let c;
109 if (this.tintMode < C.length) c = C[this.tintMode];
110 else if (window && reuse && window.bmwTint) { c = window.bmwTint; window.bmwTint = null; }
111 else { c = C[Math.floor(Math.random() * C.length)]; if (window) window.bmwTint = c; }
112 effect.setUniform(this.shader, 'uTintR', c[0]);
113 effect.setUniform(this.shader, 'uTintG', c[1]);
114 effect.setUniform(this.shader, 'uTintB', c[2]);
115 }
116
101 117 static shouldAnimateWindow(window) {
102 118
103 119 // We don't want to animate most of plasmashell's windows, yet, some
@@ -245,6 +261,7 @@ class BurnMyWindowsMarbleMinimizeEffect {
245 261 if (!ir || ir.width == 0 || ir.height == 0) return; // no taskbar entry
246 262 this.stopAll(window);
247 263 const f = this.fallPlan(window, ir);
264 this.applyTint(window, false);
248 265 const morph = this.duration + this.pause;
249 266 const total = morph + f.T;
250 267 effect.setUniform(this.shader, "uForOpening", 0.0);
@@ -271,6 +288,7 @@ class BurnMyWindowsMarbleMinimizeEffect {
271 288 if (!ir || ir.width == 0 || ir.height == 0) return;
272 289 // reverse: rise from the icon (same curves reversed), rest, unfold
273 290 const f = this.fallPlan(window, ir);
291 this.applyTint(window, true);
274 292 const total = this.duration + this.pause + f.T;
275 293 effect.setUniform(this.shader, "uForOpening", 0.0);
276 294 effect.setUniform(this.shader, "uIsFullscreen", window.fullScreen ? 1.0 : 0.0);
@@ -93,11 +93,27 @@ class BurnMyWindowsMarbleMinimizeEffect {
93 // free fall from rest: d = 0.5 g t^2 -> t = sqrt(2d/g); scaled by the global speed factor
93 // free fall from rest: d = 0.5 g t^2 -> t = sqrt(2d/g); scaled by the global speed factor
94 this.fallDuration = animationTime(Math.round(1000 * Math.sqrt(2 * this.fallDistance / this.gravity)));
94 this.fallDuration = animationTime(Math.round(1000 * Math.sqrt(2 * this.fallDistance / this.gravity)));
95 effect.setUniform(this.shader, 'uDuration', (this.duration + this.pause + this.fallDuration) * 0.001);
95 effect.setUniform(this.shader, 'uDuration', (this.duration + this.pause + this.fallDuration) * 0.001);
96 this.tintMode = Math.max(0, Math.min(12, Number(effect.readConfig('MixColor', 0)) | 0));
97 this.applyTint(null, false);
98 effect.setUniform(this.shader, 'uMarbleSize', Math.max(4, Number(effect.readConfig('MarbleSize', 56))));
96 effect.setUniform(this.shader, 'uMixOuter', Math.min(100, Math.max(0, Number(effect.readConfig('BlackMixOuter', 80)))) / 100);
99 effect.setUniform(this.shader, 'uMixOuter', Math.min(100, Math.max(0, Number(effect.readConfig('BlackMixOuter', 80)))) / 100);
97 effect.setUniform(this.shader, 'uMixCenter', Math.min(100, Math.max(0, Number(effect.readConfig('BlackMixCenter', 5)))) / 100);
100 effect.setUniform(this.shader, 'uMixCenter', Math.min(100, Math.max(0, Number(effect.readConfig('BlackMixCenter', 5)))) / 100);
98 effect.setUniform(this.shader, 'uCrumpleEnd', this.duration / Math.max(1, this.duration + this.pause + this.fallDuration));
101 effect.setUniform(this.shader, 'uCrumpleEnd', this.duration / Math.max(1, this.duration + this.pause + this.fallDuration));
99 }
102 }
100
103
104 // Mix target colour. tintMode 12 = random; with reuse, a random colour picked for this
105 // window (e.g. at minimize) is used again (e.g. at unminimize) and then forgotten.
106 applyTint(window, reuse) {
107 const C = [[0.0000,0.0000,0.0000],[0.0000,0.0000,0.6667],[0.6667,0.0000,0.0000],[0.0000,0.6667,0.0000],[0.4000,0.0000,0.6667],[0.6667,0.6667,0.0000],[0.6667,0.3333,0.0000],[0.0000,0.6667,0.6667],[0.6667,0.0000,0.4000],[0.3333,0.3333,0.3333],[1.0000,1.0000,1.0000],[0.3333,0.2000,0.0000]];
108 let c;
109 if (this.tintMode < C.length) c = C[this.tintMode];
110 else if (window && reuse && window.bmwTint) { c = window.bmwTint; window.bmwTint = null; }
111 else { c = C[Math.floor(Math.random() * C.length)]; if (window) window.bmwTint = c; }
112 effect.setUniform(this.shader, 'uTintR', c[0]);
113 effect.setUniform(this.shader, 'uTintG', c[1]);
114 effect.setUniform(this.shader, 'uTintB', c[2]);
115 }
116
101 static shouldAnimateWindow(window) {
117 static shouldAnimateWindow(window) {
102
118
103 // We don't want to animate most of plasmashell's windows, yet, some
119 // We don't want to animate most of plasmashell's windows, yet, some
@@ -245,6 +261,7 @@ class BurnMyWindowsMarbleMinimizeEffect {
245 if (!ir || ir.width == 0 || ir.height == 0) return; // no taskbar entry
261 if (!ir || ir.width == 0 || ir.height == 0) return; // no taskbar entry
246 this.stopAll(window);
262 this.stopAll(window);
247 const f = this.fallPlan(window, ir);
263 const f = this.fallPlan(window, ir);
264 this.applyTint(window, false);
248 const morph = this.duration + this.pause;
265 const morph = this.duration + this.pause;
249 const total = morph + f.T;
266 const total = morph + f.T;
250 effect.setUniform(this.shader, "uForOpening", 0.0);
267 effect.setUniform(this.shader, "uForOpening", 0.0);
@@ -271,6 +288,7 @@ class BurnMyWindowsMarbleMinimizeEffect {
271 if (!ir || ir.width == 0 || ir.height == 0) return;
288 if (!ir || ir.width == 0 || ir.height == 0) return;
272 // reverse: rise from the icon (same curves reversed), rest, unfold
289 // reverse: rise from the icon (same curves reversed), rest, unfold
273 const f = this.fallPlan(window, ir);
290 const f = this.fallPlan(window, ir);
291 this.applyTint(window, true);
274 const total = this.duration + this.pause + f.T;
292 const total = this.duration + this.pause + f.T;
275 effect.setUniform(this.shader, "uForOpening", 0.0);
293 effect.setUniform(this.shader, "uForOpening", 0.0);
276 effect.setUniform(this.shader, "uIsFullscreen", window.fullScreen ? 1.0 : 0.0);
294 effect.setUniform(this.shader, "uIsFullscreen", window.fullScreen ? 1.0 : 0.0);
kwin6_effect_marble_minimize/contents/config/main.xml +2 −0
@@ -7,5 +7,7 @@
7 7 <entry name="Gravity" type="UInt"><default>4500</default></entry>
8 8 <entry name="BlackMixOuter" type="UInt"><default>80</default></entry>
9 9 <entry name="BlackMixCenter" type="UInt"><default>5</default></entry>
10 <entry name="MixColor" type="Int"><default>0</default></entry>
11 <entry name="MarbleSize" type="UInt"><default>56</default></entry>
10 12 </group>
11 13 </kcfg>
@@ -7,5 +7,7 @@
7 <entry name="Gravity" type="UInt"><default>4500</default></entry>
7 <entry name="Gravity" type="UInt"><default>4500</default></entry>
8 <entry name="BlackMixOuter" type="UInt"><default>80</default></entry>
8 <entry name="BlackMixOuter" type="UInt"><default>80</default></entry>
9 <entry name="BlackMixCenter" type="UInt"><default>5</default></entry>
9 <entry name="BlackMixCenter" type="UInt"><default>5</default></entry>
10 <entry name="MixColor" type="Int"><default>0</default></entry>
11 <entry name="MarbleSize" type="UInt"><default>56</default></entry>
10 </group>
12 </group>
11</kcfg>
13</kcfg>
kwin6_effect_marble_minimize/contents/shaders/marble.frag +4 −2
@@ -746,6 +746,8 @@ vec4 remap(vec4 value, vec4 oldMin, vec4 oldMax, vec4 newMin, vec4 newMax) {
746 746 // The fall happens in main.js (Translation, constant gravity) after the marble is done.
747 747 uniform float uCrumpleEnd;
748 748 uniform float uMixOuter; // 0..1 black mix, outer/bottom zone
749 uniform float uTintR; uniform float uTintG; uniform float uTintB; // mix target colour
750 uniform float uMarbleSize; // marble diameter in px
749 751 uniform float uMixCenter; // 0..1 black mix, centre/top zone
750 752
751 753 void main() {
@@ -755,7 +757,7 @@ void main() {
755 757
756 758 vec2 hs = 0.5 * uSize;
757 759 vec2 p = iTexCoord * uSize - hs;
758 float R0 = 0.035 * min(uSize.x, uSize.y);
760 float R0 = min(0.5 * uMarbleSize, 0.45 * min(uSize.x, uSize.y)); // fixed px diameter, capped for tiny windows
759 761 vec2 b = mix(hs, vec2(R0), e); // half size of the morphing shape
760 762 float rad = mix(0.0, R0, e * e); // corner radius grows to a full circle
761 763 vec2 dq = max(abs(p) - (b - rad), 0.0);
@@ -782,7 +784,7 @@ void main() {
782 784 // outer/bottom (red zone) strongly; soft elliptic gradient around a point above centre
783 785 vec2 bz = (q - vec2(0.05, -0.22)) * vec2(1.0, 1.45);
784 786 float outer = smoothstep(0.2, 0.85, length(bz));
785 col.rgb *= 1.0 - e * mix(uMixCenter, uMixOuter, outer);
787 col.rgb = mix(col.rgb, vec3(uTintR, uTintG, uTintB), e * mix(uMixCenter, uMixOuter, outer));
786 788 // bent rounded-square shine top-left (superellipse in a rotated, curved frame), sharp edge
787 789 vec2 sv = q - vec2(-0.40, -0.47);
788 790 vec2 sr = vec2(0.766 * sv.x - 0.643 * sv.y, 0.643 * sv.x + 0.766 * sv.y); // rotate -40deg
@@ -746,6 +746,8 @@ vec4 remap(vec4 value, vec4 oldMin, vec4 oldMax, vec4 newMin, vec4 newMax) {
746// The fall happens in main.js (Translation, constant gravity) after the marble is done.
746// The fall happens in main.js (Translation, constant gravity) after the marble is done.
747uniform float uCrumpleEnd;
747uniform float uCrumpleEnd;
748uniform float uMixOuter; // 0..1 black mix, outer/bottom zone
748uniform float uMixOuter; // 0..1 black mix, outer/bottom zone
749uniform float uTintR; uniform float uTintG; uniform float uTintB; // mix target colour
750uniform float uMarbleSize; // marble diameter in px
749uniform float uMixCenter; // 0..1 black mix, centre/top zone
751uniform float uMixCenter; // 0..1 black mix, centre/top zone
750
752
751void main() {
753void main() {
@@ -755,7 +757,7 @@ void main() {
755
757
756 vec2 hs = 0.5 * uSize;
758 vec2 hs = 0.5 * uSize;
757 vec2 p = iTexCoord * uSize - hs;
759 vec2 p = iTexCoord * uSize - hs;
758 float R0 = 0.035 * min(uSize.x, uSize.y);
760 float R0 = min(0.5 * uMarbleSize, 0.45 * min(uSize.x, uSize.y)); // fixed px diameter, capped for tiny windows
759 vec2 b = mix(hs, vec2(R0), e); // half size of the morphing shape
761 vec2 b = mix(hs, vec2(R0), e); // half size of the morphing shape
760 float rad = mix(0.0, R0, e * e); // corner radius grows to a full circle
762 float rad = mix(0.0, R0, e * e); // corner radius grows to a full circle
761 vec2 dq = max(abs(p) - (b - rad), 0.0);
763 vec2 dq = max(abs(p) - (b - rad), 0.0);
@@ -782,7 +784,7 @@ void main() {
782 // outer/bottom (red zone) strongly; soft elliptic gradient around a point above centre
784 // outer/bottom (red zone) strongly; soft elliptic gradient around a point above centre
783 vec2 bz = (q - vec2(0.05, -0.22)) * vec2(1.0, 1.45);
785 vec2 bz = (q - vec2(0.05, -0.22)) * vec2(1.0, 1.45);
784 float outer = smoothstep(0.2, 0.85, length(bz));
786 float outer = smoothstep(0.2, 0.85, length(bz));
785 col.rgb *= 1.0 - e * mix(uMixCenter, uMixOuter, outer);
787 col.rgb = mix(col.rgb, vec3(uTintR, uTintG, uTintB), e * mix(uMixCenter, uMixOuter, outer));
786 // bent rounded-square shine top-left (superellipse in a rotated, curved frame), sharp edge
788 // bent rounded-square shine top-left (superellipse in a rotated, curved frame), sharp edge
787 vec2 sv = q - vec2(-0.40, -0.47);
789 vec2 sv = q - vec2(-0.40, -0.47);
788 vec2 sr = vec2(0.766 * sv.x - 0.643 * sv.y, 0.643 * sv.x + 0.766 * sv.y); // rotate -40deg
790 vec2 sr = vec2(0.766 * sv.x - 0.643 * sv.y, 0.643 * sv.x + 0.766 * sv.y); // rotate -40deg
kwin6_effect_marble_minimize/contents/shaders/marble_core.frag +4 −2
@@ -747,6 +747,8 @@ vec4 remap(vec4 value, vec4 oldMin, vec4 oldMax, vec4 newMin, vec4 newMax) {
747 747 // The fall happens in main.js (Translation, constant gravity) after the marble is done.
748 748 uniform float uCrumpleEnd;
749 749 uniform float uMixOuter; // 0..1 black mix, outer/bottom zone
750 uniform float uTintR; uniform float uTintG; uniform float uTintB; // mix target colour
751 uniform float uMarbleSize; // marble diameter in px
750 752 uniform float uMixCenter; // 0..1 black mix, centre/top zone
751 753
752 754 void main() {
@@ -756,7 +758,7 @@ void main() {
756 758
757 759 vec2 hs = 0.5 * uSize;
758 760 vec2 p = iTexCoord * uSize - hs;
759 float R0 = 0.035 * min(uSize.x, uSize.y);
761 float R0 = min(0.5 * uMarbleSize, 0.45 * min(uSize.x, uSize.y)); // fixed px diameter, capped for tiny windows
760 762 vec2 b = mix(hs, vec2(R0), e); // half size of the morphing shape
761 763 float rad = mix(0.0, R0, e * e); // corner radius grows to a full circle
762 764 vec2 dq = max(abs(p) - (b - rad), 0.0);
@@ -783,7 +785,7 @@ void main() {
783 785 // outer/bottom (red zone) strongly; soft elliptic gradient around a point above centre
784 786 vec2 bz = (q - vec2(0.05, -0.22)) * vec2(1.0, 1.45);
785 787 float outer = smoothstep(0.2, 0.85, length(bz));
786 col.rgb *= 1.0 - e * mix(uMixCenter, uMixOuter, outer);
788 col.rgb = mix(col.rgb, vec3(uTintR, uTintG, uTintB), e * mix(uMixCenter, uMixOuter, outer));
787 789 // bent rounded-square shine top-left (superellipse in a rotated, curved frame), sharp edge
788 790 vec2 sv = q - vec2(-0.40, -0.47);
789 791 vec2 sr = vec2(0.766 * sv.x - 0.643 * sv.y, 0.643 * sv.x + 0.766 * sv.y); // rotate -40deg
@@ -747,6 +747,8 @@ vec4 remap(vec4 value, vec4 oldMin, vec4 oldMax, vec4 newMin, vec4 newMax) {
747// The fall happens in main.js (Translation, constant gravity) after the marble is done.
747// The fall happens in main.js (Translation, constant gravity) after the marble is done.
748uniform float uCrumpleEnd;
748uniform float uCrumpleEnd;
749uniform float uMixOuter; // 0..1 black mix, outer/bottom zone
749uniform float uMixOuter; // 0..1 black mix, outer/bottom zone
750uniform float uTintR; uniform float uTintG; uniform float uTintB; // mix target colour
751uniform float uMarbleSize; // marble diameter in px
750uniform float uMixCenter; // 0..1 black mix, centre/top zone
752uniform float uMixCenter; // 0..1 black mix, centre/top zone
751
753
752void main() {
754void main() {
@@ -756,7 +758,7 @@ void main() {
756
758
757 vec2 hs = 0.5 * uSize;
759 vec2 hs = 0.5 * uSize;
758 vec2 p = iTexCoord * uSize - hs;
760 vec2 p = iTexCoord * uSize - hs;
759 float R0 = 0.035 * min(uSize.x, uSize.y);
761 float R0 = min(0.5 * uMarbleSize, 0.45 * min(uSize.x, uSize.y)); // fixed px diameter, capped for tiny windows
760 vec2 b = mix(hs, vec2(R0), e); // half size of the morphing shape
762 vec2 b = mix(hs, vec2(R0), e); // half size of the morphing shape
761 float rad = mix(0.0, R0, e * e); // corner radius grows to a full circle
763 float rad = mix(0.0, R0, e * e); // corner radius grows to a full circle
762 vec2 dq = max(abs(p) - (b - rad), 0.0);
764 vec2 dq = max(abs(p) - (b - rad), 0.0);
@@ -783,7 +785,7 @@ void main() {
783 // outer/bottom (red zone) strongly; soft elliptic gradient around a point above centre
785 // outer/bottom (red zone) strongly; soft elliptic gradient around a point above centre
784 vec2 bz = (q - vec2(0.05, -0.22)) * vec2(1.0, 1.45);
786 vec2 bz = (q - vec2(0.05, -0.22)) * vec2(1.0, 1.45);
785 float outer = smoothstep(0.2, 0.85, length(bz));
787 float outer = smoothstep(0.2, 0.85, length(bz));
786 col.rgb *= 1.0 - e * mix(uMixCenter, uMixOuter, outer);
788 col.rgb = mix(col.rgb, vec3(uTintR, uTintG, uTintB), e * mix(uMixCenter, uMixOuter, outer));
787 // bent rounded-square shine top-left (superellipse in a rotated, curved frame), sharp edge
789 // bent rounded-square shine top-left (superellipse in a rotated, curved frame), sharp edge
788 vec2 sv = q - vec2(-0.40, -0.47);
790 vec2 sv = q - vec2(-0.40, -0.47);
789 vec2 sr = vec2(0.766 * sv.x - 0.643 * sv.y, 0.643 * sv.x + 0.766 * sv.y); // rotate -40deg
791 vec2 sr = vec2(0.766 * sv.x - 0.643 * sv.y, 0.643 * sv.x + 0.766 * sv.y); // rotate -40deg
kwin6_effect_marble_minimize/contents/ui/config.ui +4 −0
@@ -13,6 +13,10 @@
13 13 <item row="3" column="1"><widget class="QSpinBox" name="kcfg_BlackMixOuter"><property name="maximum"><number>100</number></property></widget></item>
14 14 <item row="4" column="0"><widget class="QLabel" name="l5"><property name="text"><string>Black mix center (%)</string></property></widget></item>
15 15 <item row="4" column="1"><widget class="QSpinBox" name="kcfg_BlackMixCenter"><property name="maximum"><number>100</number></property></widget></item>
16 <item row="5" column="0"><widget class="QLabel" name="l6"><property name="text"><string>Mix colour</string></property></widget></item>
17 <item row="5" column="1"><widget class="QComboBox" name="kcfg_MixColor"><item><property name="text"><string>Zwart (#000000)</string></property></item><item><property name="text"><string>Blauw (#0000aa)</string></property></item><item><property name="text"><string>Rood (#aa0000)</string></property></item><item><property name="text"><string>Groen (#00aa00)</string></property></item><item><property name="text"><string>Paars (#6600aa)</string></property></item><item><property name="text"><string>Geel (#aaaa00)</string></property></item><item><property name="text"><string>Oranje (#aa5500)</string></property></item><item><property name="text"><string>Cyaan (#00aaaa)</string></property></item><item><property name="text"><string>Roze (#aa0066)</string></property></item><item><property name="text"><string>Grijs (#555555)</string></property></item><item><property name="text"><string>Wit (#ffffff)</string></property></item><item><property name="text"><string>Bruin (#553300)</string></property></item><item><property name="text"><string>Willekeurig</string></property></item></widget></item>
18 <item row="6" column="0"><widget class="QLabel" name="l7"><property name="text"><string>Marble size (px)</string></property></widget></item>
19 <item row="6" column="1"><widget class="QSpinBox" name="kcfg_MarbleSize"><property name="minimum"><number>4</number></property><property name="maximum"><number>1000</number></property></widget></item>
16 20 </layout>
17 21 </widget>
18 22 </ui>
@@ -13,6 +13,10 @@
13 <item row="3" column="1"><widget class="QSpinBox" name="kcfg_BlackMixOuter"><property name="maximum"><number>100</number></property></widget></item>
13 <item row="3" column="1"><widget class="QSpinBox" name="kcfg_BlackMixOuter"><property name="maximum"><number>100</number></property></widget></item>
14 <item row="4" column="0"><widget class="QLabel" name="l5"><property name="text"><string>Black mix center (%)</string></property></widget></item>
14 <item row="4" column="0"><widget class="QLabel" name="l5"><property name="text"><string>Black mix center (%)</string></property></widget></item>
15 <item row="4" column="1"><widget class="QSpinBox" name="kcfg_BlackMixCenter"><property name="maximum"><number>100</number></property></widget></item>
15 <item row="4" column="1"><widget class="QSpinBox" name="kcfg_BlackMixCenter"><property name="maximum"><number>100</number></property></widget></item>
16 <item row="5" column="0"><widget class="QLabel" name="l6"><property name="text"><string>Mix colour</string></property></widget></item>
17 <item row="5" column="1"><widget class="QComboBox" name="kcfg_MixColor"><item><property name="text"><string>Zwart (#000000)</string></property></item><item><property name="text"><string>Blauw (#0000aa)</string></property></item><item><property name="text"><string>Rood (#aa0000)</string></property></item><item><property name="text"><string>Groen (#00aa00)</string></property></item><item><property name="text"><string>Paars (#6600aa)</string></property></item><item><property name="text"><string>Geel (#aaaa00)</string></property></item><item><property name="text"><string>Oranje (#aa5500)</string></property></item><item><property name="text"><string>Cyaan (#00aaaa)</string></property></item><item><property name="text"><string>Roze (#aa0066)</string></property></item><item><property name="text"><string>Grijs (#555555)</string></property></item><item><property name="text"><string>Wit (#ffffff)</string></property></item><item><property name="text"><string>Bruin (#553300)</string></property></item><item><property name="text"><string>Willekeurig</string></property></item></widget></item>
18 <item row="6" column="0"><widget class="QLabel" name="l7"><property name="text"><string>Marble size (px)</string></property></widget></item>
19 <item row="6" column="1"><widget class="QSpinBox" name="kcfg_MarbleSize"><property name="minimum"><number>4</number></property><property name="maximum"><number>1000</number></property></widget></item>
16 </layout>
20 </layout>
17 </widget>
21 </widget>
18</ui>
22</ui>