From 50f12dfefaef115d86b4985c84e032222fa0808b Mon Sep 17 00:00:00 2001
From: "tatiana.novikova" <tatiana.novikova@demlabs.net>
Date: Tue, 3 Mar 2020 13:08:40 +0000
Subject: [PATCH] Bugs-3222
---
widgets/DapComboBox.qml | 12 ++++++++++++
widgets/DapComboBoxForm.ui.qml | 5 ++++-
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/widgets/DapComboBox.qml b/widgets/DapComboBox.qml
index 67452ec..b147f40 100644
--- a/widgets/DapComboBox.qml
+++ b/widgets/DapComboBox.qml
@@ -3,6 +3,18 @@ import QtQuick.Controls 2.0
DapComboBoxForm
{
+ Component.onCompleted:
+ {
+ if(isDefaultNeedToAppend && model.get(0, comboBoxTextRole[0]) !== mainLineText)
+ {
+ if(comboBoxTextRole[0] === "name")
+ model.insert(0, {name: mainLineText});
+ else if(comboBoxTextRole[0] === "text")
+ model.insert(0, {text: mainLineText});
+ currentIndex = 0;
+ }
+ }
+
delegate:
ItemDelegate
{
diff --git a/widgets/DapComboBoxForm.ui.qml b/widgets/DapComboBoxForm.ui.qml
index fab312f..082ab13 100644
--- a/widgets/DapComboBoxForm.ui.qml
+++ b/widgets/DapComboBoxForm.ui.qml
@@ -84,6 +84,8 @@ ComboBox
property var mainRow: [""]
//@detalis mainLineText Text without unneccesary part.
property string mainLineText
+ ///@details isDefaultNeedToAppend Sign to add default data to the beginning of model
+ property bool isDefaultNeedToAppend: false
width: popup.visible ? widthPopupComboBoxActive : widthPopupComboBoxNormal
@@ -134,8 +136,9 @@ ComboBox
Text
{
anchors.verticalCenter: parent.verticalCenter
+
text: (popup.visible) ?
- (index < mainRow.length ? mainRow[index] : ""):
+ (dapComboBox.currentIndex === -1 ? mainLineText : (index < mainRow.length ? mainRow[index] : "") ) :
mainLineText
font: popup.visible ?
((fontComboBox.length > index) ?
--
GitLab