fix #856,update hoveredindex after animations end

--this way we are trying to delay a bit the directRender
mode when the dock is hidden
pull/2/head
Michail Vourlakos 7 years ago
parent dd14fdb6d0
commit 62f847ecac

@ -564,7 +564,9 @@ Item {
enableDirectRenderTimer.start();
}
layoutsContainer.hoveredIndex = index;
if (!(root.dockIsHidden || root.inSlidingIn || root.inSlidingOut)){
layoutsContainer.hoveredIndex = index;
}
if (lockZoom || !canBeHovered) {
return;
@ -607,10 +609,13 @@ Item {
}
if( ((wrapper.zoomScale == 1 || wrapper.zoomScale === root.zoomFactor) && !root.globalDirectRender) || root.globalDirectRender) {
if (!(root.dockIsHidden || root.inSlidingIn || root.inSlidingOut)){
layoutsContainer.hoveredIndex = index;
}
if (root.isHorizontal){
var step = Math.abs(layoutsContainer.currentSpot-mouse.x);
if (step >= root.animationStep){
layoutsContainer.hoveredIndex = index;
layoutsContainer.currentSpot = mouse.x;
wrapper.calculateScales(mouse.x);
@ -619,7 +624,6 @@ Item {
else{
var step = Math.abs(layoutsContainer.currentSpot-mouse.y);
if (step >= root.animationStep){
layoutsContainer.hoveredIndex = index;
layoutsContainer.currentSpot = mouse.y;
wrapper.calculateScales(mouse.y);

@ -507,12 +507,14 @@ MouseArea{
root.startEnableDirectRenderTimer();
}
icList.hoveredIndex = index;
if ((icList.hoveredIndex !== itemIndex) && isLauncher && windowsPreviewDlg.visible) {
windowsPreviewDlg.hide(1);
}
if (!latteDock || (latteDock && !(latteDock.dockIsHidden || latteDock.inSlidingIn || latteDock.inSlidingOut))){
icList.hoveredIndex = index;
}
if(!root.latteDock)
checkListHovered.stop();
@ -578,7 +580,10 @@ MouseArea{
}
if((inAnimation == false)&&(!root.taskInAnimation)&&(!root.disableRestoreZoom) && hoverEnabled){
icList.hoveredIndex = index;
if (!latteDock || (latteDock && !(latteDock.dockIsHidden || latteDock.inSlidingIn || latteDock.inSlidingOut))){
icList.hoveredIndex = index;
}
if( ((wrapper.mScale == 1 || wrapper.mScale === root.zoomFactor) && !root.globalDirectRender) || root.globalDirectRender) {
if(root.dragSource == null){
if (icList.orientation == Qt.Horizontal){

Loading…
Cancel
Save