Merge pull request #13 from alexankitty/enhancements

alexankitty · web-flow · commit 0ab1521e8b8d · 2022-10-29T04:03:38.000-06:00
Bug fix: Color and sizings
diff --git a/contents/ui/Task.qml b/contents/ui/Task.qml
@@ -445,7 +445,7 @@ MouseArea {
                         var parentSize = !isVertical ? frame.width : frame.height;
                         var indicatorComputedSize;
                         var adjustment = isFirst ? adjust : 0
-                        var parentSpacingAdjust = task.childCount >= 1 && maxStates >= 2 ? spacing * 3 : 0 //Spacing fix for multiple items
+                        var parentSpacingAdjust = task.childCount >= 1 && maxStates >= 2 ? (spacing * 2.5) : 0 //Spacing fix for multiple items
                         if(plasmoid.configuration.indicatorDominantColor){
                             colorEval = decoColor
                         }
@@ -492,7 +492,7 @@ MouseArea {
                             var colorHSL = hexToHSL(colorEval)
                             colorCalc = Qt.hsla(colorHSL.h, 0.2, 0.6, 1)
                         }
-                        if(!isFirst && plasmoid.configuration.indicatorStyle === 0) {//Metro specific handling
+                        else if(!isFirst && plasmoid.configuration.indicatorStyle ===  0 && task.state !== "minimized") {//Metro specific handling
                             colorCalc = Qt.darker(colorEval, 1.2) 
                         }
                         else {

Original file line number	Diff line number	Diff line change
`@@ -445,7 +445,7 @@ MouseArea {`
`445`	`445`	`var parentSize = !isVertical ? frame.width : frame.height;`
`446`	`446`	`var indicatorComputedSize;`
`447`	`447`	`var adjustment = isFirst ? adjust : 0`
`448`		`- var parentSpacingAdjust = task.childCount >= 1 && maxStates >= 2 ? spacing * 3 : 0 //Spacing fix for multiple items`
	`448`	`+ var parentSpacingAdjust = task.childCount >= 1 && maxStates >= 2 ? (spacing * 2.5) : 0 //Spacing fix for multiple items`
`449`	`449`	`if(plasmoid.configuration.indicatorDominantColor){`
`450`	`450`	`colorEval = decoColor`
`451`	`451`	`}`
`@@ -492,7 +492,7 @@ MouseArea {`
`492`	`492`	`var colorHSL = hexToHSL(colorEval)`
`493`	`493`	`colorCalc = Qt.hsla(colorHSL.h, 0.2, 0.6, 1)`
`494`	`494`	`}`
`495`		`- if(!isFirst && plasmoid.configuration.indicatorStyle === 0) {//Metro specific handling`
	`495`	`+ else if(!isFirst && plasmoid.configuration.indicatorStyle === 0 && task.state !== "minimized") {//Metro specific handling`
`496`	`496`	`colorCalc = Qt.darker(colorEval, 1.2)`
`497`	`497`	`}`
`498`	`498`	`else {`