Features 2603

[*] Update calculating and deleting the unnecessary part of text at comboBox

widgets/DapComboBox.qml

-import QtQuick 2.0
+import QtQuick 2.4
 import QtQuick.Controls 2.0
 
 DapComboBoxForm
@@ -30,10 +30,51 @@ DapComboBoxForm
             anchors.fill: parent
             anchors.topMargin: paddingTopItemDelegate
             anchors.leftMargin: popup.visible ? sidePaddingActive : sidePaddingNormal
+            anchors.rightMargin: popup.visible ? sidePaddingActive : sidePaddingNormal
             font:dapComboBox.font
-            text: if(index != currentIndex)
-                      return modelData;
-                  else return ""
+            //Calculates various properties of a given string of text for a particular font
+            TextMetrics
+            {
+                id: tm
+                font: dapComboBox.font
+                elide: Text.ElideRight
+                text: modelData
+                elideWidth:
+                {
+                    if(index != currentIndex)
+                        return widthPopupComboBoxActive - 2*sidePaddingActive;
+                    else
+                        return widthPopupComboBoxNormal - indicatorWidth - indicatorLeftInterval;
+                }
+            }
+            FontMetrics
+            {
+                id: fm
+                font: dapComboBox.font
+            }
+            text:
+            {
+                if(index != currentIndex)
+                {
+                    if(tm.elidedText.length < tm.text.length)
+                        return tm.elidedText.substring(0, tm.elidedText.length-1) +
+                                ((fm.tightBoundingRect(tm.elidedText.substring(0, tm.elidedText.length-1)).width + fm.tightBoundingRect(tm.text.charAt(tm.elidedText.length-1) + '..').width) < tm.elideWidth ?
+                                     (tm.text.charAt(tm.elidedText.length-1) + '..')
+                                        : '..');
+                    return tm.elidedText.replace('…', '..');
+                }
+                else
+                {
+                    if(tm.elidedText.length < tm.text.length)
+                        mainLineText = tm.elidedText.substring(0, tm.elidedText.length-1) +
+                                ((fm.tightBoundingRect(tm.elidedText.substring(0, tm.elidedText.length-1)).width + fm.tightBoundingRect(tm.text.charAt(tm.elidedText.length-1) + '..').width) < tm.elideWidth ?
+                                     (tm.text.charAt(tm.elidedText.length-1) + '..')
+                                        : '..');
+                    else
+                        mainLineText = tm.elidedText.replace('…', '..');
+                    return "";
+                }
+            }
             color: hovered ? hilightColorText : normalColorText
         }