Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 17:28:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add WebWindow::setURL

Browse source
This commit is contained in:
Ryan Huffman 2015-03-17 09:06:31 -07:00
parent d33d3afb52
commit 46f6c9f888
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/src/scripting/WebWindowClass.cpp
View file

@ -96,6 +96,14 @@ void WebWindowClass::setVisible(bool visible) {
QMetaObject::invokeMethod(_windowWidget, "setVisible", Qt::BlockingQueuedConnection, Q_ARG(bool, visible)); QMetaObject::invokeMethod(_windowWidget, "setVisible", Qt::BlockingQueuedConnection, Q_ARG(bool, visible));
} }
void WebWindowClass::setURL(const QString& url) {
if (QThread::currentThread() != thread()) {
QMetaObject::invokeMethod(this, "setURL", Qt::BlockingQueuedConnection, Q_ARG(QString, url));
return;
}
_webView->setUrl(url);
}
QScriptValue WebWindowClass::constructor(QScriptContext* context, QScriptEngine* engine) { QScriptValue WebWindowClass::constructor(QScriptContext* context, QScriptEngine* engine) {
WebWindowClass* retVal; WebWindowClass* retVal;
QString file = context->argument(0).toString(); QString file = context->argument(0).toString();

1
interface/src/scripting/WebWindowClass.h
View file

@ -42,6 +42,7 @@ public:
public slots: public slots:
void setVisible(bool visible); void setVisible(bool visible);
void setURL(const QString& url);
ScriptEventBridge* getEventBridge() const { return _eventBridge; } ScriptEventBridge* getEventBridge() const { return _eventBridge; }
void addEventBridgeToWindowObject(); void addEventBridgeToWindowObject();