Clean-up margin errors

- fixed margin errors due to potrait mode

Change-Id: Ibae76416042be2749fe90c3308f8e06df03e01cb
Reviewed-by: Nedim Hadzic <nedim.hadzic@pelagicore.com>

7 files changed, 10 insertions, 10 deletions

diff --git a/imports/shared/controls/SettingsItemDelegate.qml b/imports/shared/controls/SettingsItemDelegate.qml
index cf7d374..32a3d21 100644
--- a/imports/shared/controls/SettingsItemDelegate.qml
+++ b/imports/shared/controls/SettingsItemDelegate.qml
@@ -73,7 +73,7 @@ ItemDelegate {
 
             Switch {
                 id: switchControl
-                Layout.preferredWidth: Style.hspan(3)
+                Layout.preferredWidth: Style.hspan(5)
                 Layout.fillHeight: true
                 visible: root.checkable
                 checked: root.checked
diff --git a/imports/shared/utils/Style.qml b/imports/shared/utils/Style.qml
index 0817665..1db9ecf 100644
--- a/imports/shared/utils/Style.qml
+++ b/imports/shared/utils/Style.qml
@@ -99,7 +99,6 @@ QtObject {
     property real popupWidth: isPotrait ? hspan(12) : hspan(8)
     property real popupHeight: isPotrait ? vspan(5) : vspan(6)
 
-    property int notificationCenterWidth: hspan(notificationCenterSpan)
     property real launcherHeight: vspan(launcherSpan)
 
     property string assetPath: Qt.resolvedUrl("../../assets/")
diff --git a/sysui/display/Display.qml b/sysui/display/Display.qml
index 02cdc53..2448760 100644
--- a/sysui/display/Display.qml
+++ b/sysui/display/Display.qml
@@ -140,7 +140,7 @@ Item {
 
     StageLoader {
         id: notificationCenterLoader
-        width: Style.notificationCenterWidth
+        width: Style.isPotrait ? Style.hspan(Style.notificationCenterSpan + 5) : Style.hspan(Style.notificationCenterSpan)
         height: Style.screenHeight - Style.statusBarHeight
         anchors.top: statusBar.bottom
         active: StagedStartupModel.loadBackgroundElements
diff --git a/sysui/notification/NotificationCenterItem.qml b/sysui/notification/NotificationCenterItem.qml
index bb897dc..baeaca0 100644
--- a/sysui/notification/NotificationCenterItem.qml
+++ b/sysui/notification/NotificationCenterItem.qml
@@ -37,7 +37,7 @@ import controls 1.0
 Control {
     id: root
 
-    width: Style.notificationCenterWidth
+    width: Style.isPotrait ? Style.hspan(Style.notificationCenterSpan + 5) : Style.hspan(Style.notificationCenterSpan)
     height: Style.vspan(2)
 
     property string iconSource
diff --git a/sysui/statusbar/StatusBar.qml b/sysui/statusbar/StatusBar.qml
index 2f5f4e5..b2768a7 100644
--- a/sysui/statusbar/StatusBar.qml
+++ b/sysui/statusbar/StatusBar.qml
@@ -75,7 +75,7 @@ Pane {
     }
 
     RowLayout {
-        spacing: Style.padding
+        spacing: Style.isPotrait ? 15 : 8
         Layout.maximumWidth: Style.hspan(12)
         anchors.right: parent.right
         anchors.top: parent.top
diff --git a/sysui/widgets/MusicWidget.qml b/sysui/widgets/MusicWidget.qml
index 4f74dcc..8515845 100644
--- a/sysui/widgets/MusicWidget.qml
+++ b/sysui/widgets/MusicWidget.qml
@@ -123,7 +123,7 @@ UIPanel {
 
         RowLayout {
             spacing: Style.hspan(1)
-            Layout.preferredHeight: Style.vspan(4)
+            Layout.preferredHeight: Style.vspan(3)
 
             Tool {
                 symbol: "prev"
diff --git a/sysui/widgets/PhoneWidget.qml b/sysui/widgets/PhoneWidget.qml
index f7a5824..849061b 100644
--- a/sysui/widgets/PhoneWidget.qml
+++ b/sysui/widgets/PhoneWidget.qml
@@ -51,16 +51,17 @@ UIPanel {
 
     C.Icon {
         id: phoneIcon
-        width: Style.hspan(2);
-        height: Style.vspan(4)
-        anchors.verticalCenter: parent.verticalCenter
+        width: Style.hspan(2)
+        height: Style.vspan(3)
+        anchors.bottom: parent.bottom
         source: Style.icon("widgets_phone")
     }
 
     ColumnLayout {
         id: nameLayout
 
-        anchors.verticalCenter: parent.verticalCenter
+        anchors.bottom: parent.bottom
+        anchors.bottomMargin: Style.isPotrait ? Style.paddingXL * 2 : Style.paddingXL * 4
         anchors.left: phoneIcon.right
         anchors.leftMargin: Style.padding
         anchors.right: parent.right