Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-17 11:20:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some code cleaning, added comment for reasoning of specifying min and max in the qml

Browse source
This commit is contained in:
Cain Kilgore 2017-07-14 00:56:42 +01:00
parent 72c3e789e9
commit 4f8d958831
4 changed files with 33 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/resources/qml/controls-uit/Slider.qml
View file

@ -36,7 +36,7 @@ Slider {
Rectangle {
width: parent.height - 2
height: slider.width * (slider.value - slider.minimumValue)/(slider.maximumValue-slider.minimumValue)-1
height: slider.width * (slider.value - slider.minimumValue) / (slider.maximumValue - slider.minimumValue) - 1
radius: height / 2
anchors {
top: parent.top

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

@ -130,10 +130,10 @@ Preference {
builder = comboBoxBuilder;
break;
case Preference.SpinnerSlider:
checkBoxCount = 0;
builder = spinnerSliderBuilder;
break;
case Preference.SpinnerSlider:
checkBoxCount = 0;
builder = spinnerSliderBuilder;
break;
};
if (builder) {

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

@ -16,10 +16,12 @@ import "../../controls-uit"
Preference {
id: root
property alias slider: slider
property alias spinner: spinner
height: control.height + hifi.dimensions.controlInterlineHeight
Component.onCompleted: {
slider.value = preference.value;
spinner.value = preference.value;
}
function save() {
@ -27,10 +29,6 @@ Preference {
preference.save();
}
function sliderToAvatarScale(sliderValue) {
return MyAvatar.getDomainMinScale() + (MyAvatar.getDomainMaxScale()-MyAvatar.getDomainMinScale())*value;
}
Item {
id: control
anchors {
@ -38,7 +36,7 @@ Preference {
right: parent.right
bottom: parent.bottom
}
height: Math.max(labelText.height, slider.height)
height: Math.max(labelText.height, slider.height, spinner.height, button.height)
Label {
id: labelText
@ -67,9 +65,11 @@ Preference {
anchors {
right: spinner.left
rightMargin: 10
verticalCenter: parent.verticalCenter
}
colorScheme: hifi.colorSchemes.dark
}
SpinBox {
id: spinner
decimals: preference.decimals
@ -83,26 +83,29 @@ Preference {
anchors {
right: button.left
rightMargin: 10
verticalCenter: parent.verticalCenter
}
colorScheme: hifi.colorSchemes.dark
}
GlyphButton {
id: button
onClicked: {
if(spinner.maximumValue >= 1) {
spinner.value = 1
slider.value = 1
} else {
spinner.value = spinner.maximumValue
slider.value = spinner.maximumValue
}
}
width: 30
glyph: hifi.glyphs.reload
anchors {
right: parent.right
}
GlyphButton {
id: button
onClicked: {
if (spinner.maximumValue >= 1) {
spinner.value = 1
slider.value = 1
} else {
spinner.value = spinner.maximumValue
slider.value = spinner.maximumValue
}
}
width: 30
glyph: hifi.glyphs.reload
anchors {
right: parent.right
verticalCenter: parent.verticalCenter
}
colorScheme: hifi.colorSchemes.dark
}
}
}
}

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

@ -188,6 +188,9 @@ void setupPreferences() {
preference->setStep(0.1f);
preference->setDecimals(2);
preferences->addPreference(preference);
// When the Interface is first loaded, this section setupPreferences(); is loaded - causing the myAvatar->getDomainMinScale() and myAvatar->getDomainMaxScale() to get set to incorrect values which can't be changed across domain switches.
// Having these values loaded up when you load the Dialog each time is a way around this, therefore they're not specified here but in the QML.
}
{
auto getter = []()->float { return DependencyManager::get<DdeFaceTracker>()->getEyeClosingThreshold(); };