adding initialization of qml when keyboard ready

Wayne Chen committed 8 years ago

Commit 60bbcc71 parent ccebf3e4 files · +41 −20Browse files

Showing the changes to interface/src/Application.cpp (1 of 4 files). Show all

Unified · Split

         }
     });
+    connect(offscreenUi.data(), &OffscreenUi::keyboardFocusActive, [this]() {
+        initializeQml();
+    });
     // Make sure we don't time out during slow operations at startup
     updateHeartbeat();
     QTimer* settingsTimer = new QTimer();
     moveToNewNamedThread(settingsTimer, "Settings Thread", [this, settingsTimer]{
         // This needs to run on the settings thread, so we need to pass the `settingsTimer` as the
         // receiver object, otherwise it will run on the application thread and trigger a warning
         // about trying to kill the timer on the main thread.
         connect(qApp, &Application::beforeAboutToQuit, settingsTimer, [this, settingsTimer]{
     connect(&AndroidHelper::instance(), &AndroidHelper::enterBackground, this, &Application::enterBackground);
     connect(&AndroidHelper::instance(), &AndroidHelper::enterForeground, this, &Application::enterForeground);
     AndroidHelper::instance().notifyLoadComplete();
-#else
-    if (!accountManager->isLoggedIn()) {
-        Setting::Handle<bool>{"loginDialogPoppedUp", false}.set(true);
-        dialogsManager->showLoginDialog();
-        QJsonObject loginData = {};
-        loginData["action"] = "login dialog shown";
-        UserActivityLogger::getInstance().logAction("encourageLoginDialog", loginData);
-    }
-    Setting::Handle<bool>{"loginDialogPoppedUp", false}.set(false);
 #endif
 }
 extern void setupPreferences();
 static void addDisplayPluginToMenu(const DisplayPluginPointer& displayPlugin, int index, bool active = false);
+void Application::initializeQml() {
+    if (QThread::currentThread() != thread()) {
+        QMetaObject::invokeMethod(this, "initializeQml");
+        return;
+    }
+#if !defined(Q_OS_ANDROID)
+    auto accountManager = DependencyManager::get<AccountManager>();
+    auto dialogsManager = DependencyManager::get<DialogsManager>();
+    if (!accountManager->isLoggedIn()) {
+        Setting::Handle<bool>{"loginDialogPoppedUp", false}.set(true);
+        dialogsManager->showLoginDialog();
+        QJsonObject loginData = {};
+        loginData["action"] = "login dialog shown";
+        UserActivityLogger::getInstance().logAction("encourageLoginDialog", loginData);
+    }
+    Setting::Handle<bool>{"loginDialogPoppedUp", false}.set(false);
+#endif
+}
 void Application::initializeUi() {
     AddressBarDialog::registerType();
     ErrorDialog::registerType();

adding initialization of qml when keyboard ready

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code