diff --git a/containment/contents/ui/AppletItem.qml b/containment/contents/ui/AppletItem.qml index 821695201..996f473a2 100644 --- a/containment/contents/ui/AppletItem.qml +++ b/containment/contents/ui/AppletItem.qml @@ -369,9 +369,9 @@ Item { if (container.showZoomed && root.isVertical) return root.statesLineSize + root.thickMargin + root.iconSize + 1; else - return Math.round(latteApplet.tasksWidth); + return latteApplet.tasksWidth; } else { - return Math.round(scaledWidth); + return scaledWidth; } } @@ -391,9 +391,9 @@ Item { if (container.showZoomed && root.isHorizontal) return root.statesLineSize + root.thickMargin + root.iconSize + 1; else - return Math.round(latteApplet.tasksHeight); + return latteApplet.tasksHeight; } else { - return Math.round(scaledHeight); + return scaledHeight; } } @@ -642,9 +642,9 @@ Item { } if (container.isInternalViewSplitter) - return Math.round(wrapper.layoutWidth); + return wrapper.layoutWidth; else - return Math.round(parent.zoomScaleWidth * wrapper.layoutWidth); + return parent.zoomScaleWidth * wrapper.layoutWidth; } height:{ @@ -653,9 +653,9 @@ Item { } if (container.isInternalViewSplitter) - return Math.round(wrapper.layoutHeight); + return wrapper.layoutHeight; else - return Math.round(parent.zoomScaleHeight * wrapper.layoutHeight); + return parent.zoomScaleHeight * wrapper.layoutHeight; } //width: Math.round( container.isInternalViewSplitter ? wrapper.layoutWidth : parent.zoomScaleWidth * wrapper.layoutWidth ) @@ -893,8 +893,8 @@ Item { var bigNeighbourZoom = Math.min(1 + zoomCenter + firstComputation, root.zoomFactor); var smallNeighbourZoom = Math.max(1 + zoomCenter - firstComputation, 1); - bigNeighbourZoom = Number(bigNeighbourZoom.toFixed(4)); - smallNeighbourZoom = Number(smallNeighbourZoom.toFixed(4)); + //bigNeighbourZoom = Number(bigNeighbourZoom.toFixed(4)); + //smallNeighbourZoom = Number(smallNeighbourZoom.toFixed(4)); var leftScale; var rightScale; diff --git a/plasmoid/contents/ui/TaskDelegate.qml b/plasmoid/contents/ui/TaskDelegate.qml index b5752c25b..b1129e3f1 100644 --- a/plasmoid/contents/ui/TaskDelegate.qml +++ b/plasmoid/contents/ui/TaskDelegate.qml @@ -60,10 +60,6 @@ MouseArea{ wrapper.height; } - onWidthChanged: { - console.log("tt :: "+index+ " - "+wrapper.mScale+" - "+width); - } - acceptedButtons: Qt.LeftButton | Qt.MidButton | Qt.RightButton hoverEnabled: visible && (inAnimation !== true) && (!IsStartup) && (!root.taskInAnimation) && (!root.editMode || root.debugLocation)&&(!inBouncingAnimation) @@ -305,15 +301,15 @@ MouseArea{ if (mainItemContainer.isSeparator){ if (!root.vertical) - return Math.round(5 + root.widthMargins); + return 5 + root.widthMargins; else - return Math.round((root.iconSize + root.widthMargins) * mScale + root.statesLineSize); + return (root.iconSize + root.widthMargins) * mScale + root.statesLineSize; } if (mainItemContainer.isStartup && root.durationTime !==0 ) - return Math.round(cleanScalingWidth); + return cleanScalingWidth; else - return Math.round(showDelegateWidth); + return showDelegateWidth; } height: { @@ -322,15 +318,15 @@ MouseArea{ if (mainItemContainer.isSeparator){ if (root.vertical) - return Math.round(5 + root.heightMargins); + return 5 + root.heightMargins; else - return Math.round((root.iconSize + root.heightMargins) * mScale + root.statesLineSize); + return (root.iconSize + root.heightMargins) * mScale + root.statesLineSize; } if (mainItemContainer.isStartup && root.durationTime !==0) - return Math.round(cleanScalingHeight); + return cleanScalingHeight; else - return Math.round(showDelegateheight); + return showDelegateheight; } //size needed fom the states below icons @@ -404,7 +400,7 @@ MouseArea{ Behavior on mScale { enabled: root.globalDirectRender - NumberAnimation { duration: 0 } + NumberAnimation { duration: root.directRenderAnimationTime } } Flow{ @@ -504,8 +500,8 @@ MouseArea{ var bigNeighbourZoom = Math.min(1 + zoomCenter + firstComputation, root.zoomFactor); var smallNeighbourZoom = Math.max(1 + zoomCenter - firstComputation, minimumZoom); - bigNeighbourZoom = Number(bigNeighbourZoom.toFixed(4)); - smallNeighbourZoom = Number(smallNeighbourZoom.toFixed(4)); + //bigNeighbourZoom = Number(bigNeighbourZoom.toFixed(4)); + //smallNeighbourZoom = Number(smallNeighbourZoom.toFixed(4)); var leftScale; var rightScale;