yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

effects: Properly copy previous geometry

Browse source 
In QJSEngine, QRect is an Object, which is correct. This means that we
cannot use simple assignment operator to copy geometries, we need to use
standard ways to copy Objects, such as Object.assign() or the spread
operator, which is not available in QJSEngine yet.
This commit is contained in:
Vlad Zahorodnii 2021-02-22 10:04:28 +02:00
parent bd4d17b3a1
commit 33ba2974eb
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/effects/fullscreen/package/contents/code/fullscreen.js
View file

@ -21,7 +21,7 @@ var fullScreenEffect = {
var oldGeometry, newGeometry;
oldGeometry = window.oldGeometry;
newGeometry = window.geometry;
window.oldGeometry = newGeometry;
window.oldGeometry = Object.assign({}, newGeometry);
window.fullScreenAnimation1 = animate({
window: window,
duration: fullScreenEffect.duration,
@ -77,7 +77,7 @@ var fullScreenEffect = {
}
}
}
window.oldGeometry = window.geometry;
window.oldGeometry = Object.assign({}, window.geometry);
},
init: function () {
effect.configChanged.connect(fullScreenEffect.loadConfig);

8
src/effects/maximize/package/contents/code/maximize.js
View file

@ -23,8 +23,8 @@ var maximizeEffect = {
newGeometry = window.geometry;
if (oldGeometry.width == newGeometry.width && oldGeometry.height == newGeometry.height)
oldGeometry = window.olderGeometry;
window.olderGeometry = window.oldGeometry;
window.oldGeometry = newGeometry;
window.olderGeometry = Object.assign({}, window.oldGeometry);
window.oldGeometry = Object.assign({}, newGeometry);
window.maximizeAnimation1 = animate({
window: window,
duration: maximizeEffect.duration,
@ -80,8 +80,8 @@ var maximizeEffect = {
}
}
}
window.oldGeometry = window.geometry;
window.olderGeometry = oldGeometry;
window.oldGeometry = Object.assign({}, window.geometry);
window.olderGeometry = Object.assign({}, oldGeometry);
},
init: function () {
effect.configChanged.connect(maximizeEffect.loadConfig);