dont show previews when showing context menu

v0.6
Michail Vourlakos 8 years ago
parent e0913f8f88
commit bd7f6bf980

@ -236,7 +236,7 @@ Item {
function show(taskItem){ function show(taskItem){
//console.log("preview show called..."); //console.log("preview show called...");
if (!activeItem || (activeItem !== taskItem)) { if (!activeItem || (activeItem !== taskItem) && !taskItem.contextMenu) {
//console.log("preview show called: accepted..."); //console.log("preview show called: accepted...");
//used to initialize windows previews buffers from task to task //used to initialize windows previews buffers from task to task
@ -449,8 +449,11 @@ Item {
interval: 120; interval: 120;
onTriggered: { onTriggered: {
if (!root.containsMouse()) if (!root.containsMouse()) {
root.clearZoom(); root.clearZoom();
if (latteDock && !root.disableRestoreZoom)
latteDock.clearZoom();
}
interval = 120; interval = 120;
} }
@ -922,25 +925,28 @@ Item {
} }
function containsMouse(){ function containsMouse(){
//console.log("s1...");
if (disableRestoreZoom) { if (disableRestoreZoom) {
return; return;
} }
//console.log("s2...");
var result = root.outsideContainsMouse(); var result = root.outsideContainsMouse();
if ((!result || (!toolTipDelegate.parentTask.containsMouse && !toolTipDelegate.containsMouse) ) && windowSystem.compositingActive) { if ((!result || (toolTipDelegate.parentTask && !toolTipDelegate.parentTask.containsMouse && !toolTipDelegate.containsMouse) ) && windowSystem.compositingActive) {
windowsPreviewDlg.hide(4); windowsPreviewDlg.hide(4);
return false; return false;
} }
//console.log("s3...");
if (result) if (result)
return true; return true;
//console.log("s4...");
if (!result && latteDock && latteDock.outsideContainsMouse()) if (!result && latteDock && latteDock.outsideContainsMouse())
return true; return true;
if (latteDock) //console.log("s5...");
latteDock.clearZoom();
return false; return false;
} }

Loading…
Cancel
Save