Remove dependency on old application framework and wayland

[apps/launcher.git] / launcher / qml / Launcher.qml

diff --git a/launcher/qml/Launcher.qml b/launcher/qml/Launcher.qml
index 2247f51..befce07 100644 (file)
--- a/launcher/qml/Launcher.qml
+++ b/launcher/qml/Launcher.qml
@@ -18,20 +18,22 @@
 import QtQuick 2.6
 import QtQuick.Layouts 1.1
 import QtQuick.Controls 2.0
+import QtQuick.Window 2.13
 import AppModel 1.0
 
 ApplicationWindow {
-    width: container.width * container.scale
-    height: container.height * container.scale
 
-    property int pid: -1
+    id: root 
+    //width: container.width
+    //height: container.height
+    flags: Qt.FramelessWindowHint
+    visible: true
 
     Item {
         id: container
         anchors.centerIn: parent
-        width: 1080
-        height: 1488
-        scale: screenInfo.scale_factor()
+        width: Window.width
+        height: Window.height
 
         Image {
           anchors.centerIn: parent
@@ -80,6 +82,7 @@ ApplicationWindow {
             property string currentId: ''
             property int newIndex: -1
             property int index: grid.indexAt(loc.mouseX, loc.mouseY)
+           property string output_screen: ''
             x: 62
             y: 264
             onPressAndHold: currentId = applicationModel.id(newIndex = index)
@@ -87,8 +90,13 @@ ApplicationWindow {
                 if(loc.index < 0) {
                     return
                 }
+
+               //if (applicationModel.appid(loc.index) === 'tbtnavi' ||
+               //    applicationModel.appid(loc.index) === 'hvac') {
+               //      output_screen = 'Virtual-1'
+               //}
                 if (currentId === '') {
-                    homescreenHandler.tapShortcut(applicationModel.appid(loc.index))
+                    homescreenHandler.tapShortcut(applicationModel.appid(loc.index), output_screen)
                 } else {
                     currentId = ''
                 }