Commit94e6944

committed

Merge pull request#4304 from Acanthostega/master

BUG : never treat title or label values as colors in qt_editorfixes#4303

2 parentsadc9f82 +eeff735 commit94e6944Copy full SHA for 94e6944

File tree

-1

lines changed

-1

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,8 @@`
`61`	`61`
`62`	`62`	`importdatetime`
`63`	`63`
	`64`	`+BLACKLIST=set(["title","label"])`
	`65`	`+`
`64`	`66`
`65`	`67`	`defcol2hex(color):`
`66`	`68`	`"""Convert matplotlib color to hex before passing to Qt"""`
`@@ -262,7 +264,7 @@ def setup(self):`
`262`	`264`	`continue`
`263`	`265`	`eliftuple_to_qfont(value)isnotNone:`
`264`	`266`	`field=FontLayout(value,self)`
`265`		`-elifis_color_like(value):`
	`267`	`+eliflabel.lower()notinBLACKLISTandis_color_like(value):`
`266`	`268`	`field=ColorLayout(to_qcolor(value),self)`
`267`	`269`	`elifisinstance(value,six.string_types):`
`268`	`270`	`field=QtWidgets.QLineEdit(value,self)`

Comments

(0)