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

Tidy desktop QML dialogs

Browse source
This commit is contained in:
David Rowe 2016-02-22 21:16:00 +13:00
parent 72fb2ff102
commit 42734a0202
2 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
interface/resources/qml/desktop/Desktop.qml
View file

@ -1,13 +1,21 @@
//
// Desktop.qml
//
// Created by Bradley Austin Davis on 15 Apr 2015
// Copyright 2015 High Fidelity, Inc.
//
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import QtQuick.Dialogs 1.2 as OriginalDialogs;
import "../dialogs" import "../dialogs"
import "../menus" import "../menus"
import "../js/Utils.js" as Utils import "../js/Utils.js" as Utils
// This is our primary 'desktop' object to which all VR dialogs and // This is our primary 'desktop' object to which all VR dialogs and windows are childed.
// windows will be childed.
FocusScope { FocusScope {
id: desktop id: desktop
anchors.fill: parent; anchors.fill: parent;
@ -316,6 +324,3 @@ FocusScope {
} }
} }

13
interface/resources/qml/desktop/FocusHack.qml
View file

@ -1,3 +1,13 @@
//
// FocusHack.qml
//
// Created by Bradley Austin Davis on 21 Jan 2015
// Copyright 2016 High Fidelity, Inc.
//
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
import QtQuick 2.5 import QtQuick 2.5
FocusScope { FocusScope {
@ -21,6 +31,3 @@ FocusScope {
focusTimer.running = true; focusTimer.running = true;
} }
} }