projects
/
tabakrolletjie.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ctpug.org.za:tabakrolletjie
[tabakrolletjie.git]
/
tabakrolletjie
/
widgets.py
diff --git
a/tabakrolletjie/widgets.py
b/tabakrolletjie/widgets.py
index b1917e5abaf013f0bddef7c1391a99f15a40674a..c1d71c3b2fb18885b4429fe88a6f7f279cdb5d1c 100644
(file)
--- a/
tabakrolletjie/widgets.py
+++ b/
tabakrolletjie/widgets.py
@@
-66,7
+66,9
@@
class ImageButton(Button):
def __init__(self, *imgparts, **kwargs):
transform = kwargs.pop("transform", NullTransform())
def __init__(self, *imgparts, **kwargs):
transform = kwargs.pop("transform", NullTransform())
- self._img = loader.load_image(*imgparts, transform=transform)
+ self._img = kwargs.pop("image", None)
+ if self._img is None:
+ self._img = loader.load_image(*imgparts, transform=transform)
name = kwargs.get('name')
pos = kwargs.get('pos')
padding = kwargs.get('padding', 0)
name = kwargs.get('name')
pos = kwargs.get('pos')
padding = kwargs.get('padding', 0)