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

Add URL parameter to Window.openUrl() API function

Browse source
This commit is contained in:
David Rowe 2020-10-03 17:00:43 +13:00
parent 86aa3c8709
commit 64eb4d11e1
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
interface/src/scripting/WindowScriptingInterface.cpp
View file

@ -645,12 +645,16 @@ void WindowScriptingInterface::setActiveDisplayPlugin(int index) {
qApp->setActiveDisplayPlugin(name); qApp->setActiveDisplayPlugin(name);
} }
void WindowScriptingInterface::openWebBrowser() { void WindowScriptingInterface::openWebBrowser(const QString& url) {
if (QThread::currentThread() != thread()) { if (QThread::currentThread() != thread()) {
QMetaObject::invokeMethod(this, "openWebBrowser", Qt::QueuedConnection); QMetaObject::invokeMethod(this, "openWebBrowser", Q_ARG(const QString&, url));
return; return;
} }
auto offscreenUi = DependencyManager::get<OffscreenUi>(); auto offscreenUi = DependencyManager::get<OffscreenUi>();
offscreenUi->load("Browser.qml"); offscreenUi->load("Browser.qml", [=](QQmlContext* context, QObject* newObject) {
if (!url.isEmpty()) {
newObject->setProperty("url", url);
}
});
} }

5
interface/src/scripting/WindowScriptingInterface.h
View file

@ -616,10 +616,11 @@ public slots:
void setActiveDisplayPlugin(int index); void setActiveDisplayPlugin(int index);
/**jsdoc /**jsdoc
* Opens a web browser in a pop-up window. * Opens an Interface web browser window.
* @function Window.openWebBrowser * @function Window.openWebBrowser
* @param {string} url="" - The URL of the web page to display.
*/ */
void openWebBrowser(); void openWebBrowser(const QString& url = "");
private slots: private slots: