From 1eb6fa425cdd116a9cf74225d799a1836de29977 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Thu, 3 Mar 2016 20:09:50 +1300 Subject: [PATCH] Fix up Running Scripts dialog --- .../qml/controls-uit/VerticalSpacer.qml | 2 +- .../qml/hifi/dialogs/RunningScripts.qml | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/interface/resources/qml/controls-uit/VerticalSpacer.qml b/interface/resources/qml/controls-uit/VerticalSpacer.qml index a3a0276f8f..6fc49605c0 100644 --- a/interface/resources/qml/controls-uit/VerticalSpacer.qml +++ b/interface/resources/qml/controls-uit/VerticalSpacer.qml @@ -14,5 +14,5 @@ import "../styles-uit" Item { width: 1 // Must be non-zero - height: hifi.dimensions.contentSpacing.y + height: hifi.dimensions.controlInterlineHeight } diff --git a/interface/resources/qml/hifi/dialogs/RunningScripts.qml b/interface/resources/qml/hifi/dialogs/RunningScripts.qml index 9e356582cf..b156a95a02 100644 --- a/interface/resources/qml/hifi/dialogs/RunningScripts.qml +++ b/interface/resources/qml/hifi/dialogs/RunningScripts.qml @@ -24,7 +24,7 @@ Window { resizable: true destroyOnInvisible: true x: 40; y: 40 - implicitWidth: 384; implicitHeight: 640 + implicitWidth: 400; implicitHeight: 695 minSize: Qt.vector2d(200, 300) HifiConstants { id: hifi } @@ -91,6 +91,8 @@ Window { name: "Currently Running" isFirst: true + HifiControls.VerticalSpacer {} + Row { spacing: hifi.dimensions.contentSpacing.x @@ -107,6 +109,8 @@ Window { } } + HifiControls.VerticalSpacer {} + HifiControls.Table { tableModel: runningScriptsModel height: 185 @@ -116,13 +120,15 @@ Window { } HifiControls.VerticalSpacer { - height: 4 + height: 2 // Table view draws a little taller than it's height. } } HifiControls.ContentSection { name: "Load Scripts" + HifiControls.VerticalSpacer {} + Row { spacing: hifi.dimensions.contentSpacing.x anchors.right: parent.right @@ -165,6 +171,8 @@ Window { } } + HifiControls.VerticalSpacer {} + HifiControls.TextField { id: filterEdit anchors.left: parent.left @@ -176,6 +184,8 @@ Window { Component.onCompleted: scriptsModel.filterRegExp = new RegExp("^.*$", "i") } + HifiControls.VerticalSpacer {} + HifiControls.Tree { id: treeView height: 155 @@ -185,6 +195,8 @@ Window { anchors.right: parent.right } + HifiControls.VerticalSpacer {} + HifiControls.TextField { id: selectedScript anchors.left: parent.left