rename thicknessMargins to thicknessEdges

--which is more accurate an Edge can be the calculated
distance of margin+border+padding like css is also
describing
pull/15/head
Michail Vourlakos 5 years ago
parent c45e45138f
commit dae35a12bb

@ -176,7 +176,7 @@ Item {
property int internalWidthMargins: {
if (root.isVertical) {
return metrics.totals.thicknessMargins;
return metrics.totals.thicknessEdges;
}
/*TODO, Fitt's case: is temporary until the atScreenEdge applets are aligned properly to the corner and the wrapper
@ -188,7 +188,7 @@ Item {
property int internalHeightMargins: {
if (root.isHorizontal) {
return root.metrics.totals.thicknessMargins;
return root.metrics.totals.thicknessEdges;
}
/*TODO,Fitt's case: is temporary until the atScreenEdge applets are aligned properly to the corner and the wrapper
@ -401,8 +401,8 @@ Item {
return;
}
var maxSize = appletItem.metrics.iconSize + metrics.totals.thicknessMargins;
var maxForMinimumSize = appletItem.metrics.iconSize + metrics.totals.thicknessMargins;
var maxSize = appletItem.metrics.iconSize + metrics.totals.thicknessEdges;
var maxForMinimumSize = appletItem.metrics.iconSize + metrics.totals.thicknessEdges;
if ( isSystray
|| appletItem.needsFillSpace

@ -126,10 +126,10 @@ Item{
property int iconSize: appletItem.metrics.iconSize
property int marginWidth: root.isVertical ?
appletItem.metrics.totals.thicknessMargins :
appletItem.metrics.totals.thicknessEdges :
(root.inFullJustify && atScreenEdge && !parabolicEffectMarginsEnabled ? edgeLengthMargins : localLengthMargins) //Fitt's Law
property int marginHeight: root.isHorizontal ?
appletItem.metrics.totals.thicknessMargins :
appletItem.metrics.totals.thicknessEdges :
(root.inFullJustify && atScreenEdge && !parabolicEffectMarginsEnabled ? edgeLengthMargins : localLengthMargins) //Fitt's Law
property int localLengthMargins: isSeparator || !communicator.requires.lengthMarginsEnabled || isInternalViewSplitter ? 0 : appletItem.lengthAppletFullMargins
@ -188,10 +188,10 @@ Item{
console.log("-----");
console.log("Can be hovered: " + canBeHovered);
console.log("Icon size: " + appletItem.metrics.iconSize);
console.log("Thick Margins: " + appletItem.metrics.totals.thicknessMargins);
console.log("Thick Margins: " + appletItem.metrics.totals.thicknessEdges);
console.log("Intern. Margins: " + (appletItem.metrics.padding.length * 2));
console.log("Intern. Margins: " + (root.lengthExtMargin * 2));
console.log("Max hovered criteria: " + (appletItem.metrics.iconSize + metrics.totals.thicknessMargins));
console.log("Max hovered criteria: " + (appletItem.metrics.iconSize + metrics.totals.thicknessEdges));
console.log("-----");
console.log("LayoutW: " + layoutWidth);
console.log("LayoutH: " + layoutHeight);

@ -380,7 +380,7 @@ Item {
property int themePanelThickness: {
var panelBase = root.panelThickMarginHigh + root.panelThickMarginBase;
var margin = shrinkThickMargins ? 0 : metrics.totals.thicknessMargins + localScreenEdgeMargin;
var margin = shrinkThickMargins ? 0 : metrics.totals.thicknessEdges + localScreenEdgeMargin;
var maxPanelSize = (metrics.iconSize + margin) - panelBase;
var percentage = LatteCore.WindowSystem.compositingActive ? plasmoid.configuration.panelSize/100 : 1;
return Math.max(panelBase, panelBase + percentage*maxPanelSize);
@ -406,8 +406,8 @@ Item {
property int lengthMargin: metrics.padding.length + lengthExtMargin
property int lengthMargins: 2 * lengthMargin
property int widthMargins: root.isVertical ? metrics.totals.thicknessMargins : lengthMargins
property int heightMargins: root.isHorizontal ? metrics.totals.thicknessMargins : lengthMargins
property int widthMargins: root.isVertical ? metrics.totals.thicknessEdges : lengthMargins
property int heightMargins: root.isHorizontal ? metrics.totals.thicknessEdges : lengthMargins
///FIXME: <delete both> I can't remember why this is needed, maybe for the anchorings!!! In order for the Double Layout to not mess the anchorings...
//property int layoutsContainer.mainLayoutPosition: !plasmoid.immutable ? LatteCore.Types.Center : (root.isVertical ? LatteCore.Types.Top : LatteCore.Types.Left)
@ -1616,7 +1616,7 @@ Item {
height: root.isHorizontal ? thickness : length
readonly property int length: metrics.iconSize + root.lengthMargins
readonly property int thickness: metrics.iconSize + metrics.totals.thicknessMargins + root.localScreenEdgeMargin
readonly property int thickness: metrics.iconSize + metrics.totals.thicknessEdges + root.localScreenEdgeMargin
Layout.preferredWidth: width
Layout.preferredHeight: height

@ -20,10 +20,10 @@
import QtQuick 2.0
Item {
readonly property int length: iconSize + lengthMargins
readonly property int lengthMargin: margin.length + padding.length
readonly property int lengthMargins: 2 * lengthMargin
readonly property int length: iconSize + lengthEdges
readonly property int lengthEdge: margin.length + padding.length
readonly property int lengthEdges: 2 * lengthEdge
readonly property int lengthPaddings: 2 * padding.length
readonly property int thickness: iconSize + thicknessMargins
readonly property int thicknessMargins: 2 * margin.thickness
readonly property int thickness: iconSize + thicknessEdges
readonly property int thicknessEdges: 2 * margin.thickness
}

@ -107,11 +107,11 @@ Item {
property int tasksStarting: 0
///Don't use Math.floor it adds one pixel in animations and creates glitches
property int widthMargins: root.vertical ? metrics.totals.thicknessMargins : lengthMargins
property int heightMargins: !root.vertical ? metrics.totals.thicknessMargins : lengthMargins
property int widthMargins: root.vertical ? metrics.totals.thicknessEdges : lengthMargins
property int heightMargins: !root.vertical ? metrics.totals.thicknessEdges : lengthMargins
property int internalWidthMargins: root.vertical ? metrics.totals.thicknessMargins : metrics.totals.lengthPaddings
property int internalHeightMargins: !root.vertical ? metrics.totals.thicknessMargins : metrics.totals.lengthPaddings
property int internalWidthMargins: root.vertical ? metrics.totals.thicknessEdges : metrics.totals.lengthPaddings
property int internalHeightMargins: !root.vertical ? metrics.totals.thicknessEdges : metrics.totals.lengthPaddings
property real textColorBrightness: ColorizerTools.colorBrightness(themeTextColor)
property color minimizedDotColor: {

Loading…
Cancel
Save