GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-29 07:14:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14885 from Ultimaker/CURA-10374_fix_combobobobobox

Browse Source 
Cura 10374 fix combobobobobox
This commit is contained in:
Jelle Spijker 2023-03-15 12:44:55 +01:00 committed by GitHub
commit dc22a4980c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
resources/qml/MachineSettings/ComboBoxWithOptions.qml
View File

@ -65,32 +65,30 @@ UM.TooltipArea
{
id: defaultOptionsModel
function updateModel()
{
clear()
function updateModel() {
clear();
if(!propertyProvider.properties.options)
{
return
if (!propertyProvider.properties.options) {
return;
}
if (typeof propertyProvider.properties["options"] === "string")
{
return
if (typeof propertyProvider.properties["options"] === "string") {
return;
}
let currentIndex = -1;
const keys = propertyProvider.properties["options"].keys();
for (let index = 0; index < propertyProvider.properties["options"].keys().length; index ++) {
const key = propertyProvider.properties["options"].keys()[index];
const value = propertyProvider.properties["options"][key];
for (var i = 0; i < propertyProvider.properties["options"].keys().length; i++)
{
var key = propertyProvider.properties["options"].keys()[i]
var value = propertyProvider.properties["options"][key]
append({ text: value, code: key })
if (propertyProvider.properties.value === key)
{
comboBox.currentIndex = i
if (propertyProvider.properties.value === key) {
currentIndex = index;
}
defaultOptionsModel.append({ text: value, value: key });
}
comboBox.currentIndex = currentIndex;
}
Component.onCompleted: updateModel()
@ -114,36 +112,28 @@ UM.TooltipArea
model: defaultOptionsModel
textRole: "text"
currentIndex:
{
var currentValue = propertyProvider.properties.value
var index = 0
for (var i = 0; i < model.count; i++)
{
if (model.get(i).value == currentValue)
{
index = i
break
currentIndex: function () {
const currentValue = propertyProvider.properties.value
for (let i = 0; i < model.count; i ++) {
if (model.get(i).value === currentValue) {
return i;
}
}
return index
return -1;
}
onActivated:
{
var newValue = model.get(index).value
if (propertyProvider.properties.value !== newValue && newValue !== undefined)
{
if (setValueFunction !== null)
{
setValueFunction(newValue)
onActivated: function (index) {
const key = propertyProvider.properties["options"].keys()[index];
const newValue = model.get(index).value;
if (propertyProvider.properties.value !== newValue && newValue !== undefined) {
if (setValueFunction !== null) {
setValueFunction(newValue);
} else {
propertyProvider.setPropertyValue("value", newValue);
}
else
{
propertyProvider.setPropertyValue("value", newValue)
}
forceUpdateOnChangeFunction()
afterOnEditingFinishedFunction()
forceUpdateOnChangeFunction();
afterOnEditingFinishedFunction();
}
}
}