Skip to content

Commit b833e46

Browse files
committed
ValueList warnings cleanup
1 parent bc84c26 commit b833e46

File tree

2 files changed

+18
-8
lines changed

2 files changed

+18
-8
lines changed

src/framework/uicomponents/qml/Muse/UiComponents/ValueList.qml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ Item {
277277

278278
isSelected: selectionModel.hasSelection && selectionModel.isSelected(modelIndex)
279279
readOnly: root.readOnly
280-
keyReadOnly: root.isReadOnlyFunction(model.index)
280+
keyReadOnly: root.isKeyEditable ? root.isReadOnlyFunction(model.index) : true
281281

282282
drawZebra: root.drawZebra
283283
keyColumnWidth: root.keyColumnWidth

src/framework/uicomponents/qml/Muse/UiComponents/internal/ValueListItem.qml

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,8 @@ ListItemBlank {
145145
}
146146

147147
Connections {
148-
target: keyLoader.item
148+
target: (root.keysEditable && !root.keyReadOnly) ? keyLoader.item : null
149+
ignoreUnknownSignals: true
149150
function onChanged(newVal) {
150151
root.item[keyRoleName] = newVal
151152
listItem.keyEdited(newVal)
@@ -205,9 +206,15 @@ ListItemBlank {
205206
}
206207
}
207208

208-
valueLoader.item.navPanel = valueLoader.navPanel
209-
valueLoader.item.navRow = valueLoader.navRow
210-
valueLoader.item.navColumn = valueLoader.navColumn
209+
if (valueLoader.item && valueLoader.item.hasOwnProperty("navPanel")) {
210+
valueLoader.item.navPanel = valueLoader.navPanel
211+
}
212+
if (valueLoader.item && valueLoader.item.hasOwnProperty("navRow")) {
213+
valueLoader.item.navRow = valueLoader.navRow
214+
}
215+
if (valueLoader.item && valueLoader.item.hasOwnProperty("navColumn")) {
216+
valueLoader.item.navColumn = valueLoader.navColumn
217+
}
211218
}
212219

213220
onValChanged: {
@@ -252,9 +259,12 @@ ListItemBlank {
252259
onLoaded: {
253260
textLoader.item.val = textLoader.val ?? ""
254261

255-
textLoader.item.navPanel = textLoader.navPanel
256-
textLoader.item.navRow = textLoader.navRow
257-
textLoader.item.navColumn = textLoader.navColumn
262+
if (textLoader.item && textLoader.item.hasOwnProperty("navPanel")) {
263+
textLoader.item.navPanel = textLoader.navPanel
264+
}
265+
if (textLoader.item && textLoader.item.hasOwnProperty("navRow")) {
266+
textLoader.item.navRow = textLoader.navRow
267+
}
258268
}
259269

260270
onValChanged: {

0 commit comments

Comments
 (0)