From 08f3855292667c6727f8840c49f006f534e42d3d Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Thu, 27 Jun 2019 14:52:14 +0300 Subject: [PATCH] add Communicator::lengthMarginsEnabled for applets --applets can now inform Latte if they want length margins or not --- .../package/contents/ui/applet/HiddenSpacer.qml | 2 +- .../package/contents/ui/applet/ItemWrapper.qml | 2 +- .../contents/ui/applet/communicator/Actions.qml | 12 ++++++++++++ .../contents/ui/applet/communicator/Engine.qml | 1 + 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/containment/package/contents/ui/applet/HiddenSpacer.qml b/containment/package/contents/ui/applet/HiddenSpacer.qml index cfd516046..8f44c2be2 100644 --- a/containment/package/contents/ui/applet/HiddenSpacer.qml +++ b/containment/package/contents/ui/applet/HiddenSpacer.qml @@ -35,7 +35,7 @@ Item{ property int separatorSpace: neighbourSeparator && !appletItem.isSeparator && !appletItem.latteApplet && root.zoomFactor>1 ? (2+root.lengthMargin) : 0 property real nHiddenSize: { - if (isSeparator || isSpacer) { + if (isSeparator || !communicator.lengthMarginsEnabled) { return 0; } diff --git a/containment/package/contents/ui/applet/ItemWrapper.qml b/containment/package/contents/ui/applet/ItemWrapper.qml index ba69970fc..22a20f1e4 100644 --- a/containment/package/contents/ui/applet/ItemWrapper.qml +++ b/containment/package/contents/ui/applet/ItemWrapper.qml @@ -122,7 +122,7 @@ Item{ root.thickMargins : (root.inFullJustify && atScreenEdge ? 0 : localLengthMargins) //Fitt's Law - property int localLengthMargins: isSpacer || isSeparator ? 0 : root.lengthMargins + property int localLengthMargins: isSeparator || !communicator.lengthMarginsEnabled ? 0 : root.lengthMargins property real scaledWidth: zoomScaleWidth * (layoutWidth + marginWidth) property real scaledHeight: zoomScaleHeight * (layoutHeight + marginHeight) diff --git a/containment/package/contents/ui/applet/communicator/Actions.qml b/containment/package/contents/ui/applet/communicator/Actions.qml index 2af4cd4b0..055ecf8f7 100644 --- a/containment/package/contents/ui/applet/communicator/Actions.qml +++ b/containment/package/contents/ui/applet/communicator/Actions.qml @@ -51,6 +51,14 @@ Item{ // or used for that applet. // @since: 0.9 + // NAME: lengthMarginsEnabled + // TYPE: bool + // USAGE: writable through actions.setProperty + // EXPLANATION: when is TRUE, all length margins are drawn including + // indicator padding and applets distance. For FALSE, length margins + // are not drawn at all. + // @since: 0.9 + // NAME: parabolicEffectEnabled // TYPE: bool // USAGE: writable through actions.setProperty @@ -74,6 +82,8 @@ Item{ mainCommunicator.latteIconOverlayEnabled = value; } else if (parameter === "activeIndicatorEnabled") { mainCommunicator.activeIndicatorEnabled = value; + } else if (parameter === "lengthMarginsEnabled") { + mainCommunicator.lengthMarginsEnabled = value; } else if (parameter === "parabolicEffectLocked") { mainCommunicator.parabolicEffectLocked = value; } else if (parameter === "windowsTrackingEnabled") { @@ -88,6 +98,8 @@ Item{ return mainCommunicator.latteIconOverlayEnabled; } else if (parameter === "activeIndicatorEnabled") { return mainCommunicator.activeIndicatorEnabled; + } else if (parameter === "lengthMarginsEnabled") { + return mainCommunicator.lengthMarginsEnabled; } else if (parameter === "parabolicEffectLocked") { return mainCommunicator.parabolicEffectLocked; } else if (parameter === "windowsTrackingEnabled") { diff --git a/containment/package/contents/ui/applet/communicator/Engine.qml b/containment/package/contents/ui/applet/communicator/Engine.qml index 2cdfa5d12..615698fc7 100644 --- a/containment/package/contents/ui/applet/communicator/Engine.qml +++ b/containment/package/contents/ui/applet/communicator/Engine.qml @@ -53,6 +53,7 @@ Item{ property bool latteSideColoringEnabled: true property bool latteIconOverlayEnabled: true property bool activeIndicatorEnabled: true + property bool lengthMarginsEnabled: true property bool windowsTrackingEnabled: false property bool parabolicEffectLocked: false //! END OF PUBLIC PROPERTIES SET THROUGH LATTEBRIDGE.ACTIONS