Avatar Scaler - WIP

interface/resources/qml/dialogs/preferences/Section.qml

@@ -72,6 +72,7 @@ Preference {
         property var avatarBuilder: Component { AvatarPreference { } }
         property var buttonBuilder: Component { ButtonPreference { } }
         property var comboBoxBuilder: Component { ComboBoxPreference { } }
+		property var spinnerSliderBuilder: Component { SpinnerSliderPreference { } }
         property var preferences: []
         property int checkBoxCount: 0
 
@@ -128,6 +129,11 @@ Preference {
                     checkBoxCount = 0;
                     builder = comboBoxBuilder;
                     break;
+
+				case Preference.SpinnerSlider:
+					checkBoxCount = 0;
+					builder = spinnerSliderBuilder;
+					break;
             };
 
             if (builder) {

interface/resources/qml/dialogs/preferences/SpinnerSliderPreference.qml

@@ -0,0 +1,64 @@
+//
+//  SpinBoxPreference.qml
+//
+//  Created by Bradley Austin Davis on 18 Jan 2016
+//  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 "../../dialogs"
+import "../../controls-uit"
+
+Preference {
+    id: root
+    property alias slider: slider
+    height: control.height + hifi.dimensions.controlInterlineHeight
+
+    Component.onCompleted: {
+        slider.value = preference.value;
+    }
+
+    function save() {
+        preference.value = slider.value;
+        preference.save();
+    }
+
+    Item {
+        id: control
+        anchors {
+            left: parent.left
+            right: parent.right
+            bottom: parent.bottom
+        }
+        height: Math.max(labelText.height, slider.height)
+
+        Label {
+            id: labelText
+            text: root.label + ":"
+            colorScheme: hifi.colorSchemes.dark
+            anchors {
+                left: parent.left
+                right: slider.left
+                rightMargin: hifi.dimensions.labelPadding
+                verticalCenter: parent.verticalCenter
+            }
+            horizontalAlignment: Text.AlignRight
+            wrapMode: Text.Wrap
+        }
+
+        Slider {
+            id: slider
+            value: preference.value
+            width: 130
+            anchors {
+                right: parent.right
+                verticalCenter: parent.verticalCenter
+            }
+            colorScheme: hifi.colorSchemes.dark
+        }
+    }
+}

interface/resources/qml/hifi/tablet/tabletWindows/preferences/Section.qml

@@ -81,6 +81,7 @@ Preference {
         property var avatarBuilder: Component { AvatarPreference { } }
         property var buttonBuilder: Component { ButtonPreference { } }
         property var comboBoxBuilder: Component { ComboBoxPreference { } }
+		property var spinnerSliderBuilder: Component { SpinnerSliderPreference { } }
         property var preferences: []
         property int checkBoxCount: 0
 
@@ -143,6 +144,10 @@ Preference {
                     //to be not overlapped when drop down is active
                     zpos = root.z + 1000 - itemNum
                     break;
+                case Preference.SpinnerSlider:
+                    checkBoxCount = 0;
+                    builder = spinnerSliderBuilder;
+                    break;
             };
 
             if (builder) {

interface/src/ui/PreferencesDialog.cpp

@@ -184,12 +184,14 @@ void setupPreferences() {
 	{
 		auto getter = [=]()->float { return myAvatar->getUniformScale(); };
 		auto setter = [=](float value) { myAvatar->setTargetScale(value); };
-        auto preference = new SpinnerPreference(AVATAR_TUNING, "Avatar scale (default is 1.0)", getter, setter);
+
-        preference->setMin(0.01f);
+		auto scaleSpinner = new SpinnerSliderPreference(AVATAR_TUNING, "Avatar Scale", getter, setter);
-        preference->setMax(99.9f);
+		scaleSpinner->setMin(0.01f);
-        preference->setDecimals(2);
+		scaleSpinner->setMax(99.9f);
-        preference->setStep(1);
+		scaleSpinner->setDecimals(2);
-        preferences->addPreference(preference);
+		scaleSpinner->setStep(1);
+
+		preferences->addPreference(scaleSpinner);
 	}
     {
         auto getter = []()->float { return DependencyManager::get<DdeFaceTracker>()->getEyeClosingThreshold(); };
@@ -227,17 +229,17 @@ void setupPreferences() {
         preferences->addPreference(preference);
     }
 
-    static const QString AUDIO("Audio");
+    static const QString AUDIO_BUFFERS("Audio Buffers");
     {
         auto getter = []()->bool { return !DependencyManager::get<AudioClient>()->getReceivedAudioStream().dynamicJitterBufferEnabled(); };
         auto setter = [](bool value) { DependencyManager::get<AudioClient>()->getReceivedAudioStream().setDynamicJitterBufferEnabled(!value); };
-        auto preference = new CheckPreference(AUDIO, "Disable dynamic jitter buffer", getter, setter);
+        auto preference = new CheckPreference(AUDIO_BUFFERS, "Disable dynamic jitter buffer", getter, setter);
         preferences->addPreference(preference);
     }
     {
         auto getter = []()->float { return DependencyManager::get<AudioClient>()->getReceivedAudioStream().getStaticJitterBufferFrames(); };
         auto setter = [](float value) { DependencyManager::get<AudioClient>()->getReceivedAudioStream().setStaticJitterBufferFrames(value); };
-        auto preference = new SpinnerPreference(AUDIO, "Static jitter buffer frames", getter, setter);
+        auto preference = new SpinnerPreference(AUDIO_BUFFERS, "Static jitter buffer frames", getter, setter);
         preference->setMin(0);
         preference->setMax(2000);
         preference->setStep(1);
@@ -246,13 +248,13 @@ void setupPreferences() {
     {
         auto getter = []()->bool { return !DependencyManager::get<AudioClient>()->getOutputStarveDetectionEnabled(); };
         auto setter = [](bool value) { DependencyManager::get<AudioClient>()->setOutputStarveDetectionEnabled(!value); };
-        auto preference = new CheckPreference(AUDIO, "Disable output starve detection", getter, setter);
+        auto preference = new CheckPreference(AUDIO_BUFFERS, "Disable output starve detection", getter, setter);
         preferences->addPreference(preference);
     }
     {
         auto getter = []()->float { return DependencyManager::get<AudioClient>()->getOutputBufferSize(); };
         auto setter = [](float value) { DependencyManager::get<AudioClient>()->setOutputBufferSize(value); };
-        auto preference = new SpinnerPreference(AUDIO, "Output buffer initial frames", getter, setter);
+        auto preference = new SpinnerPreference(AUDIO_BUFFERS, "Output buffer initial frames", getter, setter);
         preference->setMin(AudioClient::MIN_BUFFER_FRAMES);
         preference->setMax(AudioClient::MAX_BUFFER_FRAMES);
         preference->setStep(1);
@@ -262,13 +264,13 @@ void setupPreferences() {
     {
         auto getter = []()->bool { return DependencyManager::get<AudioClient>()->isSimulatingJitter(); };
         auto setter = [](bool value) { return DependencyManager::get<AudioClient>()->setIsSimulatingJitter(value); };
-        auto preference = new CheckPreference(AUDIO, "Packet jitter simulator", getter, setter);
+        auto preference = new CheckPreference(AUDIO_BUFFERS, "Packet jitter simulator", getter, setter);
         preferences->addPreference(preference);
     }
     {
         auto getter = []()->float { return DependencyManager::get<AudioClient>()->getGateThreshold(); };
         auto setter = [](float value) { return DependencyManager::get<AudioClient>()->setGateThreshold(value); };
-        auto preference = new SpinnerPreference(AUDIO, "Packet throttle threshold", getter, setter);
+        auto preference = new SpinnerPreference(AUDIO_BUFFERS, "Packet throttle threshold", getter, setter);
         preference->setMin(1);
         preference->setMax(200);
         preference->setStep(1);

libraries/shared/src/Preferences.h

@@ -52,6 +52,7 @@ public:
         Browsable,
         Slider,
         Spinner,
+		SpinnerSlider,
         Checkbox,
         Button,
         ComboBox,
@@ -254,6 +255,15 @@ public:
     Type getType() override { return Spinner; }
 };
 
+class SpinnerSliderPreference : public FloatPreference {
+	Q_OBJECT
+public:
+	SpinnerSliderPreference(const QString& category, const QString& name, Getter getter, Setter setter)
+		: FloatPreference(category, name, getter, setter) { }
+
+	Type getType() override { return SpinnerSlider; }
+};
+
 class IntSpinnerPreference : public IntPreference {
     Q_OBJECT
 public: