Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 20:48:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Adding potential fix

Browse source
This commit is contained in:
Wayne Chen 2018-07-12 14:15:16 -07:00
parent 5cf6cc0270
commit 089831b6ee
3 changed files with 9 additions and 2 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
} }

8
interface/resources/qml/LoginDialog/LinkAccountBody.qml
View file

@ -140,7 +140,9 @@ Item {
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
linkColor: hifi.colors.blueAccent linkColor: hifi.colors.blueAccent
onLinkActivated: loginDialog.openUrl(link) onLinkActivated: {
loginDialog.openUrl(link);
}
} }
onFocusChanged: { onFocusChanged: {
root.text = ""; root.text = "";
@ -170,7 +172,9 @@ Item {
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
linkColor: hifi.colors.blueAccent linkColor: hifi.colors.blueAccent
onLinkActivated: loginDialog.openUrl(link) onLinkActivated: {
loginDialog.openUrl(link);
}
} }
onFocusChanged: { onFocusChanged: {

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);
} }