feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Fix [None] item not visible

Browse Source 
* Fix [None] item not visible in ComboBox drop down menu.
* valueRole of items shouldn't be removed when textRole is empty.
* Regex is modified for searching in ComboBoxes when it has idAndName
role.

Fixes: QDS-13655
Change-Id: I5c82c418bca1bb5dd9f389741422841a58a44c41
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
This commit is contained in:
Ali Kianian
2024-09-12 15:26:36 +03:00
parent ccf6b7032f
commit 1cc793d02d
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ItemFilterComboBox.qml
View File

@@ -2,7 +2,7 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
import QtQuick import QtQuick
import HelperWidgets 2.0 as HelperWidgets import HelperWidgets as HelperWidgets
HelperWidgets.ComboBox { HelperWidgets.ComboBox {
id: comboBox id: comboBox
@@ -15,7 +15,10 @@ HelperWidgets.ComboBox {
valueRole: "id" valueRole: "id"
textRole: (comboBox.typeFilter === "QtQuick3D.Texture") ? "idAndName" : "id" textRole: (comboBox.typeFilter === "QtQuick3D.Texture") ? "idAndName" : "id"
validator: RegularExpressionValidator { regularExpression: /(^$|^[a-z_]\w*)/ } validator: RegularExpressionValidator {
regularExpression: (comboBox.textRole !== "id") ? /^(\w+\s)*\w+\s\[[a-z_]\w*\]/
: /(^$|^[a-z_]\w*)/
}
HelperWidgets.ItemFilterModel { HelperWidgets.ItemFilterModel {
id: itemFilterModel id: itemFilterModel
@@ -90,7 +93,7 @@ HelperWidgets.ComboBox {
} else { } else {
let valueData = (comboBox.valueRole === "") let valueData = (comboBox.valueRole === "")
? comboBox.editText ? comboBox.editText
: itemFilterModel.modelItemData(comboBox.currentIndex - 1)[comboBox.valueRole] : comboBox.model[comboBox.currentIndex][comboBox.valueRole]
if (comboBox.backendValue.expression !== valueData) if (comboBox.backendValue.expression !== valueData)
comboBox.backendValue.expression = valueData comboBox.backendValue.expression = valueData
@@ -98,28 +101,29 @@ HelperWidgets.ComboBox {
comboBox.dirty = false comboBox.dirty = false
} }
Repeater { QtObject {
id: optionsList id: optionsList
property var localModel: [] property var model
function updateModel() { function updateModel() {
optionsList.localModel = [] let localModel = []
if (comboBox.textRole !== "" && comboBox.valueRole !== "") { if (comboBox.textRole !== "") {
let defaultItem = {} let defaultItem = {}
defaultItem[comboBox.textRole] = comboBox.defaultItem defaultItem[comboBox.textRole] = comboBox.defaultItem
if (comboBox.valueRole !== "" && comboBox.textRole !== comboBox.valueRole)
defaultItem[comboBox.valueRole] = "" defaultItem[comboBox.valueRole] = ""
optionsList.localModel.push(defaultItem) localModel.push(defaultItem)
} else { } else {
optionsList.localModel.push(comboBox.defaultItem) localModel.push(comboBox.defaultItem)
} }
let rows = itemFilterModel.rowCount() let rows = itemFilterModel.rowCount()
for (let i = 0; i < rows; ++i) for (let i = 0; i < rows; ++i)
optionsList.localModel.push(itemFilterModel.modelItemData(i)) localModel.push(itemFilterModel.modelItemData(i))
optionsList.model = optionsList.localModel // trigger on change handler optionsList.model = localModel // trigger on change handler
} }
} }
} }