Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 13:28:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixing Styling, added Preference to Tablet, Moved Location to Avatar Tuning

Browse source
This commit is contained in:
Cain Kilgore 2017-07-25 01:48:55 +01:00
parent 84609f27e3
commit 280a7a7e42
3 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/resources/qml/controls-uit/RadioButton.qml
View file

@ -54,9 +54,9 @@ Original.RadioButton {
height: checkSize height: checkSize
radius: 7 radius: 7
anchors.centerIn: parent anchors.centerIn: parent
color: hifi.colors.checkBoxChecked color: "#00B4EF"
border.width: 1 border.width: 1
border.color: hifi.colors.checkBoxCheckedBorder border.color: "#36CDFF"
visible: checked && !pressed || !checked && pressed visible: checked && !pressed || !checked && pressed
} }
} }

1
interface/resources/qml/dialogs/preferences/PrimaryHandPreference.qml
View file

@ -28,7 +28,6 @@ Preference {
} }
function save() { function save() {
// Box1 = True, Box2 = False (Right Hand for Default)
if (box1.checked && !box2.checked) { if (box1.checked && !box2.checked) {
preference.value = "left"; preference.value = "left";
} }

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

@ -67,11 +67,6 @@ void setupPreferences() {
auto setter = [=](bool value) { myAvatar->setClearOverlayWhenMoving(value); }; auto setter = [=](bool value) { myAvatar->setClearOverlayWhenMoving(value); };
preferences->addPreference(new CheckPreference(AVATAR_BASICS, "Clear overlays when moving", getter, setter)); preferences->addPreference(new CheckPreference(AVATAR_BASICS, "Clear overlays when moving", getter, setter));
} }
{
auto getter = [=]()->QString { return myAvatar->getDominantHand(); };
auto setter = [=](const QString& value) { myAvatar->setDominantHand(value); };
preferences->addPreference(new PrimaryHandPreference(AVATAR_BASICS, "Dominant Hand", getter, setter));
}
// UI // UI
static const QString UI_CATEGORY { "UI" }; static const QString UI_CATEGORY { "UI" };
@ -186,6 +181,11 @@ void setupPreferences() {
preference->setStep(1); preference->setStep(1);
preferences->addPreference(preference); preferences->addPreference(preference);
} }
{
auto getter = [=]()->QString { return myAvatar->getDominantHand(); };
auto setter = [=](const QString& value) { myAvatar->setDominantHand(value); };
preferences->addPreference(new PrimaryHandPreference(AVATAR_TUNING, "Dominant Hand", getter, setter));
}
{ {
auto getter = [=]()->float { return myAvatar->getUniformScale(); }; auto getter = [=]()->float { return myAvatar->getUniformScale(); };
auto setter = [=](float value) { myAvatar->setTargetScale(value); }; auto setter = [=](float value) { myAvatar->setTargetScale(value); };