kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2025-08-25 17:49:25 +03:00
Code Issues Projects Releases Wiki Activity

fix #185,changes for previews broke hover behavior

Browse Source
This commit is contained in:
Michail Vourlakos
2017-02-20 00:21:23 +02:00
parent f738236b28
commit dd525c4d80
3 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
containment/contents/ui/VisibilityManager.qml
View File

@ -272,7 +272,7 @@ Item{
maskThickness = maskArea.width;
}
// console.log("Not updating mask...");
// console.log("Not updating mask...");
if( maskArea.x !== localX || maskArea.y !== localY
|| maskLength !== tempLength || maskThickness !== tempThickness) {
@ -416,7 +416,7 @@ Item{
}
function init() {
// if (!dock.visibility.blockHiding)
// if (!dock.visibility.blockHiding)
inSlidingIn = true;
if (slidingAnimationAutoHiddenOut.running) {

1
containment/contents/ui/main.qml
View File

@ -1382,6 +1382,7 @@ DragDrop.DropArea {
}
///Buffers to paint areas outside the maskArea///
///this is an approach to try to solve #132 issue///
Loader{
anchors.fill: parent
active: dock & !drawShadowsExternal && windowSystem.compositingActive

18
plasmoid/contents/ui/main.qml
View File

@ -903,14 +903,18 @@ Item {
}
function outsideContainsMouse(){
//console.log("disable restore zoom:"+disableRestoreZoom);
if (disableRestoreZoom) {
return true;
}
var tasks = icList.contentItem.children;
if(toolTipDelegate.parentIndex !== -1)
if(toolTipDelegate && toolTipDelegate.containsMouse && toolTipDelegate.parentTask) {
return true;
} else {
windowsPreviewDlg.hide(4);
}
for(var i=0; i<tasks.length; ++i){
var task = tasks[i];
@ -930,23 +934,17 @@ Item {
return;
}
//console.log("s2...");
var result = root.outsideContainsMouse();
//console.log("s2... outsideContainsMouse:"+result);
if ((!result || (toolTipDelegate.parentTask && !toolTipDelegate.parentTask.containsMouse && !toolTipDelegate.containsMouse) ) && windowSystem.compositingActive) {
windowsPreviewDlg.hide(4);
return false;
}
//console.log("s3...");
if (result)
return true;
//console.log("s4...");
//console.log("s3...");
if (!result && latteDock && latteDock.outsideContainsMouse())
return true;
//console.log("s5...");
//console.log("s4...");
return false;
}