Switch to ItemDelegate for PCs and Apps for proper hover and click behavior

app/gui/AppView.qml

@@ -16,8 +16,7 @@ GridView {
     anchors.topMargin: 20
     anchors.rightMargin: 5
     anchors.bottomMargin: 5
-    cellWidth: 225; cellHeight: 350;
+    cellWidth: 225; cellHeight: 385;
-    focus: true
 
     // Cache delegates for 1000px in both directions to improve
     // scrolling and resizing performance
@@ -52,12 +51,13 @@ GridView {
 
     model: appModel
 
-    delegate: Item {
+    delegate: ItemDelegate {
-        width: 200; height: 300;
+        width: 200; height: 335;
 
         Image {
             id: appIcon
             anchors.horizontalCenter: parent.horizontalCenter;
+            y: 20
             source: model.boxart
             sourceSize {
                 width: 150
@@ -132,20 +132,19 @@ GridView {
             }
         }
 
-        MouseArea {
-            anchors.fill: parent
-            acceptedButtons: Qt.LeftButton | Qt.RightButton
         onClicked: {
-                if (mouse.button === Qt.LeftButton) {
             // Nothing is running or this app is running
             launchOrResumeSelectedApp()
         }
-                else {
+
+        MouseArea {
+            anchors.fill: parent
+            acceptedButtons: Qt.RightButton
+            onClicked: {
                 // Right click
                 appContextMenu.open()
             }
         }
-        }
 
         Menu {
             id: appContextMenu

app/gui/PcView.qml

@@ -19,7 +19,6 @@ GridView {
     anchors.rightMargin: 5
     anchors.bottomMargin: 5
     cellWidth: 350; cellHeight: 350;
-    focus: true
     objectName: "Computers"
 
     // The StackView will trigger a visibility change when
@@ -73,7 +72,7 @@ GridView {
 
     model: computerModel
 
-    delegate: Item {
+    delegate: ItemDelegate {
         width: 300; height: 300;
 
         Image {
@@ -142,11 +141,7 @@ GridView {
             }
         }
 
-        MouseArea {
-            anchors.fill: parent
-            acceptedButtons: Qt.LeftButton | Qt.RightButton;
         onClicked: {
-                if(mouse.button === Qt.LeftButton) {
             if (model.addPc) {
                 addPcDialog.open()
             }
@@ -174,19 +169,22 @@ GridView {
                         errorDialog.open()
                     }
                 }
-                    } else if(!model.online) {
+            } else if (!model.online) {
                 pcContextMenu.open()
             }
+        }
 
-                }
+        MouseArea {
-                else { // right click
+            anchors.fill: parent
-                    if(!model.addPc) { // but only for actual PCs, not the add-pc option
+            acceptedButtons: Qt.RightButton;
+            onClicked: {
+                // right click
+                if (!model.addPc) { // but only for actual PCs, not the add-pc option
                     pcContextMenu.open()
                 }
             }
         }
     }
-    }
 
     MessageDialog {
         id: errorDialog