From 70fe34812e059e3cada011e2bcb188f363566865 Mon Sep 17 00:00:00 2001
From: Elias <i@kelteseth.net>
Date: Thu, 31 Jan 2019 18:13:52 +0100
Subject: [PATCH] Fix native text rendering

Fix reloading of installedlistmodel every time
---
 ScreenPlay/main.cpp                    | 17 ++++++++---------
 ScreenPlay/qml/Installed/Installed.qml |  5 +----
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/ScreenPlay/main.cpp b/ScreenPlay/main.cpp
index c58819e4..ff6f9c51 100644
--- a/ScreenPlay/main.cpp
+++ b/ScreenPlay/main.cpp
@@ -4,7 +4,6 @@
 #include <QGuiApplication>
 #include <QIcon>
 #include <QLibrary>
-#include <QModelIndex>
 #include <QObject>
 #include <QQmlApplicationEngine>
 #include <QQmlContext>
@@ -14,7 +13,6 @@
 #include <QQuickView>
 #include <QScreen>
 #include <QStringList>
-#include <QTransform>
 #include <QUrl>
 #include <QVariant>
 #include <QWindow>
@@ -49,8 +47,8 @@ int main(int argc, char* argv[])
     app.setQuitOnLastWindowClosed(false);
     app.setWindowIcon(QIcon(":/assets/icons/favicon.ico"));
 
+    // This gives us nice clickable output in QtCreator
     qSetMessagePattern("%{if-category}%{category}: %{endif}%{message}\n   Loc: [%{file}:%{line}]");
-    qDebug() << QThread::currentThreadId();
 
     QtWebEngine::initialize();
 
@@ -134,14 +132,8 @@ int main(int argc, char* argv[])
     profileListModel.loadProfiles();
     settings.loadActiveProfiles();
 
-
     QQmlApplicationEngine mainWindowEngine;
 
-    // Instead of setting "renderType: Text.NativeRendering" every time
-    // we can set it here once :)
-    auto* window = static_cast<QQuickWindow*>(mainWindowEngine.rootObjects().first());
-    window->setTextRenderType(QQuickWindow::TextRenderType::NativeTextRendering);
-
     mainWindowEngine.rootContext()->setContextProperty("screenPlay", &screenPlay);
     mainWindowEngine.rootContext()->setContextProperty("screenPlayCreate", &create);
     mainWindowEngine.rootContext()->setContextProperty("utility", &qmlUtil);
@@ -152,6 +144,13 @@ int main(int argc, char* argv[])
     mainWindowEngine.rootContext()->setContextProperty("screenPlaySettings", &settings);
 
     mainWindowEngine.load(QUrl(QStringLiteral("qrc:/main.qml")));
+    installedListFilter.sortByRoleType("All");
+    installedListModel.loadScreens();
+
+    // Instead of setting "renderType: Text.NativeRendering" every time
+    // we can set it here once :)
+    auto* window = static_cast<QQuickWindow*>(mainWindowEngine.rootObjects().first());
+    window->setTextRenderType(QQuickWindow::TextRenderType::NativeTextRendering);
 
     // Set visible if the -silent parameter was not set
     QStringList argumentList = app.arguments();
diff --git a/ScreenPlay/qml/Installed/Installed.qml b/ScreenPlay/qml/Installed/Installed.qml
index 632abc46..fbb11b8c 100644
--- a/ScreenPlay/qml/Installed/Installed.qml
+++ b/ScreenPlay/qml/Installed/Installed.qml
@@ -1,5 +1,4 @@
 import QtQuick 2.9
-import QtQml.Models 2.2
 import QtQuick.Controls 2.3
 import QtQuick.Controls.Styles 1.4
 import QtGraphicalEffects 1.0
@@ -16,9 +15,6 @@ Item {
     property bool enabled: true
 
     Component.onCompleted: {
-        installedListFilter.sortByRoleType("All")
-        installedListModel.reset()
-        installedListModel.loadScreens()
         pageInstalled.state = "in"
     }
 
@@ -316,6 +312,7 @@ Item {
                     right: parent.right
                     rightMargin: 30
                     bottom: parent.bottom
+                    bottomMargin: 5
                 }
                 onTextChanged: {
                     if (txtSearch.text.length === 0) {