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

Add WindowScriptingInterface::doCreateWebWindow

Browse source
This commit is contained in:
Ryan Huffman 2014-11-11 10:15:16 -08:00
parent a1d771a0be
commit 3ec28f8e30
3 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -56,7 +56,7 @@ void WebWindowClass::setVisible(bool visible) {
QScriptValue WebWindowClass::constructor(QScriptContext* context, QScriptEngine* engine) {
WebWindowClass* retVal;
QString file = context->argument(0).toString();
QMetaObject::invokeMethod(WindowScriptingInterface::getInstance(), "doCreateWebWindowClass", Qt::BlockingQueuedConnection,
QMetaObject::invokeMethod(WindowScriptingInterface::getInstance(), "doCreateWebWindow", Qt::BlockingQueuedConnection,
Q_RETURN_ARG(WebWindowClass*, retVal),
Q_ARG(const QString&, file),
Q_ARG(int, context->argument(1).toInteger()),
@ -64,5 +64,5 @@ QScriptValue WebWindowClass::constructor(QScriptContext* context, QScriptEngine*
connect(engine, &QScriptEngine::destroyed, retVal, &WebWindowClass::deleteLater);
return engine->newQObject(retVal);//, QScriptEngine::ScriptOwnership);
return engine->newQObject(retVal);
}

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

@ -34,6 +34,10 @@ WindowScriptingInterface::WindowScriptingInterface() :
{
}
WebWindowClass* WindowScriptingInterface::doCreateWebWindow(const QString& url, int width, int height) {
return new WebWindowClass(url, width, height);
}
QScriptValue WindowScriptingInterface::hasFocus() {
return Application::getInstance()->getGLWidget()->hasFocus();
}

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

@ -15,6 +15,11 @@
#include <QObject>
#include <QScriptValue>
#include <QString>
#include <QFileDialog>
#include <QComboBox>
#include <QLineEdit>
#include "WebWindowClass.h"
class WindowScriptingInterface : public QObject {
Q_OBJECT
@ -72,6 +77,8 @@ private slots:
void nonBlockingFormAccepted() { _nonBlockingFormActive = false; _formResult = QDialog::Accepted; emit nonBlockingFormClosed(); }
void nonBlockingFormRejected() { _nonBlockingFormActive = false; _formResult = QDialog::Rejected; emit nonBlockingFormClosed(); }
WebWindowClass* doCreateWebWindow(const QString& url, int width, int height);
private:
WindowScriptingInterface();