summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@qt.io>2018-03-20 11:17:08 +0100
committerLaszlo Agocs <laszlo.agocs@qt.io>2018-03-20 15:31:01 +0000
commit40b17bc608858d55386f8353f22a7078574ba61e (patch)
tree760441a63f747a9a1beacad6e66b13fd026073d2 /examples
parent3a81d7b62225f558ff48e3302d91725e00f2c3f9 (diff)
Implement slideEntered/Exited signals in the public API
Needs some rework internally since this needs passing around more data in our internal event struct. Change-Id: I879f11a279bea424b981358f27115969e5980c55 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
Diffstat (limited to 'examples')
-rw-r--r--examples/3dstudioruntime2/simpleqml/main.qml14
1 files changed, 14 insertions, 0 deletions
diff --git a/examples/3dstudioruntime2/simpleqml/main.qml b/examples/3dstudioruntime2/simpleqml/main.qml
index 51900c0..0447ed4 100644
--- a/examples/3dstudioruntime2/simpleqml/main.qml
+++ b/examples/3dstudioruntime2/simpleqml/main.qml
@@ -72,6 +72,8 @@ Rectangle {
id: s3dpres
source: "qrc:/presentation/barrel.uip"
onCustomSignalEmitted: customSignalName.text = Date.now() + ": " + name
+ onSlideEntered: slideEnter.text = "Entered slide " + name + "(index " + index + ") on " + elementPath
+ onSlideExited: slideExit.text = "Exited slide " + name + "(index " + index + ") on " + elementPath
}
ignoredEvents: mouseEvCb.checked ? Studio3D.EnableAllEvents : (Studio3D.IgnoreMouseEvents | Studio3D.IgnoreWheelEvents)
onRunningChanged: console.log("running: " + s3d.running)
@@ -165,6 +167,18 @@ Rectangle {
anchors.left: fpsCount.right
anchors.leftMargin: 8
}
+ Text {
+ id: slideEnter
+ anchors.bottom: parent.bottom
+ anchors.left: customSignalName.right
+ anchors.leftMargin: 8
+ }
+ Text {
+ id: slideExit
+ anchors.bottom: parent.bottom
+ anchors.left: slideEnter.right
+ anchors.leftMargin: 8
+ }
FileDialog {
id: openDialog