summaryrefslogtreecommitdiffstats
path: root/src/compositor/compositor_api/qwaylandquickoutput.cpp
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@theqtcompany.com>2015-09-03 12:36:56 +0200
committerJørgen Lind <jorgen.lind@theqtcompany.com>2015-09-04 16:12:47 +0200
commita814616ff34bf5901fc299c6ba91c80cad39922d (patch)
treea21c4ff1b19ee99d144bb991e1b0774478f053c4 /src/compositor/compositor_api/qwaylandquickoutput.cpp
parent19b6e928cd57a3a89ecc6b350aff2e6a1d2f9bce (diff)
Rename automaticFrameCallbacks to automaticFrameCallback
and: - add a signal for when it changes - change default to true Change-Id: Ifb7d29756f554dbd2a2594c935442ba9f4956c5c
Diffstat (limited to 'src/compositor/compositor_api/qwaylandquickoutput.cpp')
-rw-r--r--src/compositor/compositor_api/qwaylandquickoutput.cpp16
1 files changed, 10 insertions, 6 deletions
diff --git a/src/compositor/compositor_api/qwaylandquickoutput.cpp b/src/compositor/compositor_api/qwaylandquickoutput.cpp
index 9a3842b07..463901572 100644
--- a/src/compositor/compositor_api/qwaylandquickoutput.cpp
+++ b/src/compositor/compositor_api/qwaylandquickoutput.cpp
@@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE
QWaylandQuickOutput::QWaylandQuickOutput(QWaylandOutputSpace *outputSpace, QQuickWindow *window)
: QWaylandOutput(outputSpace, window)
, m_updateScheduled(false)
- , m_automaticFrameCallbacks(false)
+ , m_automaticFrameCallback(true)
{
connect(window, &QQuickWindow::beforeSynchronizing,
this, &QWaylandQuickOutput::updateStarted,
@@ -66,14 +66,18 @@ void QWaylandQuickOutput::update()
}
}
-bool QWaylandQuickOutput::automaticFrameCallbacks() const
+bool QWaylandQuickOutput::automaticFrameCallback() const
{
- return m_automaticFrameCallbacks;
+ return m_automaticFrameCallback;
}
-void QWaylandQuickOutput::setAutomaticFrameCallbacks(bool automatic)
+void QWaylandQuickOutput::setAutomaticFrameCallback(bool automatic)
{
- m_automaticFrameCallbacks = automatic;
+ if (m_automaticFrameCallback == automatic)
+ return;
+
+ m_automaticFrameCallback = automatic;
+ automaticFrameCallbackChanged();
}
void QWaylandQuickOutput::updateStarted()
@@ -85,7 +89,7 @@ void QWaylandQuickOutput::updateStarted()
void QWaylandQuickOutput::doFrameCallbacks()
{
- if (m_automaticFrameCallbacks)
+ if (m_automaticFrameCallback)
sendFrameCallbacks();
}
QT_END_NAMESPACE