Merge pull request #135 from astrofrog/no-expand-combo-boxes

Make sure the combo boxes don’t expand if component names are long
glue-viz · May 3, 2016 · db1b7d2 · db1b7d2
2 parents 69bc973 + b1e86ce
commit db1b7d2
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 8 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,8 @@
 0.3 (unreleased)
 ----------------
+
+- Make sure combo boxes don't expand if component names are long. [#135]
+
 - Add icon for rotate view. [#128]
 
 - Add back the fov=60. [#124]

diff --git a/glue_vispy_viewers/common/viewer_options.ui b/glue_vispy_viewers/common/viewer_options.ui
@@ -47,7 +47,11 @@
     </widget>
    </item>
    <item row="7" column="3" colspan="3">
-    <widget class="QComboBox" name="combo_z_attribute"/>
+    <widget class="QComboBox" name="combo_z_attribute">
+     <property name="sizeAdjustPolicy">
+      <enum>QComboBox::AdjustToMinimumContentsLength</enum>
+     </property>
+    </widget>
    </item>
    <item row="6" column="2">
     <widget class="QLabel" name="label">
@@ -124,7 +128,11 @@
     </widget>
    </item>
    <item row="0" column="3" colspan="3">
-    <widget class="QComboBox" name="combo_x_attribute"/>
+    <widget class="QComboBox" name="combo_x_attribute">
+     <property name="sizeAdjustPolicy">
+      <enum>QComboBox::AdjustToMinimumContentsLength</enum>
+     </property>
+    </widget>
    </item>
    <item row="7" column="2">
     <widget class="QLabel" name="x_lab">
@@ -188,7 +196,11 @@
     <widget class="QLineEdit" name="value_x_max"/>
    </item>
    <item row="4" column="3" colspan="3">
-    <widget class="QComboBox" name="combo_y_attribute"/>
+    <widget class="QComboBox" name="combo_y_attribute">
+     <property name="sizeAdjustPolicy">
+      <enum>QComboBox::AdjustToMinimumContentsLength</enum>
+     </property>
+    </widget>
    </item>
    <item row="0" column="2">
     <widget class="QLabel" name="x_lab">

diff --git a/glue_vispy_viewers/isosurface/layer_style_widget.ui b/glue_vispy_viewers/isosurface/layer_style_widget.ui
@@ -71,7 +71,11 @@
     <widget class="QLineEdit" name="value_max"/>
    </item>
    <item row="0" column="1" colspan="2">
-    <widget class="QComboBox" name="combo_attribute"/>
+    <widget class="QComboBox" name="combo_attribute">
+     <property name="sizeAdjustPolicy">
+      <enum>QComboBox::AdjustToMinimumContentsLength</enum>
+     </property>
+    </widget>
    </item>
   </layout>
  </widget>

diff --git a/glue_vispy_viewers/scatter/layer_style_widget.ui b/glue_vispy_viewers/scatter/layer_style_widget.ui
@@ -78,7 +78,11 @@
            </widget>
           </item>
           <item>
-           <widget class="QComboBox" name="combo_size_attribute"/>
+           <widget class="QComboBox" name="combo_size_attribute">
+            <property name="sizeAdjustPolicy">
+             <enum>QComboBox::AdjustToMinimumContentsLength</enum>
+            </property>
+           </widget>
           </item>
           <item>
            <widget class="QLineEdit" name="value_fixed_size"/>
@@ -209,7 +213,11 @@
            </widget>
           </item>
           <item>
-           <widget class="QComboBox" name="combo_cmap_attribute"/>
+           <widget class="QComboBox" name="combo_cmap_attribute">
+            <property name="sizeAdjustPolicy">
+             <enum>QComboBox::AdjustToMinimumContentsLength</enum>
+            </property>
+           </widget>
           </item>
           <item>
            <widget class="QColorBox" name="label_color">
@@ -273,7 +281,11 @@
            <number>0</number>
           </property>
           <item>
-           <widget class="QColormapCombo" name="combo_cmap"/>
+           <widget class="QColormapCombo" name="combo_cmap">
+            <property name="sizeAdjustPolicy">
+             <enum>QComboBox::AdjustToMinimumContentsLength</enum>
+            </property>
+           </widget>
           </item>
          </layout>
         </widget>

diff --git a/glue_vispy_viewers/volume/layer_style_widget.ui b/glue_vispy_viewers/volume/layer_style_widget.ui
@@ -85,7 +85,11 @@
     <widget class="QLineEdit" name="value_max"/>
    </item>
    <item row="0" column="1" colspan="2">
-    <widget class="QComboBox" name="combo_attribute"/>
+    <widget class="QComboBox" name="combo_attribute">
+     <property name="sizeAdjustPolicy">
+      <enum>QComboBox::AdjustToMinimumContentsLength</enum>
+     </property>
+    </widget>
    </item>
    <item row="3" column="2">
     <widget class="QRadioButton" name="radio_subset_outline">