Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 19:41:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #13629 from wayne-chen/loginDialogBrowser-case-16537

Browse source 
MS16537: Updating "Forgot Username/Forgot Password" behavior
This commit is contained in:
Wayne Chen 2018-07-18 16:32:55 -07:00 committed by GitHub
commit 37131d75e9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/resources/qml/Browser.qml
View file

@ -26,6 +26,7 @@ ScrollingWindow {
y: 100 y: 100
Component.onCompleted: { Component.onCompleted: {
focus = true
shown = true shown = true
addressBar.text = webview.url addressBar.text = webview.url
} }

2
interface/src/ui/LoginDialog.cpp
View file

@ -172,11 +172,13 @@ void LoginDialog::openUrl(const QString& url) const {
offscreenUi->load("Browser.qml", [=](QQmlContext* context, QObject* newObject) { offscreenUi->load("Browser.qml", [=](QQmlContext* context, QObject* newObject) {
newObject->setProperty("url", url); newObject->setProperty("url", url);
}); });
LoginDialog::hide();
} else { } else {
if (!hmd->getShouldShowTablet() && !qApp->isHMDMode()) { if (!hmd->getShouldShowTablet() && !qApp->isHMDMode()) {
offscreenUi->load("Browser.qml", [=](QQmlContext* context, QObject* newObject) { offscreenUi->load("Browser.qml", [=](QQmlContext* context, QObject* newObject) {
newObject->setProperty("url", url); newObject->setProperty("url", url);
}); });
LoginDialog::hide();
} else { } else {
tablet->gotoWebScreen(url); tablet->gotoWebScreen(url);
} }