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

Merge pull request #8173 from SamGondelman/snapshotFix2

Browse source 
Fix snapshot dialog rendering
This commit is contained in:
James B. Pollack 2016-06-30 16:48:43 -07:00 committed by GitHub
commit 3b57fd1faf
2 changed files with 1 additions and 2 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)));
}); });
} }