Change the mock mode 'a' key handling to avoid global property

victronenergy · Jun 5, 2024 · ba3e0b0 · ba3e0b0
1 parent fb4ba6c
commit ba3e0b0
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git a/data/mock/config/MockDataSimulator.qml b/data/mock/config/MockDataSimulator.qml
@@ -12,6 +12,7 @@ QtObject {
 	property bool timersActive: !Global.splashScreenVisible
 	property int deviceCount
 	property bool levelsEnabled: true
+	property bool animationEnabled: true
 
 	signal setBatteryRequested(config : var)
 	signal setAcInputsRequested(config : var)
@@ -111,10 +112,8 @@ QtObject {
 			}
 			break
 		case Qt.Key_A:
-			if (!!Global) {
-				Global.animationEnabled = !Global.animationEnabled
-				event.accepted = true
-			}
+			root.animationEnabled = !root.animationEnabled
+			event.accepted = true
 			break
 		case Qt.Key_C:
 			Theme.colorScheme = Theme.colorScheme == Theme.Dark ? Theme.Light : Theme.Dark
@@ -326,4 +325,18 @@ QtObject {
 			root.keyPressed(event)
 		}
 	}
+
+	property Binding _pageAnimationsBinding: Binding {
+		when: !animationEnabled
+		target: !!Global.mainView ? Global.mainView : null
+		property: "allowPageAnimations"
+		value: false
+	}
+
+	property Binding _statusBarAnimationsBinding: Binding {
+		when: !animationEnabled
+		target: !!Global.pageManager ? Global.pageManager.statusBar : null
+		property: "animationEnabled"
+		value: false
+	}
 }
diff --git a/pages/MainView.qml b/pages/MainView.qml
@@ -23,10 +23,9 @@ Item {
 	// between pages, or when flicking between the main pages. Note that animations are still
 	// allowed when dragging between the main pages, as it looks odd if animations stop abruptly
 	// when the user drags slowly between pages.
-	readonly property bool allowPageAnimations: BackendConnection.applicationVisible
+	property bool allowPageAnimations: BackendConnection.applicationVisible
 			&& !pageStack.busy && (!swipeView || !swipeView.flicking)
 			&& !Global.splashScreenVisible
-			&& Global.animationEnabled
 
 	property int _loadedPages: 0
 
@@ -340,7 +339,7 @@ Item {
 			return customButton
 		}
 		rightButton: !!root.currentPage ? root.currentPage.topRightButton : VenusOS.StatusBar_RightButton_None
-		animationEnabled: BackendConnection.applicationVisible && (!!Global ? Global.animationEnabled : true)
+		animationEnabled: BackendConnection.applicationVisible
 		color: root.backgroundColor
 
 		onLeftButtonClicked: {