Fix visual issues in potrait mode

Task-number: QTAUTO-498
Change-Id: Ie54761ac490b7b99da0f13ac8769202423cc9eee
Reviewed-by: Juergen Bocklage-Ryannel <jbocklage-ryannel@luxoft.com>

7 files changed, 17 insertions, 16 deletions

diff --git a/apps/com.pelagicore.browser/Browser.qml b/apps/com.pelagicore.browser/Browser.qml
index d8a6576..258621a 100644
--- a/apps/com.pelagicore.browser/Browser.qml
+++ b/apps/com.pelagicore.browser/Browser.qml
@@ -43,7 +43,7 @@ AppUIScreen {
         WebBrowser {
             id: browser
             anchors.fill: parent
-            anchors.leftMargin: Style.vspan(4)
+            anchors.leftMargin: Style.hspan(3)
             url: "http://www.qt.io/qt-automotive-suite"
         }
 
diff --git a/apps/com.theqtcompany.i18ndemo/icon.png b/apps/com.theqtcompany.i18ndemo/icon.png
index 3ae6956..534365f 100644
--- a/apps/com.theqtcompany.i18ndemo/icon.png
+++ b/apps/com.theqtcompany.i18ndemo/icon.png
diff --git a/imports/shared/controls/SettingsItemDelegate.qml b/imports/shared/controls/SettingsItemDelegate.qml
index cd3237a..c461532 100644
--- a/imports/shared/controls/SettingsItemDelegate.qml
+++ b/imports/shared/controls/SettingsItemDelegate.qml
@@ -54,7 +54,7 @@ ItemDelegate {
         implicitHeight: Style.vspan(2)
         RowLayout {
             height: parent.height
-            spacing: 0
+            spacing: 5
 
             Symbol {
                 id: icon
diff --git a/imports/shared/utils/Style.qml b/imports/shared/utils/Style.qml
index 7d9a290..23aa4fa 100644
--- a/imports/shared/utils/Style.qml
+++ b/imports/shared/utils/Style.qml
@@ -84,14 +84,18 @@ QtObject {
     property int symbolSizeXL: 114
     property int symbolSizeXXL: 192
 
-    property int statusBarSpan: 2
-    property int climateCollapsedSpan: 3
     property int launcherSpan: 19
     property int notificationCenterSpan: 8
 
+    // Cimate config
+    property int climateCollapsedSpan: 3
+    property real climateCollapsedVspan: vspan(climateCollapsedSpan)
+
+    //StatusBar config
+    property int statusBarSpan: 2
     property real statusBarHeight: vspan(statusBarSpan)
+
     property int notificationCenterWidth: hspan(notificationCenterSpan)
-    property real climateCollapsedVspan: vspan(climateCollapsedSpan)
     property real launcherHeight: vspan(launcherSpan)
 
     property string assetPath: Qt.resolvedUrl("../../assets/")
diff --git a/sysui/display/HomePage.qml b/sysui/display/HomePage.qml
index b7fcfb9..5c1d966 100644
--- a/sysui/display/HomePage.qml
+++ b/sysui/display/HomePage.qml
@@ -45,19 +45,17 @@ UIPage {
     // Left widget side
     MapWidget {
         id: mapWidget
-        anchors.top: parent.top
-        anchors.left: parent.left
-        anchors.right: Style.isPotrait ? parent.right : parent.horizontalCenter
-        anchors.bottom: parent.bottom
+        width: Style.isPotrait ? Style.screenWidth : Style.screenWidth/2
+        height: Style.launcherHeight
     }
 
     // Right widget side upper widget
     MusicWidget {
         id: musicWidget
         width: Style.screenWidth/2
-        height: Style.isPotrait ? root.height/3 : root.height/2
+        height: Style.isPotrait ? Style.launcherHeight/3 : Style.launcherHeight/2
         x: Style.isPotrait ? 0 : width
-        y: Style.isPotrait ? (root.height - height) : 0
+        y: Style.isPotrait ? (Style.launcherHeight - height) : 0
 
         onShowFullscreen: {
             ApplicationManager.startApplication("com.pelagicore.music")
@@ -67,7 +65,7 @@ UIPage {
     // Right side lower widget
     PhoneWidget {
         width: Style.screenWidth/2
-        height: Style.isPotrait ? root.height/3 : root.height/2
+        height: Style.isPotrait ? Style.launcherHeight/3 : Style.launcherHeight/2
 
         anchors.right: parent.right
         anchors.bottom: parent.bottom
diff --git a/sysui/display/OwnersManual.qml b/sysui/display/OwnersManual.qml
index ae8ef37..0b0d592 100644
--- a/sysui/display/OwnersManual.qml
+++ b/sysui/display/OwnersManual.qml
@@ -37,16 +37,13 @@ import utils 1.0
 UIPage {
     id: root
 
-//    width: Style.hspan(24)
-//    height: Style.vspan(24)
-
     ListViewManager {
         id: settingsListView
 
         anchors.horizontalCenter: parent.horizontalCenter
         anchors.top: parent.top
         anchors.topMargin: Style.vspan(1)
-        width: Style.hspan(12)
+        width: Style.hspan(14)
         height: parent.height
 
         model: ListModel {
diff --git a/sysui/popup/PopupContainer.qml b/sysui/popup/PopupContainer.qml
index 27dd908..e3a67ec 100644
--- a/sysui/popup/PopupContainer.qml
+++ b/sysui/popup/PopupContainer.qml
@@ -83,6 +83,8 @@ MouseArea {
         font.pixelSize: Style.fontSizeM
         text: root.contentAvailable && root.popupContent !== undefined ? root.popupContent.toString() : ""
         horizontalAlignment: Text.AlignHCenter
+        elide: Text.ElideRight
+        wrapMode: Text.WordWrap
     }
 
     ProgressBar {