Merge branch 'master' of github.com:tito/kivy

2010-11-06 15:10:27 -05:00 · 2010-11-06 15:10:27 -05:00 · 3ffe148bd3
parent 9fb5414cfb e97bc15c03
commit 3ffe148bd3
1 changed files with 1 additions and 5 deletions
--- a/kivy/data/style.uxl
+++ b/kivy/data/style.uxl
@ -1,11 +1,7 @@
 <Button>:
 	canvas:
 		Color:
-			rgb:
-				if root.state == 'down':
-					return (1, 1, 0)
-				else:
-					return (1, 1, 1)
+			rgb: dict(down=(1, 1, 0), normal=(1, 1, 1))[root.state]
 		BorderImage:
 			pos: self.pos
 			size: self.size