History

omitting keyboard focus hack

Wayne Chen committed 8 years ago

Commit ccebf3e1 parent 91e34a32 files · +8 −17Browse files

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

Unified · Split

interface/src/Application.cpp+7−16
@@ -2328,23 +2328,14 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 2327 unmodified lines
23282328 connect(&AndroidHelper::instance(), &AndroidHelper::enterForeground, this, &Application::enterForeground);
23292329 AndroidHelper::instance().notifyLoadComplete();
23302330 #else
2331− static int CHECK_LOGIN_TIMER = 3000;
2332− QTimer* checkLoginTimer = new QTimer(this);
2333− checkLoginTimer->setInterval(CHECK_LOGIN_TIMER);
2334− checkLoginTimer->setSingleShot(true);
2335− connect(checkLoginTimer, &QTimer::timeout, this, []() {
2336− auto accountManager = DependencyManager::get<AccountManager>();
2337− auto dialogsManager = DependencyManager::get<DialogsManager>();
2338− if (!accountManager->isLoggedIn()) {
2339− Setting::Handle<bool>{"loginDialogPoppedUp", false}.set(true);
2340− dialogsManager->showLoginDialog();
2341− QJsonObject loginData = {};
2342− loginData["action"] = "login dialog shown";
2343− UserActivityLogger::getInstance().logAction("encourageLoginDialog", loginData);
2344− }
2345− });
2331+ if (!accountManager->isLoggedIn()) {
2332+ Setting::Handle<bool>{"loginDialogPoppedUp", false}.set(true);
2333+ dialogsManager->showLoginDialog();
2334+ QJsonObject loginData = {};
2335+ loginData["action"] = "login dialog shown";
2336+ UserActivityLogger::getInstance().logAction("encourageLoginDialog", loginData);
2337+ }
23462338 Setting::Handle<bool>{"loginDialogPoppedUp", false}.set(false);
2347− checkLoginTimer->start();
23482339 #endif
23492340 }
23502341