Index: sources/gui/qml/compounds/SettingsSlider.qml =================================================================== diff -u -r69c86c57349b7d4a6ba47a801ba27b1c470fade5 -rabb959f145f8af64bab3b8f24314bf0ba8f3bb0e --- sources/gui/qml/compounds/SettingsSlider.qml (.../SettingsSlider.qml) (revision 69c86c57349b7d4a6ba47a801ba27b1c470fade5) +++ sources/gui/qml/compounds/SettingsSlider.qml (.../SettingsSlider.qml) (revision abb959f145f8af64bab3b8f24314bf0ba8f3bb0e) @@ -12,26 +12,41 @@ property alias value : _slider.value property alias iconImage : _image.source property alias slider : _slider + property alias text : _text.text + property bool textOnly : false - readonly property color sliderBkgndColor: Colors.dialogShadowColor + property color sliderBkgndColor: Colors.dialogShadowColor readonly property color sliderColor : Colors.highlightProgressBar readonly property color valueColor : Colors.dialogValueColor readonly property int sliderMargins : Variables.defaultMargin * 3.5 // margins added to visible background to make a larger hitbox readonly property int hitboxMargins : Variables.defaultMargin * -2 // negative margins added to create larger hitbox for touch readonly property int knobDiameter : 20 readonly property int hitboxHeight : 70 + readonly property int textWidth : 200 Image { id : _image anchors { left : parent.left verticalCenter : parent.verticalCenter } + visible : ! _root.textOnly } + Text { id : _text + anchors { + left : parent.left + verticalCenter : parent.verticalCenter + } + font.pixelSize : Fonts.fontPixelContainerTitle + color : Colors.offWhite + visible : _root.textOnly + width : _root.textWidth + } + Slider { id: _slider anchors { - left : _image.right + left : _root.textOnly ? _text.right : _image.right leftMargin : _root.hitboxMargins right : parent.right rightMargin : _root.hitboxMargins