From 3fac7c2388779ee94ed827cf66d33f4152c2d73b Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Mon, 4 Mar 2019 21:22:32 +0200 Subject: [PATCH] remove deprecated showZoomed from appletItem --- .../package/contents/ui/applet/AppletItem.qml | 12 ------------ .../package/contents/ui/applet/ItemWrapper.qml | 5 ----- .../package/contents/ui/editmode/ConfigOverlay.qml | 10 ++-------- 3 files changed, 2 insertions(+), 25 deletions(-) diff --git a/containment/package/contents/ui/applet/AppletItem.qml b/containment/package/contents/ui/applet/AppletItem.qml index a9169cb7d..8f47854fd 100644 --- a/containment/package/contents/ui/applet/AppletItem.qml +++ b/containment/package/contents/ui/applet/AppletItem.qml @@ -61,7 +61,6 @@ Item { property bool userBlocksColorizing: false property bool appletBlocksColorizing: !communicator.latteSideColoringEnabled property bool appletBlocksParabolicEffect: !communicator.parabolicEffectEnabled - property bool showZoomed: false property bool lockZoom: false property bool indicatorNeedsIconColors: false @@ -326,17 +325,6 @@ Item { onNeedsFillSpaceChanged: checkCanBeHovered(); - onShowZoomedChanged: { - if(showZoomed){ - //var newZ = appletItem.maxHeight / root.iconSize; - //wrapper.zoomScale = newZ; - wrapper.zoomScale = 1; - } - else{ - wrapper.zoomScale = 1; - } - } - Component.onCompleted: { checkIndex(); root.updateIndexes.connect(checkIndex); diff --git a/containment/package/contents/ui/applet/ItemWrapper.qml b/containment/package/contents/ui/applet/ItemWrapper.qml index 77e589198..48361e2fc 100644 --- a/containment/package/contents/ui/applet/ItemWrapper.qml +++ b/containment/package/contents/ui/applet/ItemWrapper.qml @@ -89,11 +89,6 @@ Item{ opacity: appletColorizer.mustBeShown ? 0 : 1 - //width: appletItem.isInternalViewSplitter && !root.editMode ? 0 : Math.round( latteApplet ? ((appletItem.showZoomed && root.isVertical) ? - // scaledWidth : latteApplet.tasksWidth) : scaledWidth ) - //height: appletItem.isInternalViewSplitter&& !root.editMode ? 0 : Math.round( latteApplet ? ((appletItem.showZoomed && root.isHorizontal) ? - // scaledHeight : latteApplet.tasksHeight ): scaledHeight ) - property bool disableScaleWidth: false property bool disableScaleHeight: false property bool editMode: root.editMode diff --git a/containment/package/contents/ui/editmode/ConfigOverlay.qml b/containment/package/contents/ui/editmode/ConfigOverlay.qml index 3b6503c15..e614879eb 100644 --- a/containment/package/contents/ui/editmode/ConfigOverlay.qml +++ b/containment/package/contents/ui/editmode/ConfigOverlay.qml @@ -31,8 +31,8 @@ MouseArea { z: 1000 anchors.fill: parent - enabled: false - visible: false + //enabled: false + visible: true//false // hoverEnabled: true cursorShape: { @@ -127,9 +127,6 @@ MouseArea { onExited: hideTimer.restart(); onCurrentAppletChanged: { - if(previousCurrentApplet && previousCurrentApplet.showZoomed) - previousCurrentApplet.showZoomed = false; - previousCurrentApplet = currentApplet; @@ -142,9 +139,6 @@ MouseArea { return; } - if(currentApplet.showZoomed !== undefined) - currentApplet.showZoomed = true; - var relevantLayout = mapFromItem(layoutsContainer.mainLayout, 0, 0); handle.x = relevantLayout.x + currentApplet.x;