Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed Indentation, removed old debug code

Browse source
This commit is contained in:
Cain Kilgore 2017-07-13 19:23:28 +01:00
parent 521babb6bd
commit 5329c1ce42
3 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/resources/qml/dialogs/preferences/Section.qml
View file

@ -72,7 +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 spinnerSliderBuilder: Component { SpinnerSliderPreference { } }
property var preferences: []
property int checkBoxCount: 0
@ -128,13 +128,11 @@ Preference {
case Preference.ComboBox:
checkBoxCount = 0;
builder = comboBoxBuilder;
console.log("Built COMBOBOX");
break;
case Preference.SpinnerSlider:
checkBoxCount = 0;
builder = spinnerSliderBuilder;
console.log("Built SPINNERSLIDER");
break;
};

4
interface/resources/qml/dialogs/preferences/SpinnerSliderPreference.qml
View file

@ -60,7 +60,7 @@ Preference {
width: 100
minimumValue: MyAvatar.getDomainMinScale()
maximumValue: MyAvatar.getDomainMaxScale()
stepSize: preference.step
stepSize: preference.step
onValueChanged: {
spinner.value = value
}
@ -72,7 +72,7 @@ Preference {
SpinBox {
id: spinner
decimals: preference.decimals
value: preference.value
value: preference.value
minimumValue: MyAvatar.getDomainMinScale()
maximumValue: MyAvatar.getDomainMaxScale()
width: 100

6
interface/src/ui/PreferencesDialog.cpp
View file

@ -182,9 +182,9 @@ void setupPreferences() {
preferences->addPreference(preference);
}
{
auto getter = [=]()->float { return myAvatar->getUniformScale(); };
auto setter = [=](float value) { myAvatar->setTargetScale(value); };
auto preference = new SpinnerSliderPreference(AVATAR_TUNING, "Avatar Scale", getter, setter);
auto getter = [=]()->float { return myAvatar->getUniformScale(); };
auto setter = [=](float value) { myAvatar->setTargetScale(value); };
auto preference = new SpinnerSliderPreference(AVATAR_TUNING, "Avatar Scale", getter, setter);
preference->setStep(0.1);
preference->setDecimals(2);
preferences->addPreference(preference);