forked from enlightenment/efl
elementary/flip - don't update map uv for proxy object
SVN revision: 78820
This commit is contained in:
parent
24ff5df8bc
commit
09c3c4706b
|
@ -652,3 +652,7 @@
|
||||||
2012-10-31 TaeHwan Kim (Bluezery)
|
2012-10-31 TaeHwan Kim (Bluezery)
|
||||||
|
|
||||||
* Don't crash glview even if you failed to create obj.
|
* Don't crash glview even if you failed to create obj.
|
||||||
|
|
||||||
|
2012-11-02 ChunEon Park (Hermet)
|
||||||
|
|
||||||
|
* Don't update map uv with image size for proxy object in elm_flip.
|
||||||
|
|
|
@ -49,6 +49,7 @@ Fixes:
|
||||||
* Fix elm_transit image animation that last few frames are skipped.
|
* Fix elm_transit image animation that last few frames are skipped.
|
||||||
* FIx elm_transit to accept proxy object.
|
* FIx elm_transit to accept proxy object.
|
||||||
* Fix glview crash even if the object is failed allocating.
|
* Fix glview crash even if the object is failed allocating.
|
||||||
|
* Fix the elm_flip to accept proxy object.
|
||||||
|
|
||||||
Removals:
|
Removals:
|
||||||
|
|
||||||
|
|
|
@ -910,7 +910,8 @@ _flip_do(Evas_Object *obj,
|
||||||
const char *type = evas_object_type_get(sd->front.content);
|
const char *type = evas_object_type_get(sd->front.content);
|
||||||
|
|
||||||
// FIXME: only handles filled obj
|
// FIXME: only handles filled obj
|
||||||
if ((type) && (!strcmp(type, "image")))
|
if ((type) && (!strcmp(type, "image") &&
|
||||||
|
!evas_object_image_source_get(sd->front.content)))
|
||||||
{
|
{
|
||||||
int iw, ih;
|
int iw, ih;
|
||||||
evas_object_image_size_get(sd->front.content, &iw, &ih);
|
evas_object_image_size_get(sd->front.content, &iw, &ih);
|
||||||
|
@ -931,7 +932,8 @@ _flip_do(Evas_Object *obj,
|
||||||
{
|
{
|
||||||
const char *type = evas_object_type_get(sd->back.content);
|
const char *type = evas_object_type_get(sd->back.content);
|
||||||
|
|
||||||
if ((type) && (!strcmp(type, "image")))
|
if ((type) && (!strcmp(type, "image") &&
|
||||||
|
!evas_object_image_source_get(sd->front.content)))
|
||||||
{
|
{
|
||||||
int iw, ih;
|
int iw, ih;
|
||||||
evas_object_image_size_get(sd->back.content, &iw, &ih);
|
evas_object_image_size_get(sd->back.content, &iw, &ih);
|
||||||
|
|
Loading…
Reference in New Issue