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

Merge branch 'master' of https://github.com/highfidelity/hifi into button-state

Browse source
This commit is contained in:
howard-stearns 2016-06-30 16:49:19 -07:00
commit 125f6d8b63
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/resources/qml/hifi/dialogs/SnapshotShareDialog.qml
View file

@ -7,7 +7,7 @@ import "../../windows"
import "../../js/Utils.js" as Utils import "../../js/Utils.js" as Utils
import "../models" import "../models"
ScrollingWindow { Window {
id: root id: root
resizable: true resizable: true
width: 516 width: 516

1
interface/src/Application.cpp
View file

@ -4998,7 +4998,6 @@ void Application::takeSnapshot() {
DependencyManager::get<OffscreenUi>()->load("hifi/dialogs/SnapshotShareDialog.qml", [=](QQmlContext*, QObject* dialog) { DependencyManager::get<OffscreenUi>()->load("hifi/dialogs/SnapshotShareDialog.qml", [=](QQmlContext*, QObject* dialog) {
dialog->setProperty("source", QUrl::fromLocalFile(fileName)); dialog->setProperty("source", QUrl::fromLocalFile(fileName));
connect(dialog, SIGNAL(uploadSnapshot(const QString& snapshot)), this, SLOT(uploadSnapshot(const QString& snapshot)));
}); });
} }

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();
} }
}); });