Commit b63f98a5 authored by Tim Jenssen's avatar Tim Jenssen Committed by Thomas Hartmann

QmlDesigner: fix warning if colorLogic does not exist

The idea that these spinboxes should be a mashup
with a slider was never completely implented.

Change-Id: I049f0db595fcce0fb59fad550ceb1a4ca2b415bb
Reviewed-by: default avatarThomas Hartmann <Thomas.Hartmann@theqtcompany.com>
parent 23168e93
......@@ -298,13 +298,9 @@ Item {
elide: Text.ElideRight
anchors.verticalCenter: parent.verticalCenter
}
SliderSpinBox {
DoubleSpinBox {
id: hueSlider2
//value: colorButton.hue
decimals: 2
stepSize: 0.1
minimumValue: 0
maximumValue: 1
onValueChanged: {
if (colorButton.hue !== value && !colorButton.block) {
colorButton.hue = value
......@@ -325,13 +321,9 @@ Item {
anchors.verticalCenter: parent.verticalCenter
}
SliderSpinBox {
DoubleSpinBox {
id: saturationSlider
//value: colorButton.saturation
decimals: 2
stepSize: 0.1
minimumValue: 0
maximumValue: 1
onValueChanged: {
if (colorButton.saturation !== value && !colorButton.block) {
colorButton.saturation = value
......@@ -351,13 +343,9 @@ Item {
elide: Text.ElideRight
anchors.verticalCenter: parent.verticalCenter
}
SliderSpinBox {
DoubleSpinBox {
id: lightnessSlider
//value: colorButton.lightness
decimals: 2
stepSize: 0.1
minimumValue: 0
maximumValue: 1
onValueChanged: {
if (colorButton.lightness !== value && !colorButton.block) {
colorButton.lightness = value
......@@ -378,13 +366,9 @@ Item {
anchors.verticalCenter: parent.verticalCenter
}
SliderSpinBox {
DoubleSpinBox {
id: alphaSlider
decimals: 2
stepSize: 0.1
//value: colorButton.alpha
minimumValue: 0
maximumValue: 1
onValueChanged: {
if (colorButton.alpha !== value && !colorButton.block) {
colorButton.alpha = value
......
......@@ -29,8 +29,12 @@ import QtQuick.Controls 1.0
SpinBox {
id: spinBox
width: 76
decimals: 2
stepSize: 0.1
minimumValue: 0
maximumValue: 1
property color textColor: colorLogic.textColor
property color textColor: creatorTheme.PanelTextColorLight
style: CustomSpinBoxStyle {
......
......@@ -31,7 +31,7 @@ ScrollView 2.0 ScrollView.qml
SecondColumnLayout 2.0 SecondColumnLayout.qml
Section 2.0 Section.qml
SectionLayout 2.0 SectionLayout.qml
SliderSpinBox 2.0 SliderSpinBox.qml
DoubleSpinBox 2.0 DoubleSpinBox.qml
SpinBox 2.0 SpinBox.qml
StandardTextSection 2.0 StandardTextSection.qml
Tab 2.0 Tab.qml
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment