fix(text): no show value is swap is empty

orblazer · May 31, 2021 · ae63d16 · ae63d16
1 parent 3a7e73e
commit ae63d16
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/package/contents/ui/components/GraphItem.qml b/package/contents/ui/components/GraphItem.qml
@@ -225,7 +225,7 @@ Item {
             case 'always':
             case 'hover-hints':
                 firstLineValueLabel.visible = true
-                secondLineValueLabel.visible = secondLineInfoText != ''
+                secondLineValueLabel.visible = secondLineInfoText != '' && secondLineValueLabel.enabled
                 break
         }
     }
@@ -238,7 +238,7 @@ Item {
             switch (displayment) {
                 case 'hover':
                     firstLineValueLabel.visible = true
-                    secondLineValueLabel.visible = secondLineInfoText != ''
+                    secondLineValueLabel.visible = secondLineInfoText != '' && secondLineValueLabel.enabled
                     break
                 case 'hover-hints':
                     firstLineInfoLabel.visible = true
@@ -263,7 +263,7 @@ Item {
 
                     if(secondLineInfoText != '') {
                         secondLineInfoLabel.visible = false
-                        secondLineValueLabel.visible = true
+                        secondLineValueLabel.visible = secondLineValueLabel.enabled
                     }
                     break
             }

diff --git a/package/contents/ui/main.qml b/package/contents/ui/main.qml
@@ -36,6 +36,7 @@ Item {
 
     // Settings properties
     property bool verticalLayout: plasmoid.configuration.verticalLayout
+
     property bool showCpuMonitor: plasmoid.configuration.showCpuMonitor
     property bool showClock: plasmoid.configuration.showClock
     property bool showRamMonitor: plasmoid.configuration.showRamMonitor
@@ -82,7 +83,7 @@ Item {
     }
 
     onFontPixelSizeChanged: {
-        for(var monitor of [cpuMonitor, ramMonitor, netMonitor]) {
+        for (var monitor of [cpuMonitor, ramMonitor, netMonitor]) {
             monitor.firstLineInfoLabel.font.pixelSize = fontPixelSize
             monitor.firstLineValueLabel.font.pixelSize = fontPixelSize
             monitor.secondLineInfoLabel.font.pixelSize = fontPixelSize
@@ -224,11 +225,14 @@ Item {
             Functions.addGraphData(ramGraphModel, totalRamProportion, graphGranularity)
             Functions.addGraphData(swapGraphModel, totalSwapProportion, graphGranularity)
 
-            ramMonitor.firstLineValueLabel.text = showMemoryInPercent ? Math.round(totalRamProportion * 100) + '%' : Functions.getHumanReadableMemory(dataSource.ramUsedBytes)
+            ramMonitor.firstLineValueLabel.text = showMemoryInPercent ? Math.round(totalRamProportion * 100) + '%'
+                : Functions.getHumanReadableMemory(dataSource.ramUsedBytes)
             ramMonitor.firstLineValueLabel.color = totalRamProportion > 0.9 ? warningColor : theme.textColor
-            ramMonitor.secondLineValueLabel.text = showMemoryInPercent ? Math.round(totalSwapProportion * 100) + '%' : Functions.getHumanReadableMemory(dataSource.swapUsedBytes)
+            ramMonitor.secondLineValueLabel.text = showMemoryInPercent ? Math.round(totalSwapProportion * 100) + '%'
+                : Functions.getHumanReadableMemory(dataSource.swapUsedBytes)
             ramMonitor.secondLineValueLabel.color = totalSwapProportion > 0.9 ? warningColor : theme.textColor
-            ramMonitor.secondLineValueLabel.visible = !ramMonitor.secondLineInfoLabel.visible && totalSwapProportion > 0
+            ramMonitor.secondLineValueLabel.visible = ramMonitor.secondLineValueLabel.enabled =
+                !ramMonitor.secondLineInfoLabel.visible && totalSwapProportion > 0
         }
 
         if (showNetMonitor) {