|
|
@ -260,7 +260,7 @@ Item{
|
|
|
|
maskThickness = maskArea.width;
|
|
|
|
maskThickness = maskArea.width;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// console.log("Not updating mask...");
|
|
|
|
// console.log("Not updating mask...");
|
|
|
|
if( maskArea.x !== localX || maskArea.y !== localY
|
|
|
|
if( maskArea.x !== localX || maskArea.y !== localY
|
|
|
|
|| maskLength !== tempLength || maskThickness !== tempThickness) {
|
|
|
|
|| maskLength !== tempLength || maskThickness !== tempThickness) {
|
|
|
|
|
|
|
|
|
|
|
@ -283,8 +283,8 @@ Item{
|
|
|
|
dock.maskArea = newMaskArea;
|
|
|
|
dock.maskArea = newMaskArea;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
//console.log("update mask area:"+newMaskArea);
|
|
|
|
// console.log("update mask area:"+newMaskArea);
|
|
|
|
if(normalState && !dock.visibility.isHidden){
|
|
|
|
if((normalState && !dock.visibility.isHidden) || root.editMode){
|
|
|
|
|
|
|
|
|
|
|
|
//the shadows size must be removed from the maskArea
|
|
|
|
//the shadows size must be removed from the maskArea
|
|
|
|
//before updating the localDockGeometry
|
|
|
|
//before updating the localDockGeometry
|
|
|
@ -308,7 +308,7 @@ Item{
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
dock.setLocalDockGeometry(newMaskArea);
|
|
|
|
dock.setLocalDockGeometry(newMaskArea);
|
|
|
|
// console.log("update dock geometry:"+newMaskArea);
|
|
|
|
// console.log("update dock geometry:"+newMaskArea);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|