From dfb6cb1aa340f04d4116efc8c621fa3d08f08aca Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Thu, 30 Jun 2016 14:25:36 -0700 Subject: [PATCH 1/2] Updating entity list --- scripts/system/libraries/entityList.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/system/libraries/entityList.js b/scripts/system/libraries/entityList.js index e9baeac86c..448293a2ac 100644 --- a/scripts/system/libraries/entityList.js +++ b/scripts/system/libraries/entityList.js @@ -111,8 +111,8 @@ EntityListTool = function(opts) { } }); - webView.visibilityChanged.connect(function (visible) { - if (visible) { + webView.visibleChanged.connect(function () { + if (webView.visible) { that.sendUpdate(); } }); From 69ffd63ba702417de9edc2b33bd24c05e9dee125 Mon Sep 17 00:00:00 2001 From: SamGondelman Date: Thu, 30 Jun 2016 15:42:48 -0700 Subject: [PATCH 2/2] fix snapshot sharing window --- interface/resources/qml/hifi/dialogs/SnapshotShareDialog.qml | 2 +- interface/src/Application.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/interface/resources/qml/hifi/dialogs/SnapshotShareDialog.qml b/interface/resources/qml/hifi/dialogs/SnapshotShareDialog.qml index 3dacb3b39c..f99b770a78 100644 --- a/interface/resources/qml/hifi/dialogs/SnapshotShareDialog.qml +++ b/interface/resources/qml/hifi/dialogs/SnapshotShareDialog.qml @@ -7,7 +7,7 @@ import "../../windows" import "../../js/Utils.js" as Utils import "../models" -ScrollingWindow { +Window { id: root resizable: true width: 516 diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 5978461dcf..1c9ec94dc4 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -4998,7 +4998,6 @@ void Application::takeSnapshot() { DependencyManager::get()->load("hifi/dialogs/SnapshotShareDialog.qml", [=](QQmlContext*, QObject* dialog) { dialog->setProperty("source", QUrl::fromLocalFile(fileName)); - connect(dialog, SIGNAL(uploadSnapshot(const QString& snapshot)), this, SLOT(uploadSnapshot(const QString& snapshot))); }); }