summaryrefslogtreecommitdiff
path: root/efl/edje
diff options
context:
space:
mode:
authorKai Huuhko <kai.huuhko@gmail.com>2013-12-04 13:12:23 +0200
committerKai Huuhko <kai.huuhko@gmail.com>2013-12-04 13:14:12 +0200
commit1e43cb98f453583017522fe825202189bc99265f (patch)
tree8466009539b5665746663c584c6e7afd985a8886 /efl/edje
parent8cc7cc74de38ef92f95ec890d8bf5010777ad2b8 (diff)
Edje: Use _set_properties_from_keyword_args
Diffstat (limited to 'efl/edje')
-rw-r--r--efl/edje/efl.edje_object.pxi22
1 files changed, 11 insertions, 11 deletions
diff --git a/efl/edje/efl.edje_object.pxi b/efl/edje/efl.edje_object.pxi
index 372e581..b36e172 100644
--- a/efl/edje/efl.edje_object.pxi
+++ b/efl/edje/efl.edje_object.pxi
@@ -127,26 +127,26 @@ cdef class Edje(Object):
127 def __cinit__(self, *a, **ka): 127 def __cinit__(self, *a, **ka):
128 self._signal_callbacks = {} 128 self._signal_callbacks = {}
129 129
130 def __init__(self, Canvas canvas not None, **kargs): 130 def __init__(self, Canvas canvas not None, file=None, group=None, size=None,
131 geometry=None, **kwargs):
132
131 self._set_obj(edje_object_add(canvas.obj)) 133 self._set_obj(edje_object_add(canvas.obj))
132 _register_decorated_callbacks(self) 134 _register_decorated_callbacks(self)
133 self._set_common_params(**kargs)
134 135
135 def __free_wrapper_resources(self, ed):
136 self._signal_callbacks.clear()
137 self._text_change_cb = None
138 self._message_handler_cb = None
139
140 def _set_common_params(self, file=None, group=None, size=None, pos=None,
141 geometry=None, color=None, name=None):
142 if file: 136 if file:
143 self.file_set(file, group) 137 self.file_set(file, group)
144 Object._set_common_params(self, size=size, pos=pos, geometry=geometry, 138
145 color=color, name=name) 139 self._set_properties_from_keyword_args(kwargs)
140
146 if not size and not geometry: 141 if not size and not geometry:
147 w, h = self.size_min_get() 142 w, h = self.size_min_get()
148 self.size_set(w, h) 143 self.size_set(w, h)
149 144
145 def __free_wrapper_resources(self, ed):
146 self._signal_callbacks.clear()
147 self._text_change_cb = None
148 self._message_handler_cb = None
149
150 def __str__(self): 150 def __str__(self):
151 x, y, w, h = self.geometry_get() 151 x, y, w, h = self.geometry_get()
152 r, g, b, a = self.color_get() 152 r, g, b, a = self.color_get()