Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 12:54:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #13511 from r3tk0n/mouse_menu2

Browse source 
Fix SpinnerSliderPreference Class, Update Mouse Sensitivity Menu
This commit is contained in:
John Conklin II 2018-07-02 12:33:35 -07:00 committed by GitHub
commit 58a9bdc86f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -56,8 +56,8 @@ Preference {
id: slider id: slider
value: preference.value value: preference.value
width: 100 width: 100
minimumValue: MyAvatar.getDomainMinScale() minimumValue: preference.min
maximumValue: MyAvatar.getDomainMaxScale() maximumValue: preference.max
stepSize: preference.step stepSize: preference.step
onValueChanged: { onValueChanged: {
spinner.realValue = value spinner.realValue = value
@ -74,8 +74,8 @@ Preference {
id: spinner id: spinner
decimals: preference.decimals decimals: preference.decimals
realValue: preference.value realValue: preference.value
minimumValue: MyAvatar.getDomainMinScale() minimumValue: preference.min
maximumValue: MyAvatar.getDomainMaxScale() maximumValue: preference.max
width: 100 width: 100
onValueChanged: { onValueChanged: {
slider.value = realValue; slider.value = realValue;

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

@ -227,6 +227,8 @@ void setupPreferences() {
auto getter = [=]()->float { return myAvatar->getTargetScale(); }; auto getter = [=]()->float { return myAvatar->getTargetScale(); };
auto setter = [=](float value) { myAvatar->setTargetScale(value); }; auto setter = [=](float value) { myAvatar->setTargetScale(value); };
auto preference = new SpinnerSliderPreference(AVATAR_TUNING, "Avatar Scale", getter, setter); auto preference = new SpinnerSliderPreference(AVATAR_TUNING, "Avatar Scale", getter, setter);
preference->setMin(0.25);
preference->setMax(4);
preference->setStep(0.05f); preference->setStep(0.05f);
preference->setDecimals(2); preference->setDecimals(2);
preferences->addPreference(preference); preferences->addPreference(preference);
@ -303,17 +305,21 @@ void setupPreferences() {
{ {
auto getter = [=]()->float { return myAvatar->getPitchSpeed(); }; auto getter = [=]()->float { return myAvatar->getPitchSpeed(); };
auto setter = [=](float value) { myAvatar->setPitchSpeed(value); }; auto setter = [=](float value) { myAvatar->setPitchSpeed(value); };
auto preference = new SpinnerPreference(AVATAR_CAMERA, "Pitch speed (degrees/second)", getter, setter); auto preference = new SpinnerSliderPreference(AVATAR_CAMERA, "Y input:", getter, setter);
preference->setMin(1.0f); preference->setMin(1.0f);
preference->setMax(360.0f); preference->setMax(360.0f);
preference->setStep(1);
preference->setDecimals(1);
preferences->addPreference(preference); preferences->addPreference(preference);
} }
{ {
auto getter = [=]()->float { return myAvatar->getYawSpeed(); }; auto getter = [=]()->float { return myAvatar->getYawSpeed(); };
auto setter = [=](float value) { myAvatar->setYawSpeed(value); }; auto setter = [=](float value) { myAvatar->setYawSpeed(value); };
auto preference = new SpinnerPreference(AVATAR_CAMERA, "Yaw speed (degrees/second)", getter, setter); auto preference = new SpinnerSliderPreference(AVATAR_CAMERA, "X input:", getter, setter);
preference->setMin(1.0f); preference->setMin(1.0f);
preference->setMax(360.0f); preference->setMax(360.0f);
preference->setStep(1);
preference->setDecimals(1);
preferences->addPreference(preference); preferences->addPreference(preference);
} }