Fix grid view margins and scroll bar positioning on Qt 5.9

app/gui/AppView.qml

@@ -12,10 +12,10 @@ GridView {
     id: appGrid
     focus: true
     activeFocusOnTab: true
-    leftMargin: (parent.width % (cellWidth + rightMargin)) / 2
     topMargin: 20
-    rightMargin: 5
     bottomMargin: 5
+    leftMargin: contentHeight > cellHeight && parent.width > cellWidth ? (parent.width % cellWidth) / 2 : 10
+    rightMargin: leftMargin
     cellWidth: 230; cellHeight: 297;
 
     function computerLost()
@@ -268,11 +268,9 @@ GridView {
 
         parent: appGrid.parent
         anchors {
-            top: appGrid.top
+            top: parent.top
-            left: appGrid.right
+            right: parent.right
-            bottom: appGrid.bottom
+            bottom: parent.bottom
-
-            leftMargin: -10
         }
     }
 }

app/gui/PcView.qml

@@ -12,11 +12,11 @@ GridView {
     id: pcGrid
     focus: true
     activeFocusOnTab: true
-    leftMargin: (parent.width % (cellWidth + rightMargin)) / 2
     topMargin: 20
-    rightMargin: 5
     bottomMargin: 5
-    cellWidth: 350; cellHeight: 350;
+    leftMargin: contentHeight > cellHeight && parent.width > cellWidth ? (parent.width % cellWidth) / 2 : 10
+    rightMargin: leftMargin
+    cellWidth: 310; cellHeight: 350;
     objectName: "Computers"
 
     Component.onCompleted: {
@@ -263,11 +263,9 @@ GridView {
     ScrollBar.vertical: ScrollBar {
         parent: pcGrid.parent
         anchors {
-            top: pcGrid.top
+            top: parent.top
-            left: pcGrid.right
+            right: parent.right
-            bottom: pcGrid.bottom
+            bottom: parent.bottom
-
-            leftMargin: -10
         }
     }
 }