From 8e6ac03c75ad8ef25080c18b9cf6358a7581557c Mon Sep 17 00:00:00 2001
From: Gaute Lindkvist <lindkvis@gmail.com>
Date: Fri, 5 Apr 2019 09:00:32 +0200
Subject: [PATCH] #4282 Let ComboBoxEditor be narrowed smaller than full text
 string by default

---
 Fwk/AppFwk/cafUserInterface/cafPdmUiComboBoxEditor.cpp | 5 +++++
 Fwk/AppFwk/cafUserInterface/cafPdmUiComboBoxEditor.h   | 7 +++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiComboBoxEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiComboBoxEditor.cpp
index 7d7797b4dc..62783fd7a8 100644
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiComboBoxEditor.cpp
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiComboBoxEditor.cpp
@@ -215,6 +215,11 @@ void PdmUiComboBoxEditor::configureAndUpdateUi(const QString& uiConfigName)
         {
             m_comboBox->setSizeAdjustPolicy(QComboBox::AdjustToContents);
         }
+        else if (attributes.minimumContentsLength > 0)
+        {
+            m_comboBox->setSizeAdjustPolicy(QComboBox::AdjustToMinimumContentsLength);
+            m_comboBox->setMinimumContentsLength(attributes.minimumContentsLength);
+        }
 
         m_comboBox->blockSignals(false);
     }
diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiComboBoxEditor.h b/Fwk/AppFwk/cafUserInterface/cafPdmUiComboBoxEditor.h
index addd35e0d7..5655f3de73 100644
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiComboBoxEditor.h
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiComboBoxEditor.h
@@ -58,14 +58,17 @@ class PdmUiComboBoxEditorAttribute : public PdmUiEditorAttribute
 public:
     PdmUiComboBoxEditorAttribute()
     {
-        adjustWidthToContents = false;
+        adjustWidthToContents      = false;
         showPreviousAndNextButtons = false;
+        minimumContentsLength      = 8;
     }
 
 public:
     bool adjustWidthToContents;
     bool showPreviousAndNextButtons;
-    
+    int  minimumContentsLength; // The length of string to adjust to if adjustWidthToContents = false.
+                                // Set to <= 0 to ignore and use AdjustToContentsOnFirstShow instead
+
     QString nextButtonText;
     QString prevButtonText;
 };