From d1852d4b956066b3c33152e2e85be0ab956a2e6b Mon Sep 17 00:00:00 2001 From: "tatiana.novikova" <tatiana.novikova@demlabs.net> Date: Sat, 11 Jan 2020 15:38:59 +0300 Subject: [PATCH] [*] Update comments --- widgets/DapComboBox.qml | 8 +++++--- widgets/DapComboBoxForm.ui.qml | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/widgets/DapComboBox.qml b/widgets/DapComboBox.qml index 18faa38..8bd71b4 100644 --- a/widgets/DapComboBox.qml +++ b/widgets/DapComboBox.qml @@ -5,7 +5,8 @@ DapComboBoxForm { id:dapComboBox - property int stringSize //temporary + //temporary variable for the calculating unnecessary part of text + property int stringSize delegate:ItemDelegate { @@ -33,12 +34,13 @@ DapComboBoxForm anchors.topMargin: paddingTopItemDelegate anchors.leftMargin: popup.visible ? sidePaddingActive : sidePaddingNormal font:dapComboBox.font - TextMetrics //calculates various properties of a given string of text for a particular font + //Calculates various properties of a given string of text for a particular font + TextMetrics { id: tm font: dapComboBox.font elide: Text.ElideRight - elideWidth: parent.width - (popup.visible ? sidePaddingActive : sidePaddingNormal) * 2 - 8*pt//- indicatorWidth + elideWidth: parent.width - (popup.visible ? sidePaddingActive : sidePaddingNormal) * 2 - 8*pt text: modelData } text: diff --git a/widgets/DapComboBoxForm.ui.qml b/widgets/DapComboBoxForm.ui.qml index 2764767..c16956c 100644 --- a/widgets/DapComboBoxForm.ui.qml +++ b/widgets/DapComboBoxForm.ui.qml @@ -104,7 +104,7 @@ ComboBox id:textTopComboBox anchors.fill: parent anchors.leftMargin: popup.visible ? sidePaddingActive : sidePaddingNormal - text: mainLineText //parent.displayText + text: mainLineText font: parent.font color: popup.visible ? hilightColorTopText : normalColorTopText verticalAlignment: Text.AlignVCenter -- GitLab