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

Merge pull request #8168 from jherico/qml_window_signal

Browse source 
Allow scripts to receive a visibility changed signal from their windows
This commit is contained in:
Howard Stearns 2016-06-30 16:50:07 -07:00 committed by GitHub
commit ae54399177
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/ui/src/QmlWindowClass.cpp
View file

@ -123,6 +123,7 @@ void QmlWindowClass::initQml(QVariantMap properties) {
// Forward messages received from QML on to the script // Forward messages received from QML on to the script
connect(_qmlWindow, SIGNAL(sendToScript(QVariant)), this, SLOT(qmlToScript(const QVariant&)), Qt::QueuedConnection); connect(_qmlWindow, SIGNAL(sendToScript(QVariant)), this, SLOT(qmlToScript(const QVariant&)), Qt::QueuedConnection);
connect(_qmlWindow, SIGNAL(visibleChanged()), this, SIGNAL(visibleChanged()), Qt::QueuedConnection);
}); });
} }
Q_ASSERT(_qmlWindow); Q_ASSERT(_qmlWindow);

4
libraries/ui/src/QmlWindowClass.h
View file

@ -24,7 +24,7 @@ class QmlWindowClass : public QObject {
Q_OBJECT Q_OBJECT
Q_PROPERTY(glm::vec2 position READ getPosition WRITE setPosition NOTIFY positionChanged) Q_PROPERTY(glm::vec2 position READ getPosition WRITE setPosition NOTIFY positionChanged)
Q_PROPERTY(glm::vec2 size READ getSize WRITE setSize NOTIFY sizeChanged) Q_PROPERTY(glm::vec2 size READ getSize WRITE setSize NOTIFY sizeChanged)
Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibilityChanged) Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleChanged)
public: public:
static QScriptValue constructor(QScriptContext* context, QScriptEngine* engine); static QScriptValue constructor(QScriptContext* context, QScriptEngine* engine);
@ -52,7 +52,7 @@ public slots:
void sendToQml(const QVariant& message); void sendToQml(const QVariant& message);
signals: signals:
void visibilityChanged(bool visible); // Tool window void visibleChanged();
void positionChanged(); void positionChanged();
void sizeChanged(); void sizeChanged();
void moved(glm::vec2 position); void moved(glm::vec2 position);

4
scripts/system/libraries/entityList.js
View file

@ -111,8 +111,8 @@ EntityListTool = function(opts) {
} }
}); });
webView.visibilityChanged.connect(function (visible) { webView.visibleChanged.connect(function () {
if (visible) { if (webView.visible) {
that.sendUpdate(); that.sendUpdate();
} }
}); });