From 8b4505cb094d607cc77346ea8cafd08423f40a55 Mon Sep 17 00:00:00 2001
From: Vincent van Ravesteijn <vfr@lyx.org>
Date: Mon, 2 Nov 2009 18:53:15 +0000
Subject: [PATCH] branch: 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.

see r31821.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@31833 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/frontends/qt4/ui/CharacterUi.ui | 31 +++++++++--------------------
 status.16x                          |  3 +++
 2 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/src/frontends/qt4/ui/CharacterUi.ui b/src/frontends/qt4/ui/CharacterUi.ui
index 444749b8f8..0c977c8981 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>
diff --git a/status.16x b/status.16x
index 327b3eb5ea..4a80818f35 100644
--- a/status.16x
+++ b/status.16x
@@ -255,6 +255,9 @@ What's new
 - Set the correct language after dissolving an Inset. This can give
   strange effect especially when dissolving an ERT (bug 6292).
 
+- Fix the appaerance of the combo boxes in the Text Style dialog
+  (bug 5063).
+
 
 * DOCUMENTATION AND LOCALIZATION