From 46bb3c05a507202189b08dfa416c6be103e788f7 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Thu, 3 Mar 2016 14:17:02 +1300
Subject: [PATCH] Right justify leading control labels

---
 .../resources/qml/dialogs/preferences/ComboBoxPreference.qml   | 3 ++-
 .../resources/qml/dialogs/preferences/SliderPreference.qml     | 3 ++-
 .../resources/qml/dialogs/preferences/SpinBoxPreference.qml    | 3 ++-
 interface/resources/qml/styles-uit/HifiConstants.qml           | 1 +
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/interface/resources/qml/dialogs/preferences/ComboBoxPreference.qml b/interface/resources/qml/dialogs/preferences/ComboBoxPreference.qml
index 042d172bd0..10e5f5febf 100644
--- a/interface/resources/qml/dialogs/preferences/ComboBoxPreference.qml
+++ b/interface/resources/qml/dialogs/preferences/ComboBoxPreference.qml
@@ -35,9 +35,10 @@ Preference {
         anchors {
             left: parent.left
             right: dataComboBox.left
-            rightMargin: hifi.dimensions.contentSpacing.x
+            rightMargin: hifi.dimensions.labelPadding
             verticalCenter: dataComboBox.verticalCenter
         }
+        horizontalAlignment: Text.AlignRight
         wrapMode: Text.Wrap
     }
 
diff --git a/interface/resources/qml/dialogs/preferences/SliderPreference.qml b/interface/resources/qml/dialogs/preferences/SliderPreference.qml
index 11bcc25716..92cab40133 100644
--- a/interface/resources/qml/dialogs/preferences/SliderPreference.qml
+++ b/interface/resources/qml/dialogs/preferences/SliderPreference.qml
@@ -33,9 +33,10 @@ Preference {
         anchors {
             left: parent.left
             right: slider.left
-            rightMargin: hifi.dimensions.contentSpacing.x
+            rightMargin: hifi.dimensions.labelPadding
             verticalCenter: slider.verticalCenter
         }
+        horizontalAlignment: Text.AlignRight
         wrapMode: Text.Wrap
     }
 
diff --git a/interface/resources/qml/dialogs/preferences/SpinBoxPreference.qml b/interface/resources/qml/dialogs/preferences/SpinBoxPreference.qml
index c77d0bd18b..aa9068bb00 100644
--- a/interface/resources/qml/dialogs/preferences/SpinBoxPreference.qml
+++ b/interface/resources/qml/dialogs/preferences/SpinBoxPreference.qml
@@ -32,9 +32,10 @@ Preference {
         anchors {
             left: parent.left
             right: spinner.left
-            rightMargin: hifi.dimensions.contentSpacing.x
+            rightMargin: hifi.dimensions.labelPadding
             verticalCenter: spinner.verticalCenter
         }
+        horizontalAlignment: Text.AlignRight
         wrapMode: Text.Wrap
     }
 
diff --git a/interface/resources/qml/styles-uit/HifiConstants.qml b/interface/resources/qml/styles-uit/HifiConstants.qml
index 5c50a4f6ae..e99fa9dc2a 100644
--- a/interface/resources/qml/styles-uit/HifiConstants.qml
+++ b/interface/resources/qml/styles-uit/HifiConstants.qml
@@ -98,6 +98,7 @@ Item {
         readonly property real borderWidth: largeScreen ? 2 : 1
         readonly property vector2d contentMargin: Qt.vector2d(12, 24)
         readonly property vector2d contentSpacing: Qt.vector2d(8, 12)
+        readonly property real labelPadding: 40
         readonly property real textPadding: 8
         readonly property real sliderHandleSize: 18
         readonly property real sliderGrooveHeight: 8