[EGIT] [core/efl] master 01/01: Toolbar: Use orientation interface APIs instead of horizontal set/get APIs
ami pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=aa01d5c7cb0e2b079a89736a6eb42b087ecb6c1e commit aa01d5c7cb0e2b079a89736a6eb42b087ecb6c1e Author: Yeshwanth Reddivari <r.yeshwa...@samsung.com> Date: Fri May 6 11:23:17 2016 +0530 Toolbar: Use orientation interface APIs instead of horizontal set/get APIs Test Plan: elementary_test Reviewers: raster, jpeg, cedric, singh.amitesh Reviewed By: singh.amitesh Subscribers: cedric, jpeg Differential Revision: https://phab.enlightenment.org/D3890 --- src/lib/elementary/elm_toolbar.c| 110 +--- src/lib/elementary/elm_toolbar.eo | 15 + src/lib/elementary/elm_toolbar_legacy.h | 24 +++ src/lib/elementary/elm_widget_toolbar.h | 2 +- 4 files changed, 98 insertions(+), 53 deletions(-) diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c index f0ca109..506ae53 100644 --- a/src/lib/elementary/elm_toolbar.c +++ b/src/lib/elementary/elm_toolbar.c @@ -112,7 +112,7 @@ _items_visibility_fix(Elm_Toolbar_Data *sd, if (sd->more_item) { evas_object_geometry_get(sd->VIEW(more_item), NULL, NULL, , ); -if (sd->vertical) *iw += cih; +if (sd->orientation == EFL_ORIENT_VERTICAL) *iw += cih; else *iw += ciw; } @@ -121,7 +121,7 @@ _items_visibility_fix(Elm_Toolbar_Data *sd, if (it->prio.priority > sd->standard_priority) { evas_object_geometry_get(VIEW(it), NULL, NULL, , ); - if (sd->vertical) *iw += cih; + if (sd->orientation == EFL_ORIENT_VERTICAL) *iw += cih; else *iw += ciw; it->prio.visible = (*iw <= vw); it->in_box = sd->bx; @@ -279,7 +279,7 @@ _items_size_fit(Evas_Object *obj, Evas_Coord *bl, Evas_Coord view) if (mw != -1 || mh != -1) { - if (sd->vertical) min = mh; + if (sd->orientation == EFL_ORIENT_VERTICAL) min = mh; else min = mw; if ((!full) && ((sumf + min) > view)) @@ -377,7 +377,7 @@ _resize_job(void *data) { Evas_Coord iw = 0, ih = 0, more_w = 0, more_h = 0; -if (sd->vertical) +if (sd->orientation == EFL_ORIENT_VERTICAL) { h = vh; _items_visibility_fix(sd, , vh, ); @@ -390,7 +390,7 @@ _resize_job(void *data) evas_object_geometry_get (sd->VIEW(more_item), NULL, NULL, _w, _h); -if (sd->vertical) +if (sd->orientation == EFL_ORIENT_VERTICAL) { if ((ih - more_h) <= vh) ih -= more_h; } @@ -403,8 +403,8 @@ _resize_job(void *data) * individual items won't trigger a resize. Items are be * readded below. */ evas_object_box_remove_all(sd->bx, EINA_FALSE); -if (((sd->vertical) && (ih > vh)) || -((!sd->vertical) && (iw > vw)) || more) +if (((sd->orientation == EFL_ORIENT_VERTICAL) && (ih > vh)) || +((sd->orientation == EFL_ORIENT_HORIZONTAL) && (iw > vw)) || more) { Evas_Object *menu; @@ -457,7 +457,7 @@ _resize_job(void *data) { Evas_Coord iw = 0, ih = 0; -if (sd->vertical) +if (sd->orientation == EFL_ORIENT_VERTICAL) { h = vh; _items_visibility_fix(sd, , vh, ); @@ -468,8 +468,8 @@ _resize_job(void *data) _items_visibility_fix(sd, , vw, ); } evas_object_box_remove_all(sd->bx, EINA_FALSE); -if (((sd->vertical) && (ih > vh)) || -((!sd->vertical) && (iw > vw)) || more) +if (((sd->orientation == EFL_ORIENT_VERTICAL) && (ih > vh)) || +((sd->orientation == EFL_ORIENT_HORIZONTAL) && (iw > vw)) || more) { EINA_INLIST_FOREACH(sd->items, it) { @@ -496,12 +496,12 @@ _resize_job(void *data) { Evas_Coord iw = 0, ih = 0; -if (sd->vertical) +if (sd->orientation == EFL_ORIENT_VERTICAL) h = (vh >= mh) ? vh : mh; else w = (vw >= mw) ? vw : mw; -if (sd->vertical) +if (sd->orientation == EFL_ORIENT_VERTICAL) _items_visibility_fix(sd, , vh, ); else _items_visibility_fix(sd, , vw, ); @@ -526,7 +526,7 @@ _resize_job(void *data) else evas_object_hide(sd->VIEW(more_item)); -if (sd->vertical) +if (sd->orientation == EFL_ORIENT_VERTICAL) { if (h > vh) _items_size_fit(obj, , vh); if (sd->item_count - sd->separator_count > 0) @@ -543,7 +543,7 @@ _resize_job(v
[EGIT] [core/efl] master 02/02: spin interface: common interface for flipselector and spinner
cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=f7e1be206238c04e62824fb20c347e65bc2eca3d commit f7e1be206238c04e62824fb20c347e65bc2eca3d Author: Yeshwanth Reddivari <r.yeshwa...@samsung.com> Date: Fri Apr 29 16:49:12 2016 -0700 spin interface: common interface for flipselector and spinner Summary: Added common interface for flipselector and spinner. Implemented APIs of spinner like min_max_set, step_set, value_set etc in flipselector. Test Plan: elementary_test Reviewers: raster, jpeg, singh.amitesh, woohyun, SanghyeonLee, cedric Reviewed By: cedric Differential Revision: https://phab.enlightenment.org/D3905 Signed-off-by: Cedric Bail <ced...@osg.samsung.com> --- src/Makefile_Efl.am | 1 + src/bin/elementary/test_flipselector.c | 9 ++ src/lib/efl/Efl.h| 1 + src/lib/efl/Makefile.am | 1 + src/lib/efl/interfaces/efl_interfaces_main.c | 1 + src/lib/efl/interfaces/efl_ui_spin.eo| 84 +++ src/lib/elementary/elm_flipselector.c| 103 +- src/lib/elementary/elm_flipselector.eo | 41 ++- src/lib/elementary/elm_flipselector_legacy.h | 37 +++ src/lib/elementary/elm_spinner.c | 64 +-- src/lib/elementary/elm_spinner.eo| 86 ++- src/lib/elementary/elm_spinner_legacy.h | 154 ++- src/lib/elementary/elm_widget_flipselector.h | 2 + 13 files changed, 458 insertions(+), 126 deletions(-) diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am index 3faf450..480ecfa 100644 --- a/src/Makefile_Efl.am +++ b/src/Makefile_Efl.am @@ -35,6 +35,7 @@ efl_eolian_files = \ lib/efl/interfaces/efl_vpath_file.eo \ lib/efl/interfaces/efl_vpath_core.eo \ lib/efl/interfaces/efl_vpath_file_core.eo \ + lib/efl/interfaces/efl_ui_spin.eo \ lib/efl/interfaces/efl_ui_progress.eo \ $(efl_eolian_legacy_files) \ $(NULL) diff --git a/src/bin/elementary/test_flipselector.c b/src/bin/elementary/test_flipselector.c index 62a67cf..b9cd936 100644 --- a/src/bin/elementary/test_flipselector.c +++ b/src/bin/elementary/test_flipselector.c @@ -184,5 +184,14 @@ test_flipselector(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *ev elm_box_pack_end(bx, bt); evas_object_show(bt); + fpd = elm_flipselector_add(bx); + evas_object_size_hint_weight_set(fpd, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + efl_ui_spin_step_set(fpd, 1.5); + efl_ui_spin_min_max_set(fpd, 2.3, 10.1); + efl_ui_spin_value_set(fpd, 5.3); + printf("Current value is %f\n", efl_ui_spin_value_get(fpd)); + elm_box_pack_end(bx, fpd); + evas_object_show(fpd); + evas_object_show(win); } diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h index ce4399f..074d035 100644 --- a/src/lib/efl/Efl.h +++ b/src/lib/efl/Efl.h @@ -76,6 +76,7 @@ typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command; #include "interfaces/efl_text_properties.eo.h" #include "interfaces/efl_orientation.eo.h" #include "interfaces/efl_flipable.eo.h" +#include "interfaces/efl_ui_spin.eo.h" #include "interfaces/efl_ui_progress.eo.h" #define EFL_ORIENT_0 EFL_ORIENT_UP diff --git a/src/lib/efl/Makefile.am b/src/lib/efl/Makefile.am index 760e868..673b789 100644 --- a/src/lib/efl/Makefile.am +++ b/src/lib/efl/Makefile.am @@ -34,6 +34,7 @@ interfaces/efl_vpath_manager.eo \ interfaces/efl_vpath_file.eo \ interfaces/efl_vpath_core.eo \ interfaces/efl_vpath_file_core.eo \ +interfaces/efl_ui_spin.eo \ interfaces/efl_ui_progress.eo \ $(efl_eolian_legacy_files) \ $(NULL) diff --git a/src/lib/efl/interfaces/efl_interfaces_main.c b/src/lib/efl/interfaces/efl_interfaces_main.c index 116c2d3..dbdb4fb 100644 --- a/src/lib/efl/interfaces/efl_interfaces_main.c +++ b/src/lib/efl/interfaces/efl_interfaces_main.c @@ -43,6 +43,7 @@ EAPI const Eo_Event_Description _EFL_GFX_PATH_CHANGED = #include "interfaces/efl_animator.eo.c" #include "interfaces/efl_orientation.eo.c" #include "interfaces/efl_flipable.eo.c" +#include "interfaces/efl_ui_spin.eo.c" #include "interfaces/efl_ui_progress.eo.c" EAPI void diff --git a/src/lib/efl/interfaces/efl_ui_spin.eo b/src/lib/efl/interfaces/efl_ui_spin.eo new file mode 100644 index 000..20ac64b --- /dev/null +++ b/src/lib/efl/interfaces/efl_ui_spin.eo @@ -0,0 +1,84 @@ +interface Efl.Ui.Spin() +{ + legacy_prefix: null; + methods { + @property min_max { + [[Control the minimum and maximum values for the spinner. + + Define the allowed range of values to be selected by the user. + + If actual value is less than $min, it will be updated to $min. If it + is bigger then $max, will be updated to $max. + +
[EGIT] [core/efl] master 03/07: Interface: Flip and orientation interface
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=98edbd23a4cad4698187d309a4a608f481b41263 commit 98edbd23a4cad4698187d309a4a608f481b41263 Author: Yeshwanth Reddivari <r.yeshwa...@samsung.com> Date: Wed Apr 6 10:46:04 2016 +0900 Interface: Flip and orientation interface Summary: Added flip and orientation interface and used them in evas_image. Removed efl_image_orientation_set API and used efl_orientation_set and efl_flip_set API. In implementation part, converted enums back and forth in order to keep current implementation as it is. Test Plan: src/examples/evas/evas-images5.c Reviewers: singh.amitesh, raster, tasn, herdsman, woohyun, cedric, felipealmeida, jpeg Subscribers: cedric, jpeg Differential Revision: https://phab.enlightenment.org/D3844 --- src/Makefile_Efl.am | 2 + src/examples/evas/.gitignore | 1 + src/examples/evas/Makefile.am| 6 + src/examples/evas/Makefile.examples | 1 + src/examples/evas/evas-images5.c | 200 +++ src/lib/efl/Efl.h| 2 + src/lib/efl/interfaces/efl_flip.eo | 32 + src/lib/efl/interfaces/efl_gfx_types.eot | 15 -- src/lib/efl/interfaces/efl_image.eo | 15 -- src/lib/efl/interfaces/efl_interfaces_main.c | 2 + src/lib/efl/interfaces/efl_orientation.eo| 41 ++ src/lib/elementary/elm_image.c | 82 ++- src/lib/elementary/elm_image.eo | 8 +- src/lib/elementary/elm_widget_image.h| 4 +- src/lib/evas/canvas/evas_image.eo| 9 +- src/lib/evas/canvas/evas_image_legacy.c | 9 +- src/lib/evas/canvas/evas_image_private.h | 3 + src/lib/evas/canvas/evas_object_image.c | 77 ++- 18 files changed, 458 insertions(+), 51 deletions(-) diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am index 17529a5..6f82665 100644 --- a/src/Makefile_Efl.am +++ b/src/Makefile_Efl.am @@ -23,6 +23,8 @@ efl_eolian_files = \ lib/efl/interfaces/efl_gfx_filter.eo \ lib/efl/interfaces/efl_model_base.eo \ lib/efl/interfaces/efl_animator.eo \ + lib/efl/interfaces/efl_orientation.eo \ + lib/efl/interfaces/efl_flip.eo \ lib/efl/interfaces/efl_vpath.eo \ lib/efl/interfaces/efl_vpath_manager.eo \ lib/efl/interfaces/efl_vpath_file.eo \ diff --git a/src/examples/evas/.gitignore b/src/examples/evas/.gitignore index c2f0585..3d07297 100644 --- a/src/examples/evas/.gitignore +++ b/src/examples/evas/.gitignore @@ -6,6 +6,7 @@ /evas_images2 /evas_images3 /evas_images4 +/evas_images5 /evas_init_shutdown /evas_object_manipulation /evas_object_manipulation-eo diff --git a/src/examples/evas/Makefile.am b/src/examples/evas/Makefile.am index 37eff33..76a3d98 100644 --- a/src/examples/evas/Makefile.am +++ b/src/examples/evas/Makefile.am @@ -154,6 +154,11 @@ evas_images4_SOURCES = evas-images4.c evas_images4_LDADD = $(ECORE_EVAS_COMMON_LDADD) evas_images4_CPPFLAGS = $(ECORE_EVAS_COMMON_CPPFLAGS) +EXTRA_PROGRAMS += evas_images5 +evas_images5_SOURCES = evas-images5.c +evas_images5_LDADD = $(ECORE_EVAS_COMMON_LDADD) +evas_images5_CPPFLAGS = $(ECORE_EVAS_COMMON_CPPFLAGS) + EXTRA_PROGRAMS += evas_text evas_text_SOURCES = evas-text.c evas_text_LDADD = $(ECORE_EVAS_COMMON_LDADD) @@ -347,6 +352,7 @@ evas-images.c \ evas-images2.c \ evas-images3.c \ evas-images4.c \ +evas-images5.c \ evas-init-shutdown.c \ evas-map-utils.c \ evas-map-aa.c \ diff --git a/src/examples/evas/Makefile.examples b/src/examples/evas/Makefile.examples index 0d2b33a..66197f3 100644 --- a/src/examples/evas/Makefile.examples +++ b/src/examples/evas/Makefile.examples @@ -15,6 +15,7 @@ EXAMPLES= evas-aspect-hints \ evas-images2 \ evas-images3 \ evas-images4 \ + evas-images5 \ evas-init-shutdown \ evas-map-utils \ evas-object-manipulation \ diff --git a/src/examples/evas/evas-images5.c b/src/examples/evas/evas-images5.c new file mode 100644 index 000..3dcd88d --- /dev/null +++ b/src/examples/evas/evas-images5.c @@ -0,0 +1,200 @@ +/** + * Simple Evas example illustrating some image objects functions + * + * You'll need at least one engine built for it (excluding the buffer + * one) and the png image loader/saver also built. See stdout/stderr + * for output. + * + * @verbatim + * gcc -o evas-images5 evas-images5.c `pkg-config --libs --cflags evas ecore ecore-evas efl` + * @endverbatim + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#else +#define PACKAGE_EXAMPLES_DIR "." +#endif + +#define EFL_BETA_API_SUPPORT + +#include +#include +#include +#include +#include +#include "evas-common.h" + +#define WIDTH (320) +#define HEIGHT (240) + +static const char *img_path = PACKAGE_EXAMPLES_DIR EVAS_IMAGE_FO
[EGIT] [core/efl] master 01/02: Slider: Theme - Add support for range in edc
ami pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=1152fb3e3528e024f0f9e01451783a937fdbe4dc commit 1152fb3e3528e024f0f9e01451783a937fdbe4dc Author: Yeshwanth Reddivari <r.yeshwa...@samsung.com> Date: Mon Mar 28 13:41:27 2016 +0530 Slider: Theme - Add support for range in edc phab: https://phab.enlightenment.org/D3821 Test Plan: elementary_test -to slider @feature Change-Id: Ibc3f7c93efb927a6fc602f246a795c426f80bd39 --- data/elementary/themes/edc/elm/slider.edc | 473 ++-- data/elementary/themes/img/horiz_glow_range.png | Bin 0 -> 131 bytes data/elementary/themes/img/vert_glow_range.png | Bin 0 -> 127 bytes 3 files changed, 443 insertions(+), 30 deletions(-) diff --git a/data/elementary/themes/edc/elm/slider.edc b/data/elementary/themes/edc/elm/slider.edc index b39a680..5786dfe 100644 --- a/data/elementary/themes/edc/elm/slider.edc +++ b/data/elementary/themes/edc/elm/slider.edc @@ -39,6 +39,7 @@ group { name: "elm/slider/horizontal/default"; images.image: "slider_run_bevel_horiz.png" COMP; images.image: "slider_run_base_light_horiz.png" COMP; images.image: "horiz_glow_run.png" COMP; + images.image: "horiz_glow_range.png" COMP; images.image: "horiz_glow_run_rev.png" COMP; images.image: "knob_round_small_normal.png" COMP; images.image: "knob_round_small_selected.png" COMP; @@ -65,6 +66,19 @@ group { name: "elm/slider/horizontal/default"; #define DISABLE 32 script { public slmode; + public range; + public g_timer_id; + public update_glow() +{ + new x1,y1,w1,h1; + new x2,y2,w2,h2; + get_geometry(PART:"knob", x1, y1, w1, h1); + get_geometry(PART:"knob2", x2, y2, w2, h2); + if(x2 < x1) + set_state(PART:"glow", "range_reverse", 0.0); + else + set_state(PART:"glow", "range", 0.0); +} public eval_mode(m) { new ic = m & ICON; new l = m & LABEL; @@ -72,22 +86,36 @@ group { name: "elm/slider/horizontal/default"; new u = m & UNITS; new d = m & DISABLE; new i = m & INVERT; - if (i) { -if (!d) { - set_state(PART:"base", "default", 0.0); - set_state(PART:"glow", "inverted", 0.0); -} else { - set_state(PART:"base", "disabled", 0.0); - set_state(PART:"glow", "disabled_inverted", 0.0); -} - } else { -if (!d) { - set_state(PART:"base", "default", 0.0); - set_state(PART:"glow", "default", 0.0); -} else { - set_state(PART:"base", "disabled", 0.0); - set_state(PART:"glow", "disabled", 0.0); -} + new r = get_int(range); + if (!r) { + if (i) { +if (!d) { + set_state(PART:"base", "default", 0.0); + set_state(PART:"glow", "inverted", 0.0); +} else { + set_state(PART:"base", "disabled", 0.0); + set_state(PART:"glow", "disabled_inverted", 0.0); +} + } else { +if (!d) { + set_state(PART:"base", "default", 0.0); + set_state(PART:"glow", "default", 0.0); +} else { + set_state(PART:"base", "disabled", 0.0); + set_state(PART:"glow", "disabled", 0.0); +} + } + } else if (d) { + new x1,y1,w1,h1; + new x2,y2,w2,h2; + get_geometry(PART:"knob", x1, y1, w1, h1); + get_geometry(PART:"knob2", x2, y2, w2, h2); + set_state(PART:"base", "disabled", 0.0); + if(x2 < x1) +set_state(PART:"glow", "disabled_range_reverse", 0.0); + else +set_state(PART:"glow", "disabled_range", 0.0); + } if (l) { if (!d) { @@ -189,6 +217,32 @@ group { name: "elm/slider/horizontal/default"; rel2.to: "base"; image.border: 4 0 0 0; } + description { state: "range" 0.0; +image.normal: "horiz_glow_range.png"
[EGIT] [core/efl] master 02/04: Edje: Remove duplicate NULL reassignment
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=1caea1570328cb79bddad03fbbee5127b9a7ac67 commit 1caea1570328cb79bddad03fbbee5127b9a7ac67 Author: Yeshwanth Reddivari <r.yeshwa...@samsung.com> Date: Mon Nov 23 18:51:08 2015 +0900 Edje: Remove duplicate NULL reassignment Summary: Remove duplicate code of variable 's' assignment to NULL in edje_edit_style_del. Signed-off-by: Yeshwanth Reddivari <r.yeshwa...@samsung.com> Reviewers: Hermet, alok25, mvsovani, singh.amitesh, jpeg Reviewed By: jpeg Subscribers: sachin.dev, cedric Differential Revision: https://phab.enlightenment.org/D3358 --- src/lib/edje/edje_edit.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c index 8d09e45..7922d78 100644 --- a/src/lib/edje/edje_edit.c +++ b/src/lib/edje/edje_edit.c @@ -2705,8 +2705,6 @@ edje_edit_style_del(Evas_Object *obj, const char *style) t = NULL; } free(s); - s = NULL; - s = NULL; return EINA_TRUE; } --
[EGIT] [core/efl] master 14/24: evil: avoid SIGSEV while using strlen function
cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=a605bd8498ead542405941c1f722b3b4080ad6ed commit a605bd8498ead542405941c1f722b3b4080ad6ed Author: Yeshwanth Reddivari <r.yeshwa...@samsung.com> Date: Mon Nov 9 16:10:59 2015 -0800 evil: avoid SIGSEV while using strlen function Summary: Assertion of (fp!=NULL) should be done before passing fp to strlen funcion Reviewers: singh.amitesh, Hermet, alok25, mvsovani, vtorri Subscribers: sachin.dev, cedric Differential Revision: https://phab.enlightenment.org/D3274 Signed-off-by: Cedric BAIL <ced...@osg.samsung.com> --- src/lib/evil/regex/regcomp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/evil/regex/regcomp.c b/src/lib/evil/regex/regcomp.c index 080d292..c1b7850 100644 --- a/src/lib/evil/regex/regcomp.c +++ b/src/lib/evil/regex/regcomp.c @@ -1179,9 +1179,10 @@ register cset *cs; register char *cp; { register char *fp = mcfind(cs, cp); -register size_t len = strlen(fp); +register size_t len; assert(fp != NULL); +len = strlen(fp); (void) memmove(fp, fp + len + 1, cs->smultis - (fp + len + 1 - cs->multis)); cs->smultis -= len; --
[EGIT] [core/elementary] master 01/01: Hoversel: Fix dismiss callback
ami pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=9115c17b70a311d6799c14dd5793bc1c4a89c8c5 commit 9115c17b70a311d6799c14dd5793bc1c4a89c8c5 Author: Yeshwanth Reddivari <r.yeshwa...@samsung.com> Date: Mon Nov 2 19:29:57 2015 +0530 Hoversel: Fix dismiss callback Summary: Dismiss callback was getting called on hover object instead of hoversel object. Reviewers: raster, Hermet, alok25, mvsovani, conr2d, singh.amitesh Reviewed By: singh.amitesh Subscribers: sachin.dev Differential Revision: https://phab.enlightenment.org/D3261 --- src/lib/elc_hoversel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/elc_hoversel.c b/src/lib/elc_hoversel.c index bcf3159..11e9436 100644 --- a/src/lib/elc_hoversel.c +++ b/src/lib/elc_hoversel.c @@ -352,7 +352,7 @@ _hover_end_finished(void *data, sd->scr = NULL; sd->last_location = NULL; -eo_do(obj, eo_event_callback_call(ELM_HOVERSEL_EVENT_DISMISSED, NULL)); +eo_do(data, eo_event_callback_call(ELM_HOVERSEL_EVENT_DISMISSED, NULL)); } } --
[EGIT] [core/efl] efl-1.15 01/01: Edje Example: Fix wrong usage of evas_object_color_set API
ami pushed a commit to branch efl-1.15. http://git.enlightenment.org/core/efl.git/commit/?id=43d02ed84af7fa7ba20304fc38e60456b9e7c872 commit 43d02ed84af7fa7ba20304fc38e60456b9e7c872 Author: Yeshwanth Reddivari <r.yeshwa...@samsung.com> Date: Sat Sep 19 08:38:39 2015 +0530 Edje Example: Fix wrong usage of evas_object_color_set API Summary: Evas only handles pre multiplied colors. So use r,g,b values lesser than alpha to prevent error message. Signed-off-by: Yeshwanth Reddivari <r.yeshwa...@samsung.com> Reviewers: sachin.dev, singh.amitesh Reviewed By: singh.amitesh Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D3073 --- src/examples/edje/edje-box2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/examples/edje/edje-box2.c b/src/examples/edje/edje-box2.c index 9dea393..aa5aaf7 100644 --- a/src/examples/edje/edje-box2.c +++ b/src/examples/edje/edje-box2.c @@ -201,7 +201,7 @@ main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED) o = last = evas_object_rectangle_add(evas); evas_object_size_hint_min_set(o, 50, 50); evas_object_resize(o, 50, 50); - evas_object_color_set(o, 255, 0, 0, 128); + evas_object_color_set(o, 128, 0, 0, 128); evas_object_show(o); if (!edje_object_part_box_append(edje_obj, "example/box", o)) --