Skip to content
Snippets Groups Projects
Commit 446a8940 authored by Henning Gründl's avatar Henning Gründl Committed by Qt Cherry-pick Bot
Browse files

Fix IdComboBox default item 


Change-Id: Id463d2c33aeb702e1e4be90eb77a710c404fc928
Reviewed-by: default avatarThomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: default avatarMiikka Heikkinen <miikka.heikkinen@qt.io>
(cherry picked from commit 33f435a4)
Reviewed-by: default avatarQt Cherry-pick Bot <cherrypick_bot@qt-project.org>
parent 670d8308
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/imports/effectlib/designer/IdComboBox.qml
+ 12
− 6
View file @ 446a8940
......@@ -46,11 +46,11 @@ HelperWidgets.ComboBox {
modelNodeBackendProperty: modelNodeBackend
}
property string defaultItem: qsTr("[None]")
property string defaultItem: qsTr("None")
property string textValue: comboBox.backendValue.expression
property bool block: false
property bool dirty: true
property var editRegExp: /^[a-z_]\w*|^\[None\]$/
property var editRegExp: /^[a-z_]\w*/
onTextValueChanged: {
if (comboBox.block)
......@@ -64,7 +64,8 @@ HelperWidgets.ComboBox {
onEditTextChanged: {
comboBox.dirty = true
colorLogic.errorState = !(editRegExp.exec(comboBox.editText) !== null)
colorLogic.errorState = !(editRegExp.exec(comboBox.editText) !== null
|| comboBox.editText === parenthesize(defaultItem))
}
onFocusChanged: {
if (comboBox.dirty)
......@@ -91,12 +92,12 @@ HelperWidgets.ComboBox {
if (text === "") {
comboBox.currentIndex = 0
comboBox.editText = comboBox.defaultItem
comboBox.editText = parenthesize(comboBox.defaultItem)
} else {
if (comboBox.currentIndex === -1)
comboBox.editText = text
else if (comboBox.currentIndex === 0)
comboBox.editText = comboBox.defaultItem
comboBox.editText = parenthesize(comboBox.defaultItem)
}
if (comboBox.currentIndex === 0) {
......@@ -111,7 +112,12 @@ HelperWidgets.ComboBox {
function addDefaultItem(arr)
{
var copy = arr.slice()
copy.unshift(comboBox.defaultItem)
copy.unshift(parenthesize(comboBox.defaultItem))
return copy
}
function parenthesize(value)
{
return "[" + value + "]"
}
}
src/imports/materiallib/designer/IdComboBox.qml
+ 12
− 6
View file @ 446a8940
......@@ -46,11 +46,11 @@ HelperWidgets.ComboBox {
modelNodeBackendProperty: modelNodeBackend
}
property string defaultItem: qsTr("[None]")
property string defaultItem: qsTr("None")
property string textValue: comboBox.backendValue.expression
property bool block: false
property bool dirty: true
property var editRegExp: /^[a-z_]\w*|^\[None\]$/
property var editRegExp: /^[a-z_]\w*/
onTextValueChanged: {
if (comboBox.block)
......@@ -64,7 +64,8 @@ HelperWidgets.ComboBox {
onEditTextChanged: {
comboBox.dirty = true
colorLogic.errorState = !(editRegExp.exec(comboBox.editText) !== null)
colorLogic.errorState = !(editRegExp.exec(comboBox.editText) !== null
|| comboBox.editText === parenthesize(defaultItem))
}
onFocusChanged: {
if (comboBox.dirty)
......@@ -91,12 +92,12 @@ HelperWidgets.ComboBox {
if (text === "") {
comboBox.currentIndex = 0
comboBox.editText = comboBox.defaultItem
comboBox.editText = parenthesize(comboBox.defaultItem)
} else {
if (comboBox.currentIndex === -1)
comboBox.editText = text
else if (comboBox.currentIndex === 0)
comboBox.editText = comboBox.defaultItem
comboBox.editText = parenthesize(comboBox.defaultItem)
}
if (comboBox.currentIndex === 0) {
......@@ -111,7 +112,12 @@ HelperWidgets.ComboBox {
function addDefaultItem(arr)
{
var copy = arr.slice()
copy.unshift(comboBox.defaultItem)
copy.unshift(parenthesize(comboBox.defaultItem))
return copy
}
function parenthesize(value)
{
return "[" + value + "]"
}
}
src/imports/quick3d/designer/IdComboBox.qml
+ 12
− 6
View file @ 446a8940
......@@ -46,11 +46,11 @@ HelperWidgets.ComboBox {
modelNodeBackendProperty: modelNodeBackend
}
property string defaultItem: qsTr("[None]")
property string defaultItem: qsTr("None")
property string textValue: comboBox.backendValue.expression
property bool block: false
property bool dirty: true
property var editRegExp: /^[a-z_]\w*|^\[None\]$/
property var editRegExp: /^[a-z_]\w*/
onTextValueChanged: {
if (comboBox.block)
......@@ -64,7 +64,8 @@ HelperWidgets.ComboBox {
onEditTextChanged: {
comboBox.dirty = true
colorLogic.errorState = !(editRegExp.exec(comboBox.editText) !== null)
colorLogic.errorState = !(editRegExp.exec(comboBox.editText) !== null
|| comboBox.editText === parenthesize(defaultItem))
}
onFocusChanged: {
if (comboBox.dirty)
......@@ -91,12 +92,12 @@ HelperWidgets.ComboBox {
if (text === "") {
comboBox.currentIndex = 0
comboBox.editText = comboBox.defaultItem
comboBox.editText = parenthesize(comboBox.defaultItem)
} else {
if (comboBox.currentIndex === -1)
comboBox.editText = text
else if (comboBox.currentIndex === 0)
comboBox.editText = comboBox.defaultItem
comboBox.editText = parenthesize(comboBox.defaultItem)
}
if (comboBox.currentIndex === 0) {
......@@ -111,7 +112,12 @@ HelperWidgets.ComboBox {
function addDefaultItem(arr)
{
var copy = arr.slice()
copy.unshift(comboBox.defaultItem)
copy.unshift(parenthesize(comboBox.defaultItem))
return copy
}
function parenthesize(value)
{
return "[" + value + "]"
}
}
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