From: Vincent van Ravesteijn <vfr@lyx.org>
Date: Mon, 2 Nov 2009 02:21:10 +0000 (+0000)
Subject: Fix bug #5063: We don't want the combo boxes to adjust to the contents. Also, make... 
X-Git-Tag: 2.0.0~5246
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=8245ec900b141c51b7046bad41069ce7c211e4c4;p=features.git

Fix bug #5063: We don't want the combo boxes to adjust to the contents. Also, make the logic exactly the same for all comboboxes.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31821 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/frontends/qt4/ui/CharacterUi.ui b/src/frontends/qt4/ui/CharacterUi.ui
index cd9d036da1..eedcc0a5af 100644
--- a/src/frontends/qt4/ui/CharacterUi.ui
+++ b/src/frontends/qt4/ui/CharacterUi.ui
@@ -64,9 +64,6 @@
          <property name="toolTip" >
           <string>Font shape</string>
          </property>
-         <property name="sizeAdjustPolicy" >
-          <enum>QComboBox::AdjustToContents</enum>
-         </property>
         </widget>
        </item>
        <item row="2" column="0" >
@@ -95,9 +92,6 @@
          <property name="toolTip" >
           <string>Font series</string>
          </property>
-         <property name="sizeAdjustPolicy" >
-          <enum>QComboBox::AdjustToContents</enum>
-         </property>
         </widget>
        </item>
        <item row="4" column="1" >
@@ -113,9 +107,6 @@
          <property name="toolTip" >
           <string>Language</string>
          </property>
-         <property name="sizeAdjustPolicy" >
-          <enum>QComboBox::AdjustToContents</enum>
-         </property>
         </widget>
        </item>
        <item row="0" column="1" >
@@ -131,9 +122,6 @@
          <property name="toolTip" >
           <string>Font family</string>
          </property>
-         <property name="sizeAdjustPolicy" >
-          <enum>QComboBox::AdjustToContents</enum>
-         </property>
         </widget>
        </item>
        <item row="3" column="1" >
@@ -149,9 +137,6 @@
          <property name="toolTip" >
           <string>Font color</string>
          </property>
-         <property name="sizeAdjustPolicy" >
-          <enum>QComboBox::AdjustToContents</enum>
-         </property>
         </widget>
        </item>
        <item row="4" column="0" >
@@ -235,7 +220,7 @@
            <widget class="QComboBox" name="sizeCO" >
             <property name="sizePolicy" >
              <sizepolicy>
-              <hsizetype>1</hsizetype>
+              <hsizetype>3</hsizetype>
               <vsizetype>0</vsizetype>
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
@@ -244,9 +229,6 @@
             <property name="toolTip" >
              <string>Font size</string>
             </property>
-            <property name="sizeAdjustPolicy" >
-             <enum>QComboBox::AdjustToContents</enum>
-            </property>
            </widget>
           </item>
          </layout>
@@ -279,12 +261,17 @@
           </item>
           <item>
            <widget class="QComboBox" name="miscCO" >
+            <property name="sizePolicy" >
+             <sizepolicy>
+              <hsizetype>3</hsizetype>
+              <vsizetype>0</vsizetype>
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>           
             <property name="toolTip" >
              <string>Other font settings</string>
             </property>
-            <property name="sizeAdjustPolicy" >
-             <enum>QComboBox::AdjustToContents</enum>
-            </property>
            </widget>
           </item>
          </layout>