Hide unfinished stuff

Iktwo · Mar 5, 2019 · ddd581b · ddd581b
1 parent 76014e9
commit ddd581b
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 20 deletions.
diff --git a/src/qml/main.qml b/src/qml/main.qml
@@ -34,19 +34,6 @@ ApplicationWindow {
             Config.Theme.portrait = true
     }
 
-    function getScreenDensityConfiguration(density) {
-        switch(density) {
-        case 420:
-            return "xxhigh"
-        case 480:
-            return "xxhigh"
-        case 560:
-            return "xxxhigh"
-        case 640:
-            return "xxxhigh"
-        }
-    }
-
     color: Config.Theme.colorApplicationWindow
 
     width: resolutions[currentResolution].width
@@ -90,13 +77,29 @@ ApplicationWindow {
         anchors.fill: parent
 
         source: "themes/" + Config.Theme.theme + "/ThemeMain.qml"
+
+        Keys.onBackPressed: {
+            event.accepted = true
+
+            if (loaderMainTheme.item && loaderMainTheme.item.opened) {
+                QL.Launcher.minimize()
+            }
+        }
+
+        Keys.onEscapePressed: {
+            if (loaderMainTheme.item && loaderMainTheme.item.opened) {
+                QL.Launcher.minimize()
+            }
+        }
+
     }
 
     Loader {
         id: loader
 
         function unload() {
             sourceComponent = null
+            loaderMainTheme.focus = true
         }
 
         anchors.fill: parent
@@ -105,12 +108,9 @@ ApplicationWindow {
 
         focus: true
 
-        Keys.onBackPressed: {
-            event.accepted = true
-
-            if (loaderMainTheme.item && loaderMainTheme.item.opened) {
-                QL.Launcher.minimize()
-            }
+        // TODO: Remove this once the intro is ready
+        Component.onCompleted: {
+            unload()
         }
 
         Component {
@@ -130,6 +130,7 @@ ApplicationWindow {
 
                 onDone: {
                     QL.ApplicationInfo.hasShownInitialDialog = true
+                    loader.unload()
                 }
             }
         }

diff --git a/src/qml/themes/classic/ThemeMain.qml b/src/qml/themes/classic/ThemeMain.qml
@@ -60,6 +60,7 @@ FocusScope {
 
         clip: true
         interactive: visible
+        visible: false
 
         cellHeight: height / Config.Theme.getColumns()
         cellWidth: width / Config.Theme.getRows()

diff --git a/src/qml/themes/tiles/ThemeMain.qml b/src/qml/themes/tiles/ThemeMain.qml
@@ -67,7 +67,6 @@ Item {
                     left: parent.left; leftMargin: (parent.width / 2 ) * 0.025
                 }
 
-                visible: true
                 model: QL.PackageManager
 
                 width: (parent.width / 2 ) * 0.95