- Set the minimum width so that the value text will be readable.

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@23285 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Nov 9, 2014 · 8afa180 · 8afa180
1 parent 17b9de4
commit 8afa180
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/OMEdit/OMEditGUI/Component/ComponentProperties.cpp b/OMEdit/OMEditGUI/Component/ComponentProperties.cpp
@@ -265,8 +265,6 @@ void Parameter::createValueWidget(OMCProxy *pOMCProxy, QString className)
       mpValueComboBox->addItem("", "");
       mpValueComboBox->addItem("true", "true");
       mpValueComboBox->addItem("false", "false");
-      /* Set the minimum width so atleast it can show the value when scroll bars are on */
-      mpValueComboBox->setMinimumWidth(100);
       connect(mpValueComboBox, SIGNAL(currentIndexChanged(int)), SLOT(valueComboBoxChanged(int)));
       break;
     case Parameter::Enumeration:
@@ -277,21 +275,18 @@ void Parameter::createValueWidget(OMCProxy *pOMCProxy, QString className)
       for (i = 0 ; i < enumerationLiterals.size(); i++) {
         mpValueComboBox->addItem(enumerationLiterals[i], className + "." + enumerationLiterals[i]);
       }
-      /* Set the minimum width so atleast it can show the value when scroll bars are on */
-      mpValueComboBox->setMinimumWidth(100);
       connect(mpValueComboBox, SIGNAL(currentIndexChanged(int)), SLOT(valueComboBoxChanged(int)));
       break;
     case Parameter::Normal:
     default:
       mpValueTextBox = new QLineEdit;
-      /* Set the minimum width so atleast it can show the value when scroll bars are on */
-      mpValueTextBox->setMinimumWidth(100);
       break;
   }
 }
 
 void Parameter::setValueWidget(QString value, bool defaultValue)
 {
+  QFontMetrics fm = QFontMetrics(QFont());
   switch (mValueType) {
     case Parameter::Boolean:
     case Parameter::Enumeration:
@@ -300,6 +295,9 @@ void Parameter::setValueWidget(QString value, bool defaultValue)
       } else {
         mpValueComboBox->lineEdit()->setText(value);
       }
+      /* Set the minimum width so that the value text will be readable */
+      fm = QFontMetrics(mpValueComboBox->lineEdit()->font());
+      mpValueComboBox->setMinimumWidth(fm.width(value) + 50);
       break;
     case Parameter::Normal:
     default:
@@ -308,6 +306,9 @@ void Parameter::setValueWidget(QString value, bool defaultValue)
       } else {
         mpValueTextBox->setText(value);
       }
+      /* Set the minimum width so that the value text will be readable */
+      fm = QFontMetrics(mpValueTextBox->font());
+      mpValueTextBox->setMinimumWidth(fm.width(value) + 50);
       mpValueTextBox->setCursorPosition(0); /* move the cursor to start so that parameter value will show up from start instead of end. */
       break;
   }