dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Efl.Ui.Image: Modify current frame to start at 1 

Summary:
3dc3deb patch was changed to start at 1 rather than 0.
gif image starts at 1, not 0.

Test Plan: N/A

Reviewers: Hermet, kimcinoo

Reviewed By: Hermet

Subscribers: cedric, #reviewers, #committers

Tags: #efl

Differential Revision: https://phab.enlightenment.org/D11474
This commit is contained in:
junsu choi 2020-03-09 17:54:33 +09:00 committed by Shinwoo Kim
parent c6e40641aa
commit d60587c098
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/lib/elementary/efl_ui_image.c
View File

@ -1753,7 +1753,7 @@ _efl_ui_image_animated_set_internal(Eo *obj, Efl_Ui_Image_Data *sd, Eina_Bool an
if (anim)
{
sd->frame_count = evas_object_image_animated_frame_count_get(sd->img);
sd->cur_frame = 0;
sd->cur_frame = 1;
sd->frame_duration =
evas_object_image_animated_frame_duration_get
(sd->img, sd->cur_frame, 0);
@ -1860,7 +1860,7 @@ _efl_ui_image_efl_player_playback_progress_get(const Eo *obj EINA_UNUSED, Efl_Ui
if (sd->edje)
efl_player_playback_progress_get(sd->img);
else if (sd->frame_count > 1)
return (double)sd->cur_frame / ((double)sd->frame_count - 1.0);
return ((double)sd->cur_frame - 1.0) / ((double)sd->frame_count - 1.0);
return 0.0;
}
@ -1870,10 +1870,10 @@ _efl_ui_image_efl_player_playback_progress_set(Eo *obj EINA_UNUSED, Efl_Ui_Image
EINA_SAFETY_ON_TRUE_RETURN(progress > 1 || progress < 0);
if (sd->edje)
efl_player_playback_progress_set(sd->img, progress);
else if (sd->frame_count > 1)
sd->cur_frame = lround(progress * (sd->frame_count - 1));
else if (sd->frame_count > 0)
sd->cur_frame = (lround(progress * (sd->frame_count - 1)) + 1);
else
sd->cur_frame = 0;
sd->cur_frame = 1;
}
static Eina_Bool

10
src/lib/elementary/efl_ui_image_zoomable.c
View File

@ -3037,7 +3037,7 @@ _efl_ui_image_zoomable_animated_set_internal(Eo *obj EINA_UNUSED, Efl_Ui_Image_Z
if (anim)
{
sd->frame_count = evas_object_image_animated_frame_count_get(sd->img);
sd->cur_frame = 0;
sd->cur_frame = 1;
sd->frame_duration =
evas_object_image_animated_frame_duration_get
(sd->img, sd->cur_frame, 0);
@ -3158,7 +3158,7 @@ _efl_ui_image_zoomable_efl_player_playback_progress_get(const Eo *obj EINA_UNUSE
if (sd->edje)
efl_player_playback_progress_get(sd->edje);
else if (sd->frame_count > 1)
return (double)sd->cur_frame / ((double)sd->frame_count - 1.0);
return ((double)sd->cur_frame - 1.0) / ((double)sd->frame_count - 1.0);
return 0.0;
}
@ -3170,10 +3170,10 @@ _efl_ui_image_zoomable_efl_player_playback_progress_set(Eo *obj EINA_UNUSED, Efl
{
efl_player_playback_progress_set(sd->img, progress);
}
else if (sd->frame_count > 1)
sd->cur_frame = lround(progress * (sd->frame_count - 1));
else if (sd->frame_count > 0)
sd->cur_frame = (lround(progress * (sd->frame_count - 1)) + 1);
else
sd->cur_frame = 0;
sd->cur_frame = 1;
}
EOLIAN static void