vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'Plasma/5.5'

icc-effect-5.14.5
Thomas Lübking 2015-12-08 21:07:35 +01:00
parent e5a27cffb1 86f2a71b9a
commit 7b8ccd760d
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
effects/eyeonscreen/package/contents/code/main.js
View File

@ -135,6 +135,10 @@ var eyeOnScreenEffect = {
}]
});
}
if (w.eyeOnScreenOpacityKeeper !== undefined) {
cancel(w.eyeOnScreenOpacityKeeper);
delete w.eyeOnScreenOpacityKeeper;
}
animate({
window: w,
duration: eyeOnScreenEffect.duration,

2
geometry.cpp
View File

@ -2665,7 +2665,7 @@ bool Client::doStartMoveResize()
if (!pointerGrab.isNull() && pointerGrab->status == XCB_GRAB_STATUS_SUCCESS) {
has_grab = true;
}
if (grabXKeyboard(frameId()))
if (!has_grab && grabXKeyboard(frameId()))
has_grab = move_resize_has_keyboard_grab = true;
if (!has_grab) { // at least one grab is necessary in order to be able to finish move/resize
m_moveResizeGrabWindow.reset();