Only have one logic for detecting whether an instrument cluster is shown

Instead of having our own detection in the AutoConfig.qml we now pass the "showClusterIfPossible" to the config and decide what's needed based on this value. Otherwise we might end up in a situation where we show an instrument cluster, but the Compositor doesn't know about it and doesn't accept the windows Change-Id: I7929f8a95f3d6462b63d856aaa51c93a87881786 Reviewed-by: Nedim Hadzic <[email protected]>
Kfanup · Oct 19, 2016 · d2f0e1f · d2f0e1f
1 parent 105c1aa
commit d2f0e1f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/imports/shared/utils/AutoConfig.qml b/imports/shared/utils/AutoConfig.qml
@@ -54,7 +54,6 @@ QtObject {
     property int symbolSizeL: 96
     property int symbolSizeXL: 114
     property int symbolSizeXXL: 192
-    property bool showClusterIfPossible: false
 
     property string displayBackground: "background_1920x1080"
 
@@ -109,8 +108,7 @@ QtObject {
 
         fontWeight = Font.Light
 
-        var canDisplayCluster = Screen.desktopAvailableWidth > Screen.width || ScreenManager.screenCount() > 1
-        if (canDisplayCluster) {
+        if (showClusterIfPossible) {
             print("Instrument Cluster enabled")
             withCluster = true
             clusterWidth = ScreenManager.availableScreens[1].size.width

diff --git a/imports/shared/utils/Style.qml b/imports/shared/utils/Style.qml
@@ -90,12 +90,11 @@ QtObject {
     property bool showClusterIfPossible: isClient ? ApplicationInterface.additionalConfiguration.showCluster :ApplicationManager.additionalConfiguration.showCluster
 
     property Loader styleLoader: Loader {
+        property bool showClusterIfPossible: root.showClusterIfPossible
         source: styleConfig === "auto" ? Qt.resolvedUrl("AutoConfig.qml") : styleConfig
 
         onLoaded: {
             print("StyleConfig loaded: ", source)
-            if (item.showClusterIfPossible)
-                item.showClusterIfPossible = root.showClusterIfPossible
         }
     }