2015-02-04 11:29 GMT+01:00 Jee-Yong Um <jc9...@samsung.com>: > seoz pushed a commit to branch master. > > > http://git.enlightenment.org/core/elementary.git/commit/?id=72438c578efe8447709c78b7b832730ea500ce96 > > commit 72438c578efe8447709c78b7b832730ea500ce96 > Author: Jee-Yong Um <jc9...@samsung.com> > Date: Wed Feb 4 19:26:06 2015 +0900 > > elm_label: Fixed to prevent slide's autostart before calling > elm_label_slide_go() > > Summary: > Label should not start sliding before elm_label_slide_go() is called. > However, label starts sliding automatically, > because resize callback emits slide start signal. > This patch prevents label from sliding before calling > elm_label_slide_go(). > > @fix >
Arghh, I did not spot this in time :( This commit cause a behaviour change (as the summary say) in how the slide works, as a result my labels do not slide anymore. Indeed the change is good, but we cannot change how the API works! > > Reviewers: woohyun, Hermet, seoz > > Subscribers: CHAN, woohyun > > Differential Revision: https://phab.enlightenment.org/D1906 > --- > src/lib/elm_label.c | 6 +++++- > src/lib/elm_widget_label.h | 1 + > 2 files changed, 6 insertions(+), 1 deletion(-) > > diff --git a/src/lib/elm_label.c b/src/lib/elm_label.c > index 913f1cc..34e8fa6 100644 > --- a/src/lib/elm_label.c > +++ b/src/lib/elm_label.c > @@ -86,6 +86,8 @@ _label_slide_change(Evas_Object *obj) > ELM_LABEL_DATA_GET(obj, sd); > ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); > > + if (!sd->slide_state) return; > + > edje_object_signal_emit(wd->resize_obj, "elm,state,slide,stop", "elm"); > > //doesn't support multiline slide effect > @@ -578,8 +580,10 @@ _elm_label_slide_speed_get(Eo *obj EINA_UNUSED, > Elm_Label_Data *sd) > } > > EOLIAN static void > -_elm_label_slide_go(Eo *obj, Elm_Label_Data *_pd EINA_UNUSED) > +_elm_label_slide_go(Eo *obj, Elm_Label_Data *sd) > { > + if (!sd->slide_state) sd->slide_state = EINA_TRUE; > + > _label_slide_change(obj); > elm_layout_sizing_eval(obj); > } > diff --git a/src/lib/elm_widget_label.h b/src/lib/elm_widget_label.h > index 5e9532f..e2a02d2 100644 > --- a/src/lib/elm_widget_label.h > +++ b/src/lib/elm_widget_label.h > @@ -28,6 +28,7 @@ struct _Elm_Label_Data > Eina_Bool ellipsis : 1; > Eina_Bool slide_ellipsis : 1; > Eina_Bool use_slide_speed : 1; > + Eina_Bool slide_state : 1; /**< This will be marked as > EINA_TRUE after elm_label_slide_go() is called. */ > }; > > #define ELM_LABEL_DATA_GET(o, sd) \ > > -- > > > ------------------------------------------------------------------------------ Dive into the World of Parallel Programming. The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net/ _______________________________________________ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
