style: columnLayout

2 files changed, 51 insertions, 16 deletions

diff --git a/bar/Network.qml b/bar/Network.qml
index 7774035..a343977 100644
--- a/bar/Network.qml
+++ b/bar/Network.qml
@@ -55,31 +55,55 @@ Item {
                 renderType: Text.CurveRendering // it's not static and is rapidly updated
             }
 
-            RowLayout {
-                spacing: Bar.resourceIconTextSpacing / 2
-                Icon {
-                    text: Icons.resource.network.download
-                    color: root.downUnit == root.usageUnit && root.down > root.significantUsage ? Colors.cyan : Colors.foreground2
+            ColumnLayout {
+                // spacing: Bar.resourceIconTextSpacing / 2
+                spacing: 0
+                Item {
+                    Layout.fillHeight: true
+                    Layout.fillWidth: true
                 }
                 IText {
                     animate: true
+                    Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
                     text: root.down + root.downUnit
                     color: root.downUnit == root.usageUnit && root.down > root.significantUsage ? Colors.cyan : Colors.foreground2
                     renderType: Text.CurveRendering // it's not static and is rapidly updated
                 }
+                Icon {
+                    Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
+                    text: Icons.resource.network.download
+                    iconSize: Style.font.size.normal
+                    color: root.downUnit == root.usageUnit && root.down > root.significantUsage ? Colors.cyan : Colors.foreground2
+                }
+                Item {
+                    Layout.fillHeight: true
+                    Layout.fillWidth: true
+                }
             }
-            RowLayout {
-                spacing: Bar.resourceIconTextSpacing / 2
+            ColumnLayout {
+                // spacing: Bar.resourceIconTextSpacing / 2
+                spacing: 0
+                Item {
+                    Layout.fillHeight: true
+                    Layout.fillWidth: true
+                }
                 Icon {
+                    Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
                     text: Icons.resource.network.upload
+                    iconSize: Style.font.size.normal
                     color: root.upUnit == root.usageUnit && root.up > root.significantUsage ? Colors.cyan : Colors.foreground2
                 }
                 IText {
                     animate: true
+                    Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
                     text: root.up + root.upUnit
                     color: root.upUnit == root.usageUnit && root.up > root.significantUsage ? Colors.cyan : Colors.foreground2
                     renderType: Text.CurveRendering // it's not static and is rapidly updated
                 }
+                Item {
+                    Layout.fillHeight: true
+                    Layout.fillWidth: true
+                }
             }
 
             Item {
diff --git a/bar/components/SimpleResource.qml b/bar/components/SimpleResource.qml
index 818327d..793e5e1 100644
--- a/bar/components/SimpleResource.qml
+++ b/bar/components/SimpleResource.qml
@@ -38,15 +38,26 @@ Item {
             Layout.fillWidth: true
         }
 
-        Icon {
-            text: !root.isAlt ? root.icon : root.altIcon
-            color: root.value < root.thresholdL1 ? Colors.foreground2 : root.value >= root.thresholdL3 ? root.thresholdColorL3 : root.value >= root.thresholdL2 ? root.thresholdColorL2 : root.thresholdColorL1
-        }
-        IText {
-            animate: true
-            renderType: Text.CurveRendering // it's not static and is rapidly updated
-            text: !root.isAlt ? root.text : root.altText
-            color: root.value < root.thresholdL1 ? Colors.foreground1 : root.value >= root.thresholdL3 ? root.thresholdColorL3 : root.value >= root.thresholdL2 ? root.thresholdColorL2 : root.thresholdColorL1
+        ColumnLayout {
+            spacing: 0
+            Item {
+                Layout.fillHeight: true
+                Layout.fillWidth: true
+            }
+            IText {
+                animate: true
+                renderType: Text.CurveRendering // it's not static and is rapidly updated
+                text: !root.isAlt ? root.text : root.altText
+                fontSize: Style.font.size.largerr
+                color: root.value < root.thresholdL1 ? Colors.foreground1 : root.value >= root.thresholdL3 ? root.thresholdColorL3 : root.value >= root.thresholdL2 ? root.thresholdColorL2 : root.thresholdColorL1
+            }
+
+            Icon {
+                Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
+                iconSize: Style.font.size.small
+                text: !root.isAlt ? root.icon : root.altIcon
+                color: root.value < root.thresholdL1 ? Colors.foreground2 : root.value >= root.thresholdL3 ? root.thresholdColorL3 : root.value >= root.thresholdL2 ? root.thresholdColorL2 : root.thresholdColorL1
+            }
         }
 
         Item {