Show per-phase unit in overview ac widget

Small AC widgets now display total power. Fixes #1264
victronenergy · Jun 25, 2024 · 74f22d0 · 74f22d0
1 parent e1a56e0
commit 74f22d0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/components/ThreePhaseDisplay.qml b/components/ThreePhaseDisplay.qml
@@ -75,7 +75,6 @@ Flow {
 						: 0
 				dataObject: model
 				font.pixelSize: phaseLabel.font.pixelSize
-				unitVisible: root.widgetSize >= VenusOS.OverviewWidget_Size_M
 				valueColor: phaseDelegate.textColor
 				unitColor: valueColor == Theme.color_font_primary
 						   ? Theme.color_font_secondary

diff --git a/components/widgets/AcWidget.qml b/components/widgets/AcWidget.qml
@@ -29,18 +29,24 @@ OverviewWidget {
 		active: root.phaseCount > 1
 		states: [
 			State {
-				name: "small"
-				when: root.size === VenusOS.OverviewWidget_Size_XS || root.size === VenusOS.OverviewWidget_Size_S
+				name: "extrasmall"
+				when: root.size === VenusOS.OverviewWidget_Size_XS
 				PropertyChanges {
 					target: root.quantityLabel
-					visible: !!quantityLabel.dataObject && extraContentLoader.status !== Loader.Ready
+					visible: !!quantityLabel.dataObject && extraContentLoader.status !== Loader.Ready // hide the total power
 					font.pixelSize: Theme.font_overviewPage_widget_quantityLabel_minimumSize
 				}
 				PropertyChanges {
-					target: root
-					secondaryTitle: extraContentLoader.status === Loader.Ready
-									? "(%1)".arg(Units.defaultUnitString(Global.systemSettings.electricalQuantity))
-									: ""
+					target: extraContentLoader
+					anchors.bottomMargin: root.verticalMargin / 3
+				}
+			},
+			State {
+				name: "small"
+				when: root.size === VenusOS.OverviewWidget_Size_S
+				PropertyChanges {
+					target: root.quantityLabel
+					font.pixelSize: Theme.font_overviewPage_widget_quantityLabel_minimumSize
 				}
 				PropertyChanges {
 					target: extraContentLoader
@@ -58,7 +64,7 @@ OverviewWidget {
 				}
 			},
 			State {
-				name: "medium-or-larger"
+				name: "large"
 				when: root.size === VenusOS.OverviewWidget_Size_L || root.size === VenusOS.OverviewWidget_Size_XL
 				PropertyChanges {
 					target: root.quantityLabel