Merge pull request #4304 from Acanthostega/master

tacaswell · tacaswell · commit 94e6944d7e69 · 2015-04-03T13:45:20.000-04:00
BUG : never treat title or label values as colors in qt_editor fixes #4303
diff --git a/lib/matplotlib/backends/qt_editor/formlayout.py b/lib/matplotlib/backends/qt_editor/formlayout.py
@@ -61,6 +61,8 @@
 
 import datetime
 
+BLACKLIST = set(["title", "label"])
+
 
 def col2hex(color):
     """Convert matplotlib color to hex before passing to Qt"""
@@ -262,7 +264,7 @@ def setup(self):
                 continue
             elif tuple_to_qfont(value) is not None:
                 field = FontLayout(value, self)
-            elif is_color_like(value):
+            elif label.lower() not in BLACKLIST and is_color_like(value):
                 field = ColorLayout(to_qcolor(value), self)
             elif isinstance(value, six.string_types):
                 field = QtWidgets.QLineEdit(value, self)
