forked from qt-creator/qt-creator
QmlDesigner.propertyEditor: bugfix for Rectangle.radius
Task-number: QTCREATORBUG-4285 Reviewed-by: Marco Bubke
This commit is contained in:
@@ -31,10 +31,6 @@ QWidget {
|
|||||||
intEditor.backendValue === null)
|
intEditor.backendValue === null)
|
||||||
? null : intEditor.backendValue.value;
|
? null : intEditor.backendValue.value;
|
||||||
|
|
||||||
onBackendValueValueChanged: {
|
|
||||||
intSlider.value = intEditor.backendValue.value;
|
|
||||||
}
|
|
||||||
|
|
||||||
minimum: minimumValue
|
minimum: minimumValue
|
||||||
maximum: maximumValue
|
maximum: maximumValue
|
||||||
baseStateFlag: intEditor.baseStateFlag
|
baseStateFlag: intEditor.baseStateFlag
|
||||||
@@ -54,12 +50,16 @@ QWidget {
|
|||||||
minimum: minimumValue
|
minimum: minimumValue
|
||||||
maximum: maximumValue
|
maximum: maximumValue
|
||||||
singleStep: step
|
singleStep: step
|
||||||
|
property int valueFromBackend: intEditor.backendValue.value;
|
||||||
|
|
||||||
|
onValueFromBackendChanged: {
|
||||||
|
if (intSlider.maximum < valueFromBackend)
|
||||||
|
intSlider.maximum = valueFromBackend;
|
||||||
|
if (intSlider.minimum > valueFromBackend)
|
||||||
|
intSlider.minimum = valueFromBackend;
|
||||||
|
intSlider.value = valueFromBackend;
|
||||||
|
}
|
||||||
|
|
||||||
value: (backendValue == undefined
|
|
||||||
|| backendValue == null
|
|
||||||
|| backendValue.value == undefined
|
|
||||||
|| backendValue.value == null) ? 0 : backendValue.value
|
|
||||||
onValueChanged: {
|
onValueChanged: {
|
||||||
if (backendValue != undefined && backendValue != null)
|
if (backendValue != undefined && backendValue != null)
|
||||||
backendValue.value = value;
|
backendValue.value = value;
|
||||||
|
@@ -75,7 +75,11 @@ QWidget { //This is a special spinBox that does color coding for states
|
|||||||
property int valueFromBackend: spinBox.backendValue.value;
|
property int valueFromBackend: spinBox.backendValue.value;
|
||||||
|
|
||||||
onValueFromBackendChanged: {
|
onValueFromBackendChanged: {
|
||||||
readingFromBackend = true;
|
readingFromBackend = true;
|
||||||
|
if (maximum < valueFromBackend)
|
||||||
|
maximum = valueFromBackend;
|
||||||
|
if (minimum > valueFromBackend)
|
||||||
|
minimum = valueFromBackend;
|
||||||
value = valueFromBackend;
|
value = valueFromBackend;
|
||||||
readingFromBackend = false;
|
readingFromBackend = false;
|
||||||
evaluate();
|
evaluate();
|
||||||
|
Reference in New Issue
Block a user