Tidy message dialog code

This commit is contained in:
David Rowe 2016-03-08 13:56:25 +13:00
parent b7fd5467ba
commit 7f2938c53f

View file

@ -1,8 +1,8 @@
// //
// Desktop.qml // MessageDialog.qml
// //
// Created by Bradley Austin Davis on 25 Apr 2015 // Created by Bradley Austin Davis on 15 Jan 2016
// Copyright 2015 High Fidelity, Inc. // Copyright 2016 High Fidelity, Inc.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@ -80,8 +80,6 @@ ModalWindow {
QtObject { QtObject {
id: d id: d
readonly property real spacing: hifi.dimensions.contentSpacing.x
readonly property real outerSpacing: hifi.dimensions.contentSpacing.y
readonly property int minWidth: 480 readonly property int minWidth: 480
readonly property int maxWdith: 1280 readonly property int maxWdith: 1280
readonly property int minHeight: 120 readonly property int minHeight: 120
@ -132,7 +130,7 @@ ModalWindow {
Flow { Flow {
id: buttons id: buttons
focus: true focus: true
spacing: d.spacing spacing: hifi.dimensions.contentSpacing.x
onHeightChanged: d.resize(); onWidthChanged: d.resize(); onHeightChanged: d.resize(); onWidthChanged: d.resize();
layoutDirection: Qt.RightToLeft layoutDirection: Qt.RightToLeft
anchors { anchors {
@ -186,8 +184,8 @@ ModalWindow {
id: flickable id: flickable
contentHeight: detailedText.height contentHeight: detailedText.height
anchors.fill: parent anchors.fill: parent
anchors.topMargin: root.spacing anchors.topMargin: hifi.dimensions.contentSpacing.x
anchors.bottomMargin: root.outerSpacing anchors.bottomMargin: hifi.dimensions.contentSpacing.y
TextEdit { TextEdit {
id: detailedText id: detailedText
size: hifi.fontSizes.menuItem size: hifi.fontSizes.menuItem
@ -210,7 +208,7 @@ ModalWindow {
} }
] ]
Component.onCompleted: updateIcon(); Component.onCompleted: updateIcon()
onStateChanged: d.resize() onStateChanged: d.resize()
} }