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

🔀 Merge pull request #405 from Schneegans/fix/#404

Browse Source
This commit is contained in:
Simon Schneegans
2023-11-21 18:18:34 +01:00
committed by GitHub
parent 111d29140c 5216e460cb
commit 51f6b93641
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/changelog.md
+1
View File
@@ -12,6 +12,7 @@ SPDX-License-Identifier: CC-BY-4.0
#### Bug Fixes
- Fixed a compatibility issue with Plasma 6. Thanks to [@CoelacanthusHex](https://github.com/CoelacanthusHex) for the fix!
- Fixed an issue which caused the origin of the Incinerate and Pixel Wipe effects to be reset to the current mouse position whenever another effect was started while an effect was still running.
## [Burn My Windows 40 [backport release]](https://github.com/schneegans/Burn-My-Windows/releases/tag/v40)
src/effects/Incinerate.js
+8 -8
View File
@@ -58,8 +58,8 @@ export default class Effect {
// position may change after the begin-animation signal is called, we set the
// uStartPos uniform during the update callback.
if (settings.get_boolean('incinerate-use-pointer')) {
this._startPointerPos = global.get_pointer();
this._actor = actor;
shader._startPointerPos = global.get_pointer();
shader._actor = actor;
} else {
// Else, a random position along the window boundary is used as start position
@@ -69,7 +69,7 @@ export default class Effect {
shader.set_uniform_float(shader._uStartPos, 2, startPos);
this._startPointerPos = null;
shader._startPointerPos = null;
}
const c = Clutter.Color.from_string(settings.get_string('incinerate-color'))[1];
@@ -86,14 +86,14 @@ export default class Effect {
// uniform during the update callback as the actor position may not be set up
// properly before the begin animation callback.
shader.connect('update-animation', (shader) => {
if (this._startPointerPos) {
const [x, y] = this._startPointerPos;
const [ok, localX, localY] = this._actor.transform_stage_point(x, y);
if (shader._startPointerPos) {
const [x, y] = shader._startPointerPos;
const [ok, localX, localY] = shader._actor.transform_stage_point(x, y);
if (ok) {
let startPos = [
Math.max(0.0, Math.min(1.0, localX / this._actor.width)),
Math.max(0.0, Math.min(1.0, localY / this._actor.height))
Math.max(0.0, Math.min(1.0, localX / shader._actor.width)),
Math.max(0.0, Math.min(1.0, localY / shader._actor.height))
];
shader.set_uniform_float(shader._uStartPos, 2, startPos);
}
src/effects/PixelWipe.js
+9 -10
View File
@@ -48,25 +48,24 @@ export default class Effect {
'begin-animation', (shader, settings, forOpening, testMode, actor) => {
// Because the actor position may change after the begin-animation signal is
// called, we set the uStartPos uniform during the update callback.
this._startPointerPos = global.get_pointer();
this._actor = actor;
shader._startPointerPos = global.get_pointer();
shader._actor = actor;
// clang-format off
shader.set_uniform_float(shader._uPixelSize, 1, [settings.get_int('pixel-wipe-pixel-size')]);
// clang-format on
shader.set_uniform_float(shader._uPixelSize, 1,
[settings.get_int('pixel-wipe-pixel-size')]);
});
// We set the uStartPos uniform during the update callback as the actor position
// may not be set up properly before the begin animation callback.
shader.connect('update-animation', (shader) => {
if (this._startPointerPos) {
const [x, y] = this._startPointerPos;
const [ok, localX, localY] = this._actor.transform_stage_point(x, y);
if (shader._startPointerPos) {
const [x, y] = shader._startPointerPos;
const [ok, localX, localY] = shader._actor.transform_stage_point(x, y);
if (ok) {
let startPos = [
Math.max(0.0, Math.min(1.0, localX / this._actor.width)),
Math.max(0.0, Math.min(1.0, localY / this._actor.height))
Math.max(0.0, Math.min(1.0, localX / shader._actor.width)),
Math.max(0.0, Math.min(1.0, localY / shader._actor.height))
];
shader.set_uniform_float(shader._uStartPos, 2, startPos);
}