Skip to content
Snippets Groups Projects
Commit d5d2bb96 authored by tatiana.novikova's avatar tatiana.novikova
Browse files

Merge branch 'features-3048' of...

Merge branch 'features-3048' of https://gitlab.demlabs.net/cellframe/libdap-qt-ui-qml into features-3048
parents a50e8743 961c971d
No related branches found
No related tags found
1 merge request!28Features 3048
......@@ -61,6 +61,7 @@ DapComboBoxForm
{
id: textRepeater
model: comboBoxTextRole.length
DapText
{
id: textComboBoxDelegate
......@@ -96,7 +97,6 @@ DapComboBoxForm
mainLineText = comboBoxFontMetric.elidedText(fullText, Text.ElideRight, rectangleTextComboBox.width, Qt.TextShowMnemonic);
}
}
}
}
......@@ -114,6 +114,7 @@ DapComboBoxForm
{
if(rectangleTextComboBox.comboBoxCurrentIndex !== -1)
updateMainRow(comboBoxFontMetric, rectangleTextComboBox.comboBoxIndex, rectangleTextComboBox.comboBoxCurrentIndex, textRow.elTextArray, rectangleTextComboBox.width);
}
}
......@@ -168,5 +169,4 @@ DapComboBoxForm
}
}
/////////////////
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment