From a41f409e33bb3a0af94808f4d0b696ffad7cd8f0 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Thu, 3 Mar 2016 17:49:18 +1300 Subject: [PATCH] Defer dialog vertical spacing decisions to content items --- interface/resources/qml/controls-uit/ContentSection.qml | 2 +- interface/resources/qml/styles-uit/HifiConstants.qml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/interface/resources/qml/controls-uit/ContentSection.qml b/interface/resources/qml/controls-uit/ContentSection.qml index 46f8c22420..1700b5939a 100644 --- a/interface/resources/qml/controls-uit/ContentSection.qml +++ b/interface/resources/qml/controls-uit/ContentSection.qml @@ -19,7 +19,7 @@ Column { property bool isCollapsible: false // Set at creation. property bool isCollapsed: false - spacing: hifi.dimensions.contentSpacing.y + spacing: 0 // Defer spacing decisions to individual controls. anchors { left: parent.left diff --git a/interface/resources/qml/styles-uit/HifiConstants.qml b/interface/resources/qml/styles-uit/HifiConstants.qml index e1dc77a695..108cf8a221 100644 --- a/interface/resources/qml/styles-uit/HifiConstants.qml +++ b/interface/resources/qml/styles-uit/HifiConstants.qml @@ -107,6 +107,8 @@ Item { readonly property real tableRowHeight: largeScreen ? 26 : 23 readonly property vector2d modalDialogMargin: Qt.vector2d(50, 30) readonly property real modalDialogTitleHeight: 40 + readonly property real controlLineHeight: 29 // Height of spinbox control on 1920 x 1080 monitor + readonly property real controlInterlineHeight: 22 // 75% of controlLineHeight } Item {