remove separator length based on latte setting

work/spdx
Michail Vourlakos 4 years ago
parent 1650518935
commit 34f1eff125

@ -34,8 +34,7 @@ Item{
property bool neighbourSeparator: rightSpacer ? appletItem.headAppletIsSeparator : appletItem.tailAppletIsSeparator
property int separatorSpace: neighbourSeparator && !appletItem.isSeparator && appletItem.parabolic.isEnabled
&& !appletItem.latteApplet ? ((LatteCore.Environment.separatorLength/2)+appletItem.metrics.margin.length) : subtrackedMargins
property int separatorSpace: neighbourSeparator && appletItem.parabolic.isEnabled ? LatteCore.WindowSystem.separatorLength / 2 : 0
property real nHiddenSize: {
if (isSeparator || !communicator.requires.lengthMarginsEnabled) {
@ -47,24 +46,6 @@ Item{
property bool rightSpacer: false
readonly property bool atEdgeForcingFittsLaw: !isSeparator && !parabolicEffectMarginsEnabled && atScreenEdge
readonly property int subtrackedMargins: {
if (atEdgeForcingFittsLaw && !appletItem.isAutoFillApplet) {
var inJustifyStart = (root.inFullJustify && firstChildOfStartLayout && rightSpacer);
var inJustifyEnd = (root.inFullJustify && lastChildOfEndLayout && !rightSpacer);
var singleApplet = firstChildOfMainLayout && lastChildOfMainLayout;
var inSideStart = ((root.panelAlignment === LatteCore.Types.Left || root.panelAlignment === LatteCore.Types.Top) && firstChildOfMainLayout && rightSpacer);
var inSideEnd = ((root.panelAlignment === LatteCore.Types.Right || root.panelAlignment === LatteCore.Types.Bottom) && lastChildOfMainLayout && !rightSpacer);
if (inJustifyStart || inJustifyEnd || inSideStart || inSideEnd) {
return (wrapper.edgeLengthMarginsDisabled ? appletItem.metrics.margin.length + appletItem.lengthAppletPadding : appletItem.metrics.margin.length);
}
}
return 0;
}
property real nScale: 0
Behavior on nHiddenSize {

@ -42,7 +42,7 @@ class Environment final: public QObject
Q_PROPERTY(uint plasmaDesktopVersion READ plasmaDesktopVersion NOTIFY plasmaDesktopVersionChanged)
public:
static const int SeparatorLength = 6;
static const int SeparatorLength = 5;
explicit Environment(QObject *parent = nullptr);

@ -47,7 +47,7 @@ Item{
//! && !root.inActivityChange (deprecated) in order to check if it is fixed
property int separatorSpace: neighbourSeparator && !isSeparator && taskItem.parabolic.isEnabled
&& !(taskItem.indexer.separators.length>0 && root.dragSource) ?
((LatteCore.Environment.separatorLength/2)+taskItem.metrics.margin.length) : 0
(LatteCore.Environment.separatorLength/2) : 0
property bool rightSpacer: false

Loading…
Cancel
Save