Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

timer now resumes when visible again

Browse source
This commit is contained in:
David Kelly 2017-06-30 18:44:32 -07:00
parent 455233dc16
commit 073eae39b2
3 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
interface/resources/qml/hifi/SpectatorCamera.qml
View file

@ -39,7 +39,7 @@ Rectangle {
letterboxMessage.visible = true;
letterboxMessage.popupRadius = 0;
}
//
// TITLE BAR START
//
@ -221,13 +221,18 @@ Rectangle {
Hifi.ResourceImageItem {
id: spectatorCameraPreview;
url: "resource://spectatorCameraFrame";
ready: false;
ready: cameraToggleCheckBox.checked;
mirrorVertically: true;
height: 250;
anchors.left: parent.left;
anchors.top: cameraToggleCheckBox.bottom;
anchors.topMargin: 20;
anchors.right: parent.right;
onVisibleChanged: {
ready = cameraToggleCheckBox.checked;
update();
}
}
// "Monitor Shows" Switch Label Glyph

9
interface/src/ui/ResourceImageItem.cpp
View file

@ -23,13 +23,7 @@ ResourceImageItem::ResourceImageItem(QQuickItem* parent) : QQuickFramebufferObje
}
void ResourceImageItem::onUpdateTimer() {
qDebug() << "onUpdateTimer called";
// turn timer off if not visible
if (!isVisible()) {
m_updateTimer.stop();
} else {
update();
}
update();
}
void ResourceImageItem::setUrl(const QString& url) {
@ -46,7 +40,6 @@ void ResourceImageItem::setReady(bool ready) {
// 10 HZ for now. Also this serves as a small
// delay before getting the network texture, which
// helps a lot. TODO: find better way.
qDebug() << "setReady called";
m_updateTimer.start(100);
} else {
m_updateTimer.stop();

1
interface/src/ui/ResourceImageItem.h
View file

@ -38,7 +38,6 @@ class ResourceImageItem : public QQuickFramebufferObject {
Q_OBJECT
Q_PROPERTY(QString url READ getUrl WRITE setUrl)
Q_PROPERTY(bool ready READ getReady WRITE setReady)
public:
ResourceImageItem(QQuickItem* parent = Q_NULLPTR);
QString getUrl() const { return m_url; }