diff --git a/docs/changelog.md b/docs/changelog.md index 524e9c4..a96fc4c 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -6,12 +6,16 @@ #### New Features -* On GNOME, the incinerate effect now uses the current mouse pointer position as starting position of the burn effect. The old random behaviour can be enabled in the settings. +* The incinerate effect now uses the current mouse pointer position as starting position of the burn effect. The old random behaviour can be enabled in the settings. This works both on GNOME and KDE. #### Enhancements * On GNOME, effects can now execute code whenever an animation ended. This is useful for cleaning up resources. +#### Fixes + +* Fixed the effect configuration dialog of the Fire effect on KDE. + ## [Burn My Windows 18](https://github.com/schneegans/Burn-My-Windows/releases/tag/v18) **Release Date:** 2022-06-30 diff --git a/kwin/fire/config.ui b/kwin/fire/config.ui index 3fa647c..3e18eb0 100755 --- a/kwin/fire/config.ui +++ b/kwin/fire/config.ui @@ -11,36 +11,16 @@ - - + + - Line Color: + Gradient: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - 1.000000000000000 - - - 5.000000000000000 - - - - - - - 0.100000000000000 - - - 10.000000000000000 - - - @@ -57,26 +37,92 @@ - - + + + + 0.100000000000000 + + + 10.000000000000000 + + + + + - Glow Color: + Movement Speed: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - + + + + -5.000000000000000 + + + 5.000000000000000 + + + + + - Line Width: + Scale: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + true + + + + + + + true + + + + + + + true + + + + + + + true + + + + + + + true + + + + + + + + + 3D Noise + + + @@ -87,37 +133,6 @@ - - - - Scale: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - Additive Blending - - - - - - - true - - - - - - - true - - - diff --git a/kwin/incinerate/config.ui b/kwin/incinerate/config.ui index b745eb1..7ce287d 100755 --- a/kwin/incinerate/config.ui +++ b/kwin/incinerate/config.ui @@ -11,23 +11,16 @@ - - - - true + + + + Scale: - - - - - - 0.100000000000000 + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - 10.000000000000000 - - - 0.1 + + kcfg_Color @@ -47,6 +40,16 @@ + + + + 1.000000000000000 + + + 0.000000000000000 + + + @@ -57,6 +60,29 @@ + + + + Turbulence: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + 0.100000000000000 + + + 10.000000000000000 + + + 0.000000000000000 + + + @@ -70,36 +96,17 @@ - - - - Scale: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - kcfg_Color + + + + true - - + + - Turbulence: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - 1.000000000000000 - - - 0.1 + Start from Pointer Location diff --git a/kwin/incinerate/main.xml b/kwin/incinerate/main.xml index 8f8e8f0..05c6135 100755 --- a/kwin/incinerate/main.xml +++ b/kwin/incinerate/main.xml @@ -15,5 +15,8 @@ #ffb47f + + true + \ No newline at end of file diff --git a/kwin/incinerate/onAnimationBegin.js b/kwin/incinerate/onAnimationBegin.js index 18f72bc..b077f37 100644 --- a/kwin/incinerate/onAnimationBegin.js +++ b/kwin/incinerate/onAnimationBegin.js @@ -5,5 +5,12 @@ let seed = [Math.random(), Math.random()]; let startPos = seed[0] > seed[1] ? [seed[0], Math.floor(seed[1] + 0.5)] : [Math.floor(seed[0] + 0.5), seed[1]]; +if (effect.readConfig('UsePointer', true)) { + startPos = [ + (effects.cursorPos.x - window.x) / window.width, + (effects.cursorPos.y - window.y) / window.height + ]; +} + effect.setUniform(this.shader, 'uSeed', seed); effect.setUniform(this.shader, 'uStartPos', startPos); \ No newline at end of file