Fixes for Qt5 on ListStrEditor.

enthought · Mar 14, 2018 · 3a2f9b8 · 3a2f9b8
1 parent 884cecf
commit 3a2f9b8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/traitsui/qt4/file_editor.py b/traitsui/qt4/file_editor.py
@@ -24,6 +24,8 @@
 from helper import IconButton
 
 
+is_qt5 = (QtCore.__version_info__[0] >= 5)
+
 # Wildcard filter:
 filter_trait = List(Unicode)
 
@@ -187,7 +189,7 @@ def init(self, parent):
 
         # This is needed to enable horizontal scrollbar.
         header = self.control.header()
-        if QtCore.__version_info__[0] >= 5:
+        if is_qt5:
             header.setSectionResizeMode(0, QtGui.QHeaderView.ResizeToContents)
         else:
             header.setResizeMode(0, QtGui.QHeaderView.ResizeToContents)

diff --git a/traitsui/qt4/list_str_editor.py b/traitsui/qt4/list_str_editor.py
@@ -34,6 +34,9 @@
 from list_str_model import ListStrModel
 from traitsui.menu import Menu
 
+
+is_qt5 = (QtCore.__version_info__[0] >= 5)
+
 #-------------------------------------------------------------------------
 #  '_ListStrEditor' class:
 #-------------------------------------------------------------------------
@@ -122,7 +125,10 @@ def init(self, parent):
             header_view = QtGui.QHeaderView(QtCore.Qt.Horizontal, self.control)
             header_view.setModel(self.model)
             header_view.setMaximumHeight(header_view.sizeHint().height())
-            header_view.setResizeMode(QtGui.QHeaderView.Stretch)
+            if is_qt5:
+                header_view.setSectionResizeMode(QtGui.QHeaderView.Stretch)
+            else:
+                header_view.setResizeMode(QtGui.QHeaderView.Stretch)
             layout.addWidget(header_view)
 
         self.list_view = _ListView(self)