summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-05-31 17:03:26 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-05-31 18:42:28 +0900
commitce0d15ecb330e2c63b437956a345723a8b493b7f (patch)
tree0fc62bb6f77a6e4a8ab2d2f1a8f2770fb9fc609d
parentaa5ac8eed71fb448d05ba05f05de32c6b2f86d7b (diff)
edje: Reshuffle a bit edje_object.eo
This changes a few method names: - freeze -> calc_freeze - thaw -> calc_thaw - update_hints -> calc_update_hints Otherwise this is mostly about reshuffling the EO file itself and changing documentation. Ref T5315
-rw-r--r--src/lib/edje/edje_calc.c2
-rw-r--r--src/lib/edje/edje_object.eo310
-rw-r--r--src/lib/edje/edje_util.c12
-rw-r--r--src/lib/elementary/efl_ui_image.c4
-rw-r--r--src/lib/elementary/efl_ui_image.eo4
-rw-r--r--src/tests/emotion/emotion_test_main-eo.c4
6 files changed, 165 insertions, 171 deletions
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index ca3f851a1d..e53378bacc 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -937,7 +937,7 @@ _edje_recalc_do(Edje *ed)
937 937
938 ed->recalc_hints = EINA_FALSE; 938 ed->recalc_hints = EINA_FALSE;
939 939
940 edje_obj_size_min_calc(ed->obj, &w, &h); 940 edje_object_size_min_calc(ed->obj, &w, &h);
941 efl_gfx_size_hint_restricted_min_set(ed->obj, w, h); 941 efl_gfx_size_hint_restricted_min_set(ed->obj, w, h);
942 } 942 }
943 943
diff --git a/src/lib/edje/edje_object.eo b/src/lib/edje/edje_object.eo
index dc8b72bb5f..9e08693b6c 100644
--- a/src/lib/edje/edje_object.eo
+++ b/src/lib/edje/edje_object.eo
@@ -11,22 +11,6 @@ class Edje.Object (Efl.Canvas.Group.Clipped, Efl.File, Efl.Container, Efl.Part,
11 event_prefix: edje_object; 11 event_prefix: edje_object;
12 data: Edje; 12 data: Edje;
13 methods { 13 methods {
14 @property update_hints {
15 set {
16 [[Edje will automatically update the size hints on itself.
17
18 By default edje doesn't set size hints on itself. With this function
19 call, it will do so if update is $true. Be carefully, it cost a lot to
20 trigger this feature as it will recalc the object every time it make
21 sense to be sure that's its minimal size hint is always accurate.]]
22 }
23 get {
24 [[Whether or not Edje will update size hints on itself.]]
25 }
26 values {
27 update: bool; [[Whether or not update the size hints.]]
28 }
29 }
30 @property mirrored { 14 @property mirrored {
31 set { 15 set {
32 [[Sets the RTL orientation for this object. 16 [[Sets the RTL orientation for this object.
@@ -135,24 +119,24 @@ class Edje.Object (Efl.Canvas.Group.Clipped, Efl.File, Efl.Container, Efl.Part,
135 } 119 }
136 } 120 }
137 @property transition_duration_factor { 121 @property transition_duration_factor {
138 set { 122 [[Transition duration factor.
139 [[Sets transition duration factor.
140 123
141 This define the transition duration factor on this 124 This defines a multiplier for the duration of transitions as they
142 specific object. By default all animation are run at a speed 125 are defined in EDC. By default this factor is 1.0, which means
143 factor of 1.0.]] 126 animations play at the same speed as described in EDC.
127 ]]
128 set {
129 [[Sets transition duration factor.]]
144 } 130 }
145 get { 131 get {
146 [[Gets transition duration factor. 132 [[Gets transition duration factor.]]
147
148 This define the transition duration factor on this
149 specific object. By default all animation are run at a speed
150 factor of 1.0.]]
151 } 133 }
152 values { 134 values {
153 scale: double; [[The transition duration factor]] 135 scale: double(1.0); [[The transition duration factor.]]
154 } 136 }
155 } 137 }
138
139 // TODO: An Efl.Ui.Base class that contains mirrored, language, scale
156 @property scale { 140 @property scale {
157 set { 141 set {
158 [[Sets the scaling factor for a given Edje object. 142 [[Sets the scaling factor for a given Edje object.
@@ -199,87 +183,8 @@ class Edje.Object (Efl.Canvas.Group.Clipped, Efl.File, Efl.Container, Efl.Part,
199 that means the edc file is made based on scale 1.0.]] 183 that means the edc file is made based on scale 1.0.]]
200 } 184 }
201 } 185 }
202 @property size_min {
203 get {
204 [[Gets the minimum size specified -- as an EDC property -- for a
205 given Edje object
206
207 This function retrieves the obj object's minimum size values,
208 as declared in its EDC group definition.
209
210 Note: If the $min EDC property was not declared for obj, this
211 call will return the value 0, for each axis.
212
213 Note: On failure, this function will make all non-$null size
214 pointers' pointed variables be set to zero.
215
216 See also @.size_max.get()]]
217 /* FIXME-doc
218 * Minimum size of groups have the following syntax
219 * @code
220 * collections
221 * {
222 * group
223 * {
224 * name: "a_group";
225 * min: 100 100;
226 * }
227 * }
228 * @endcode
229 * where one declares a minimum size of 100 pixels both for width and
230 * height. Those are (hint) values which should be respected when the
231 * given object/group is to be controlled by a given container object
232 * (e.g. an Edje object being "swallowed" into a given $SWALLOW
233 * typed part, as in edje_object_part_swallow()). Check the complete
234 * \@ref edcref "syntax reference" for EDC files.
235 */
236 }
237 values {
238 minw: int; [[Pointer to a variable where to store the minimum width]]
239 minh: int; [[Pointer to a variable where to store the minimum height]]
240 }
241 }
242 @property size_max {
243 get {
244 [[Gets the maximum size specified -- as an EDC property -- for a
245 given Edje object
246 186
247 This function retrieves the obj object's maximum size values, 187 // TODO: Legacy only. EO may rely on futures.
248 as declared in its EDC group definition.
249
250 Note: If the $max EDC property was not declared for obj, this
251 call will return the maximum size a given Edje object may have, for
252 each axis.
253
254 Note: On failure, this function will make all non-$null size
255 pointers' pointed variables be set to zero.
256
257 See also @.size_min.get()]]
258 /* FIXME-doc
259 * Maximum size of groups have the following syntax
260 * @code
261 * collections
262 * {
263 * group
264 * {
265 * name: "a_group";
266 * max: 100 100;
267 * }
268 * }
269 * @endcode
270 * where one declares a maximum size of 100 pixels both for width and
271 * height. Those are (hint) values which should be respected when the
272 * given object/group is to be controlled by a given container object
273 * (e.g. an Edje object being "swallowed" into a given $SWALLOW
274 * typed part, as in edje_object_part_swallow()). Check the complete
275 * \@ref edcref "syntax reference" for EDC files.
276 */
277 }
278 values {
279 maxw: int; [[Pointer to a variable where to store the maximum width]]
280 maxh: int; [[Pointer to a variable where to store the maximum height]]
281 }
282 }
283 preload { 188 preload {
284 [[Preloads the images on the Edje Object in the background. 189 [[Preloads the images on the Edje Object in the background.
285 190
@@ -314,48 +219,76 @@ class Edje.Object (Efl.Canvas.Group.Clipped, Efl.File, Efl.Container, Efl.Part,
314 [[The load error code.]] 219 [[The load error code.]]
315 } 220 }
316 } 221 }
222
223 /* EDJE CALC APIS BEGIN ---------------------------------------------- */
224 @property calc_update_hints {
225 [[Whether this object updates its size hints automatically.
226
227 By default edje doesn't set size hints on itself. If this property
228 is set to $true, size hints will be updated after recalculation.
229 Be careful, as recalculation may happen often, enabling this
230 property may have a considerable performance impact as other widgets
231 will be notified of the size hints changes.
232
233 A layout recalculation can be triggered by @.size_min_calc(),
234 @.size_min_restricted_calc(), @.parts_extends_calc() or even any
235 other internal event.
236 ]]
237 set {
238 [[Enable or disable auto-update of size hints.]]
239 legacy: edje_object_update_hints_set;
240 }
241 get {
242 [[Whether this object updates its size hints automatically.]]
243 legacy: edje_object_update_hints_get;
244 }
245 values {
246 update: bool(false); [[Whether or not update the size hints.]]
247 }
248 }
249 // FIXME: Prefix with calc_ ?
317 size_min_calc { 250 size_min_calc {
318 [[Calculates the minimum required size for a given Edje object. 251 [[Calculates the minimum required size for a given Edje object.
319 252
320 This call works exactly as edje_object_size_min_restricted_calc(), 253 This call works exactly as edje_object_size_min_restricted_calc(),
321 with the last two arguments set to 0. Please refer to its 254 with the last two arguments set to 0. Please refer to its
322 documentation, then.]] 255 documentation, then.
323 256 ]]
257 // FIXME: Return a 2D size type (no @out values)
324 params { 258 params {
325 @out minw: int; [[Pointer to a variable where to store the minimum 259 @out minw: int; [[The minimum required width (return value)]]
326 required width]] 260 @out minh: int; [[The minimum required height (return value)]]
327 @out minh: int; [[Pointer to a variable where to store the minimum
328 required height]]
329 } 261 }
330 } 262 }
263 // FIXME: Prefix with calc_ ?
331 size_min_restricted_calc { 264 size_min_restricted_calc {
332 [[Calculates the minimum required size for a given Edje object. 265 [[Calculates the minimum required size for a given Edje object.
333 266
334 This call will trigger an internal recalculation of all parts of 267 This call will trigger an internal recalculation of all parts of
335 the obj object, in order to return its minimum required 268 the object, in order to return its minimum required dimensions for
336 dimensions for width and height. The user might choose to impose 269 width and height. The user might choose to impose those minimum
337 those minimum sizes, making the resulting calculation to get to values 270 sizes, making the resulting calculation to get to values equal or
338 equal or bigger than restrictedw and restrictedh, for width and 271 larger than $restrictedw and $restrictedh, for width and height,
339 height, respectively. 272 respectively.
340 273
341 Note: At the end of this call, obj won't be automatically 274 Note: At the end of this call, the object won't be automatically
342 resized to new dimensions, but just return the calculated 275 resized to the new dimensions, but just return the calculated sizes.
343 sizes. The caller is the one up to change its geometry or not. 276 The caller is the one up to change its geometry or not.
344 277
345 Warning: Be advised that invisible parts in obj will be taken 278 Warning: Be advised that invisible parts in the object will be taken
346 into account in this calculation.]] 279 into account in this calculation.
347 280 ]]
281 // FIXME: Return a 2D size type (no @out values)
348 params { 282 params {
349 @out minw: int; [[Pointer to a variable where to store the minimum 283 @out minw: int; [[The minimum required width (return value)]]
350 required width]] 284 @out minh: int; [[The minimum required height (return value)]]
351 @out minh: int; [[Pointer to a variable where to store the minimum 285 @in restrictedw: int; [[The minimum width constraint as input,
352 required height]] 286 $minw can not be lower than this]]
353 @in restrictedw: int; [[Do not allow object's calculated (minimum) width 287 @in restrictedh: int; [[The minimum height constraint as input,
354 to be less than this value]] 288 $minh can not be lower than this]]
355 @in restrictedh: int; [[Do not allow object's calculated (minimum)
356 height to be less than this value]]
357 } 289 }
358 } 290 }
291 // FIXME: Prefix with calc_ ?
359 parts_extends_calc { 292 parts_extends_calc {
360 [[Calculates the geometry of the region, relative to a given Edje 293 [[Calculates the geometry of the region, relative to a given Edje
361 object's area, occupied by all parts in the object. 294 object's area, occupied by all parts in the object.
@@ -367,52 +300,112 @@ class Edje.Object (Efl.Canvas.Group.Clipped, Efl.File, Efl.Container, Efl.Part,
367 boundaries will also be taken in account, so that x and y 300 boundaries will also be taken in account, so that x and y
368 may be negative. 301 may be negative.
369 302
370 Note: Use $null pointers on the geometry components you're not
371 interested in: they'll be ignored by the function.
372
373 Note: On failure, this function will make all non-$null geometry 303 Note: On failure, this function will make all non-$null geometry
374 pointers' pointed variables be set to zero.]] 304 pointers' pointed variables be set to zero.
375 305 ]]
376 return: bool; [[$true on success, $false otherwise]] 306 return: bool; [[$true on success, $false otherwise]]
307 /* FIXME: Return a 2D size type (no @out values) */
377 params { 308 params {
378 @out x: int; [[A pointer to a variable where to store the parts region's 309 @out x: int; [[The parts region's X coordinate]]
379 x coordinate]] 310 @out y: int; [[The parts region's Y coordinate]]
380 @out y: int; [[A pointer to a variable where to store the parts region's 311 @out w: int; [[The parts region's width]]
381 y coordinate]] 312 @out h: int; [[The parts region's height]]
382 @out w: int; [[A pointer to a variable where to store the parts region's
383 width]]
384 @out h: int; [[A pointer to a variable where to store the parts region's
385 height]]
386 } 313 }
387 } 314 }
388 calc_force { 315 calc_force {
389 [[Forces a Size/Geometry calculation. 316 [[Forces a Size/Geometry calculation.
390 317
391 Forces the object obj to recalculation layout regardless of 318 Forces the object to recalculate its layout regardless of
392 freeze/thaw.]] 319 freeze/thaw.
393 320
321 See also @.calc_freeze and @.calc_thaw.
322 ]]
394 } 323 }
395 freeze { 324 calc_freeze {
396 [[Freezes the Edje object. 325 [[Freezes the Edje object.
397 326
398 This function puts all changes on hold. Successive freezes will 327 This function puts all changes on hold. Successive freezes will
399 nest, requiring an equal number of thaws. 328 nest, requiring an equal number of thaws.
400 329
401 See also @.thaw()]] 330 See also @.calc_thaw()
402 331 ]]
403 return: int; [[The frozen state or 0 on Error]] 332 return: int; [[The frozen state or 0 on error]]
333 legacy: edje_object_freeze;
404 } 334 }
405 thaw { 335 calc_thaw {
406 [[Thaws the Edje object. 336 [[Thaws the Edje object.
407 337
408 This function thaws the given Edje object. 338 This function thaws the given Edje object.
409 339
410 Note:: If sucessives freezes were done, an equal number of 340 Note: If sucessive freezes were done, an equal number of thaws will
411 thaws will be required. 341 be required.
342
343 See also @.calc_freeze()
344 ]]
345 return: int; [[The frozen state or 0 if the object is not frozen or on error.]]
346 legacy: edje_object_thaw;
347 }
348 /* EDJE CALC APIS END ------------------------------------------------ */
349
350 /* EDJE GROUP DATA APIS BEGIN ---------------------------------------- */
351 @property group_size_min {
352 get {
353 [[Gets the minimum size specified -- as an EDC property -- for a
354 given Edje object
355
356 This function retrieves the obj object's minimum size values,
357 as declared in its EDC group definition. For instance, for an
358 Edje object of minimum size 100x100 pixels:
359 collections {
360 group {
361 name: "a_group";
362 min: 100 100;
363 }
364 }
365
366 Note: If the $min EDC property was not declared for this object,
367 this call will return 0x0.
412 368
413 See also @.freeze()]] 369 Note: On failure, this function also return 0x0.
414 370
415 return: int; [[The frozen state or $0 if the object is not frozen or on error.]] 371 See also @.group_size_max.
372 ]]
373 legacy: edje_object_size_min_get;
374 }
375 values {
376 minw: int; [[Pointer to a variable where to store the minimum width]]
377 minh: int; [[Pointer to a variable where to store the minimum height]]
378 }
379 }
380 @property group_size_max {
381 get {
382 [[Gets the maximum size specified -- as an EDC property -- for a
383 given Edje object
384
385 This function retrieves the object's maximum size values,
386 as declared in its EDC group definition. For instance, for an
387 Edje object of maximum size 100x100 pixels:
388 collections {
389 group {
390 name: "a_group";
391 max: 100 100;
392 }
393 }
394
395 Note: If the $max EDC property was not declared for the object,
396 this call will return the maximum size a given Edje object may
397 have, for each axis.
398
399 Note: On failure, this function will return 0x0.
400
401 See also @.group_size_min.
402 ]]
403 legacy: edje_object_size_max_get;
404 }
405 values {
406 maxw: int; [[The maximum width]]
407 maxh: int; [[The maximum height]]
408 }
416 } 409 }
417 @property group_data { 410 @property group_data {
418 get { 411 get {
@@ -450,6 +443,7 @@ class Edje.Object (Efl.Canvas.Group.Clipped, Efl.File, Efl.Container, Efl.Part,
450 val: string; [[The data's value string.]] 443 val: string; [[The data's value string.]]
451 } 444 }
452 } 445 }
446 /* EDJE GROUP DATA APIS END ------------------------------------------ */
453 447
454 /* MESSAGE & SIGNAL APIS BEGIN --------------------------------------- */ 448 /* MESSAGE & SIGNAL APIS BEGIN --------------------------------------- */
455 message_send { 449 message_send {
diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index e3699a2161..8ed1896c2a 100644
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -459,7 +459,7 @@ _edje_object_group_data_get(Eo *obj EINA_UNUSED, Edje *ed, const char *key)
459} 459}
460 460
461EOLIAN int 461EOLIAN int
462_edje_object_freeze(Eo *obj EINA_UNUSED, Edje *ed) 462_edje_object_calc_freeze(Eo *obj EINA_UNUSED, Edje *ed)
463{ 463{
464 unsigned short i; 464 unsigned short i;
465 465
@@ -477,7 +477,7 @@ _edje_object_freeze(Eo *obj EINA_UNUSED, Edje *ed)
477} 477}
478 478
479EOLIAN int 479EOLIAN int
480_edje_object_thaw(Eo *obj EINA_UNUSED, Edje *ed) 480_edje_object_calc_thaw(Eo *obj EINA_UNUSED, Edje *ed)
481{ 481{
482 unsigned short i; 482 unsigned short i;
483 483
@@ -3695,7 +3695,7 @@ _edje_object_efl_part_part(Eo *obj, Edje *ed, const char *part)
3695} 3695}
3696 3696
3697EOLIAN void 3697EOLIAN void
3698_edje_object_size_min_get(Eo *obj EINA_UNUSED, Edje *ed, Evas_Coord *minw, Evas_Coord *minh) 3698_edje_object_group_size_min_get(Eo *obj EINA_UNUSED, Edje *ed, Evas_Coord *minw, Evas_Coord *minh)
3699{ 3699{
3700 if ((!ed) || (!ed->collection)) 3700 if ((!ed) || (!ed->collection))
3701 { 3701 {
@@ -3708,7 +3708,7 @@ _edje_object_size_min_get(Eo *obj EINA_UNUSED, Edje *ed, Evas_Coord *minw, Evas_
3708} 3708}
3709 3709
3710EOLIAN void 3710EOLIAN void
3711_edje_object_size_max_get(Eo *obj EINA_UNUSED, Edje *ed EINA_UNUSED, Evas_Coord *maxw, Evas_Coord *maxh) 3711_edje_object_group_size_max_get(Eo *obj EINA_UNUSED, Edje *ed EINA_UNUSED, Evas_Coord *maxw, Evas_Coord *maxh)
3712{ 3712{
3713 if ((!ed) || (!ed->collection)) 3713 if ((!ed) || (!ed->collection))
3714 { 3714 {
@@ -5376,7 +5376,7 @@ _edje_object_preload(Eo *obj, Edje *ed, Eina_Bool cancel)
5376} 5376}
5377 5377
5378EOLIAN void 5378EOLIAN void
5379_edje_object_update_hints_set(Eo *obj EINA_UNUSED, Edje *ed, Eina_Bool update) 5379_edje_object_calc_update_hints_set(Eo *obj EINA_UNUSED, Edje *ed, Eina_Bool update)
5380{ 5380{
5381 if (!ed) return; 5381 if (!ed) return;
5382 if (ed->update_hints == !!update) return; 5382 if (ed->update_hints == !!update) return;
@@ -5390,7 +5390,7 @@ _edje_object_update_hints_set(Eo *obj EINA_UNUSED, Edje *ed, Eina_Bool update)
5390} 5390}
5391 5391
5392EOLIAN Eina_Bool 5392EOLIAN Eina_Bool
5393_edje_object_update_hints_get(Eo *obj EINA_UNUSED, Edje *ed) 5393_edje_object_calc_update_hints_get(Eo *obj EINA_UNUSED, Edje *ed)
5394{ 5394{
5395 return ed->update_hints; 5395 return ed->update_hints;
5396} 5396}
diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c
index 6a9b91c22f..7c4e13a954 100644
--- a/src/lib/elementary/efl_ui_image.c
+++ b/src/lib/elementary/efl_ui_image.c
@@ -1139,7 +1139,7 @@ _efl_ui_image_edje_object_signal_emit(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd
1139} 1139}
1140 1140
1141EOLIAN static void 1141EOLIAN static void
1142_efl_ui_image_edje_object_size_min_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd, int *w, int *h) 1142_efl_ui_image_edje_object_group_size_min_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd, int *w, int *h)
1143{ 1143{
1144 if (sd->edje) 1144 if (sd->edje)
1145 edje_object_size_min_get(sd->img, w, h); 1145 edje_object_size_min_get(sd->img, w, h);
@@ -1148,7 +1148,7 @@ _efl_ui_image_edje_object_size_min_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *s
1148} 1148}
1149 1149
1150EOLIAN static void 1150EOLIAN static void
1151_efl_ui_image_edje_object_size_max_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd, int *w, int *h) 1151_efl_ui_image_edje_object_group_size_max_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd, int *w, int *h)
1152{ 1152{
1153 if (sd->edje) 1153 if (sd->edje)
1154 edje_object_size_max_get(sd->img, w, h); 1154 edje_object_size_max_get(sd->img, w, h);
diff --git a/src/lib/elementary/efl_ui_image.eo b/src/lib/elementary/efl_ui_image.eo
index 566640d310..ef4c1fdc60 100644
--- a/src/lib/elementary/efl_ui_image.eo
+++ b/src/lib/elementary/efl_ui_image.eo
@@ -136,8 +136,8 @@ class Efl.Ui.Image (Elm.Widget, Efl.Ui.Clickable, Efl.Ui.Draggable,
136 Efl.Player.playable { get; } 136 Efl.Player.playable { get; }
137 Efl.Player.play { get; set; } 137 Efl.Player.play { get; set; }
138 Edje.Object.signal_emit; 138 Edje.Object.signal_emit;
139 Edje.Object.size_min { get; } 139 Edje.Object.group_size_min { get; }
140 Edje.Object.size_max { get; } 140 Edje.Object.group_size_max { get; }
141 Edje.Object.size_min_calc; 141 Edje.Object.size_min_calc;
142 Edje.Object.calc_force; 142 Edje.Object.calc_force;
143 Efl.Canvas.Object.clip { set; } 143 Efl.Canvas.Object.clip { set; }
diff --git a/src/tests/emotion/emotion_test_main-eo.c b/src/tests/emotion/emotion_test_main-eo.c
index fd8a51319f..528f62ccbc 100644
--- a/src/tests/emotion/emotion_test_main-eo.c
+++ b/src/tests/emotion/emotion_test_main-eo.c
@@ -353,7 +353,7 @@ video_obj_frame_resize_cb(void *data, const Efl_Event *event)
353 if (ratio > 0.0) iw = (ih * ratio) + 0.5; 353 if (ratio > 0.0) iw = (ih * ratio) + 0.5;
354 evas_object_size_hint_min_set(event->object, iw, ih); 354 evas_object_size_hint_min_set(event->object, iw, ih);
355 edje_object_part_swallow(oe, "video_swallow", event->object); 355 edje_object_part_swallow(oe, "video_swallow", event->object);
356 edje_obj_size_min_calc(oe, &w, &h); 356 edje_object_size_min_calc(oe, &w, &h);
357 efl_gfx_size_set(oe, w, h); 357 efl_gfx_size_set(oe, w, h);
358 evas_object_size_hint_min_set(event->object, 0, 0); 358 evas_object_size_hint_min_set(event->object, 0, 0);
359 edje_object_part_swallow(oe, "video_swallow", event->object); 359 edje_object_part_swallow(oe, "video_swallow", event->object);
@@ -625,7 +625,7 @@ init_video_object(const char *module_filename, const char *filename)
625 625
626 offset = 20 * (eina_list_count(video_objs) - 1); 626 offset = 20 * (eina_list_count(video_objs) - 1);
627 efl_gfx_position_set(oe, offset, offset); 627 efl_gfx_position_set(oe, offset, offset);
628 edje_obj_size_min_calc(oe, &w, &h); 628 edje_object_size_min_calc(oe, &w, &h);
629 efl_gfx_size_set(oe, w, h); 629 efl_gfx_size_set(oe, w, h);
630 630
631 efl_event_callback_array_add(o, emotion_object_test_callbacks(), oe); 631 efl_event_callback_array_add(o, emotion_object_test_callbacks(), oe);