From f3e0e8643114ef4e7f286c062a0890580e46873a Mon Sep 17 00:00:00 2001
From: Pekka Vuorela <pekka.vuorela@jollamobile.com>
Date: Tue, 17 May 2016 12:04:19 +0300
Subject: [PATCH] [fingerterm] Set window size before showing it. Fixes
 JB#35253

Main qml still gets first hard-coded pixel sizes but at least now
Jolla tablet doesn't get confused by changing window size.
---
 main.cpp | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/main.cpp b/main.cpp
index ff63fb5..3e39cc1 100644
--- a/main.cpp
+++ b/main.cpp
@@ -103,6 +103,17 @@ int main(int argc, char *argv[])
     qmlRegisterType<TextRender>("TextRender",1,0,"TextRender");
     QQuickView view;
 
+    bool fullscreen = !app.arguments().contains("-nofs");
+    QSize screenSize = QGuiApplication::primaryScreen()->size();
+
+    if (fullscreen) {
+        view.setWidth(screenSize.width());
+        view.setHeight(screenSize.height());
+    } else {
+        view.setWidth(screenSize.width() / 2);
+        view.setHeight(screenSize.height() / 2);
+    }
+
     Terminal term;
     Util util(settings);
     term.setUtil(&util);
@@ -133,8 +144,8 @@ int main(int argc, char *argv[])
     context->setContextProperty( "util", &util );
     context->setContextProperty( "keyLoader", &keyLoader );
 
-    view.setSource(QUrl("qrc:/qml/Main.qml"));
     view.setResizeMode(QQuickView::SizeRootObjectToView);
+    view.setSource(QUrl("qrc:/qml/Main.qml"));
 
     QObject *root = view.rootObject();
     if(!root)
@@ -156,12 +167,9 @@ int main(int argc, char *argv[])
 
     QObject::connect(view.engine(),SIGNAL(quit()),&app,SLOT(quit()));
 
-    if (!app.arguments().contains("-nofs")) {
+    if (fullscreen) {
         view.showFullScreen();
     } else {
-        QSize screenSize = QGuiApplication::primaryScreen()->size();
-        view.setWidth(screenSize.width() / 2);
-        view.setHeight(screenSize.height() / 2);
         view.show();
     }