[EGIT] [editors/vim-configs] master 01/01: syntax/eo: add support for single-line comments (//)
jayji pushed a commit to branch master. http://git.enlightenment.org/editors/vim-configs.git/commit/?id=d5c23f4601a04812a5a5d531db6fbe914e2d7bca commit d5c23f4601a04812a5a5d531db6fbe914e2d7bca Author: Jean Guyomarc'h Date: Wed Mar 16 23:01:56 2016 +0100 syntax/eo: add support for single-line comments (//) --- syntax/eo.vim | 1 + 1 file changed, 1 insertion(+) diff --git a/syntax/eo.vim b/syntax/eo.vim index 1ffa42d..2068857 100644 --- a/syntax/eo.vim +++ b/syntax/eo.vim @@ -39,6 +39,7 @@ syn regioneoBlock start="{" end="}" transparent fold syn region eo_comment start="\/\*" end="\*\/" contains=@eoCommentGroup syn region eo_comment start="\[\[" end="\]\]" contains=@eoCommentGroup +syn region eo_comment start="//" skip="\\$" end="$" keepend contains=@eoCommentGroup " Numbers "integer number, or floating point number without a dot and with "f". --
[EGIT] [core/efl] master 05/06: Evas.Image: Simplify inheritance tree of image classes
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=8c398c365c44435db657ca104f04128e88e8edbe commit 8c398c365c44435db657ca104f04128e88e8edbe Author: Jean-Philippe Andre Date: Wed Mar 16 20:53:34 2016 +0900 Evas.Image: Simplify inheritance tree of image classes This is a bit artificial, as all image objects are still based on the Evas.Image main class. The inheritance tree alone does not give much information on what features are supported by which class (eg. only Efl.Canvas.Image supports the file interface for file_set). --- src/lib/evas/canvas/efl_canvas_proxy.eo| 2 +- src/lib/evas/canvas/efl_canvas_scene3d.eo | 2 +- src/lib/evas/canvas/efl_canvas_snapshot.eo | 2 +- src/lib/evas/canvas/efl_canvas_surface.eo | 2 +- src/lib/evas/canvas/evas_image.eo | 5 ++--- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/lib/evas/canvas/efl_canvas_proxy.eo b/src/lib/evas/canvas/efl_canvas_proxy.eo index 19b16ee..2c6f6b3 100644 --- a/src/lib/evas/canvas/efl_canvas_proxy.eo +++ b/src/lib/evas/canvas/efl_canvas_proxy.eo @@ -1,4 +1,4 @@ -class Efl.Canvas.Proxy (Evas.Image, Efl.Gfx.Base, Efl.Image, Efl.Gfx.Buffer, Efl.Gfx.Fill, Efl.Gfx.View, Efl.Gfx.Filter) +class Efl.Canvas.Proxy (Evas.Image) { [[Low-level proxy image object. diff --git a/src/lib/evas/canvas/efl_canvas_scene3d.eo b/src/lib/evas/canvas/efl_canvas_scene3d.eo index 685e422..0cca69f 100644 --- a/src/lib/evas/canvas/efl_canvas_scene3d.eo +++ b/src/lib/evas/canvas/efl_canvas_scene3d.eo @@ -1,4 +1,4 @@ -class Efl.Canvas.Scene3d (Evas.Image, Efl.Gfx.Base, Efl.Image, Efl.Gfx.Buffer, Efl.Gfx.Fill, Efl.Gfx.View, Efl.Gfx.Filter) +class Efl.Canvas.Scene3d (Evas.Image) { [[A UI view for EFL Canvas 3D.]] legacy_prefix: null; diff --git a/src/lib/evas/canvas/efl_canvas_snapshot.eo b/src/lib/evas/canvas/efl_canvas_snapshot.eo index 527583e..fafaada 100644 --- a/src/lib/evas/canvas/efl_canvas_snapshot.eo +++ b/src/lib/evas/canvas/efl_canvas_snapshot.eo @@ -1,4 +1,4 @@ -class Efl.Canvas.Snapshot (Evas.Image, Efl.Gfx.Base, Efl.Image, Efl.Gfx.Buffer, Efl.Gfx.Fill, Efl.Gfx.View, Efl.Gfx.Filter) +class Efl.Canvas.Snapshot (Evas.Image) { [[Low-level snapshot image object. diff --git a/src/lib/evas/canvas/efl_canvas_surface.eo b/src/lib/evas/canvas/efl_canvas_surface.eo index cc4b8d7..722f54f 100644 --- a/src/lib/evas/canvas/efl_canvas_surface.eo +++ b/src/lib/evas/canvas/efl_canvas_surface.eo @@ -1,4 +1,4 @@ -mixin Efl.Canvas.Surface (Evas.Image, Efl.Gfx.Buffer, Efl.Gfx.View) +mixin Efl.Canvas.Surface (Evas.Image) { [[Native surfaces usually bound to an externally-managed buffer. diff --git a/src/lib/evas/canvas/evas_image.eo b/src/lib/evas/canvas/evas_image.eo index 5761384..3bbc26e 100644 --- a/src/lib/evas/canvas/evas_image.eo +++ b/src/lib/evas/canvas/evas_image.eo @@ -1,8 +1,7 @@ type @extern Evas_Object_Image_Pixels_Get_Cb: __undefined_type; /* FIXME: func pointers are not supported. */ -class Evas.Image (Evas.Object, Efl.File, Efl.Image, Efl.Image_Load, - Efl.Image_Animated, Efl.Gfx.Buffer, Efl.Gfx.Fill, - Efl.Gfx.View, Evas.Filter) +class Evas.Image (Evas.Object, Evas.Filter, + Efl.Image, Efl.Gfx.Buffer, Efl.Gfx.Fill, Efl.Gfx.View, Efl.File) { /* Legacy is implement inside Efl.Canvas.Image */ legacy_prefix: evas_object_image; --
[EGIT] [website/www-content] master 10/10: Wiki page download-latest changed with summary [add edi] by Andrew Williams
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=203aa9d7b720e765e8c89833a186b99d9ffa1245 commit 203aa9d7b720e765e8c89833a186b99d9ffa1245 Author: Andrew Williams Date: Fri Mar 18 14:06:22 2016 -0700 Wiki page download-latest changed with summary [add edi] by Andrew Williams --- pages/download-latest.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pages/download-latest.txt b/pages/download-latest.txt index d854a01..24648cd 100644 --- a/pages/download-latest.txt +++ b/pages/download-latest.txt @@ -13,6 +13,7 @@ epour_v = 0.6.0 enventor_v= 0.8.1 eflete_v = 0.6.0 +edi_v = 0.3.0 extn = .tar.gz dlbase= http://download.enlightenment.org/rel/ @@ -35,5 +36,6 @@ dlbase= http://download.enlightenment.org/rel/ ^Development Tool^Version^ |[[%%dlbase%%apps/enventor/enventor-%%enventor_vextn%%|Enventor]]|%%enventor_v%%| |[[%%dlbase%%apps/eflete/eflete-%%eflete_vextn%%|EFL Edje Theme Editor]]|%%eflete_v%%| +|[[%%dlbase%%apps/edi/edi-%%edi_vextn%%|Enlightenment IDE]]|%%eflete_v%%| Go to the [[https://phab.enlightenment.org/w/packaging_status/|package status of distributions]] for information on what distributions have packages and how up to date they are. --
[EGIT] [tools/expedite] master 03/04: migrate to new snapshot object.
cedric pushed a commit to branch master. http://git.enlightenment.org/tools/expedite.git/commit/?id=f9834c142cdb8c7b829d75751706a732c16bdbaa commit f9834c142cdb8c7b829d75751706a732c16bdbaa Author: Cedric BAIL Date: Thu Mar 17 16:54:05 2016 -0700 migrate to new snapshot object. --- src/bin/snapshot_widgets_file_icons.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/bin/snapshot_widgets_file_icons.c b/src/bin/snapshot_widgets_file_icons.c index 328073a..dbdab77 100644 --- a/src/bin/snapshot_widgets_file_icons.c +++ b/src/bin/snapshot_widgets_file_icons.c @@ -85,13 +85,12 @@ static void _setup(void) "blur { 5, dst = a, color = '#ff0' }" ; - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_SNAPSHOT_CLASS, evas); o_snap = o; efl_gfx_visible_set(o, EINA_TRUE); efl_gfx_position_set(o, 50, 50); efl_gfx_size_set(o, 200, 200); efl_gfx_fill_set(o, 0, 0, 200, 200); - evas_obj_image_snapshot_set(o, EINA_TRUE); efl_gfx_filter_program_set(o, filter, "test"); done = 0; --
[EGIT] [website/www-content] master 09/10: Merge branch 'master' of git+ssh://git.enlightenment.org/website/www-content
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=5bd58c09e3c6b609ba10f363c7fd59c670c84159 commit 5bd58c09e3c6b609ba10f363c7fd59c670c84159 Merge: 4fe97e6 9355dd9 Author: www.enlightenment.org Date: Thu Mar 10 02:53:24 2016 -0800 Merge branch 'master' of git+ssh://git.enlightenment.org/website/www-content pages/download-latest.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --
[EGIT] [core/elementary] master 01/02: modules: remove error message from dlsym() when a module is loaded
cedric pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=7e801846e9c77328f42364f5b9aebe3d4b75b812 commit 7e801846e9c77328f42364f5b9aebe3d4b75b812 Author: Youngbok Shin Date: Fri Mar 18 11:54:00 2016 -0700 modules: remove error message from dlsym() when a module is loaded Summary: dlsym() could print error message when it tried to load a nonexistent symbol. Whenever eina_module_load is called, it checks __eina_module_init symbol. Even if there is no symbol for init, module loading could be done well. But, it will print an error message. So, we need to use EINA_MODULE_INIT, EINA_MODULE_SHUTDOWN in every modules for removing error messages. Test Plan: N/A Reviewers: woohyun, raster, Hermet, seoz, cedric Reviewed By: cedric Differential Revision: https://phab.enlightenment.org/D3805 Signed-off-by: Cedric Bail --- src/modules/access_output/mod.c| 14 ++ .../datetime_input_ctxpopup/datetime_input_ctxpopup.c | 14 ++ src/modules/test_entry/mod.c | 14 ++ 3 files changed, 42 insertions(+) diff --git a/src/modules/access_output/mod.c b/src/modules/access_output/mod.c index 3f15f32..0dff159 100644 --- a/src/modules/access_output/mod.c +++ b/src/modules/access_output/mod.c @@ -121,3 +121,17 @@ out_done_callback_set(void (*func) (void *data), const void *data) cb_func = func; cb_data = (void *)data; } + +static Eina_Bool +_module_init(void) +{ + return EINA_TRUE; +} + +static void +_module_shutdown(void) +{ +} + +EINA_MODULE_INIT(_module_init); +EINA_MODULE_SHUTDOWN(_module_shutdown); diff --git a/src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c b/src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c index b8dc56c..198f095 100644 --- a/src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c +++ b/src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c @@ -382,3 +382,17 @@ elm_modapi_shutdown(void *m EINA_UNUSED) { return 1; // succeed always } + +static Eina_Bool +_module_init(void) +{ + return EINA_TRUE; +} + +static void +_module_shutdown(void) +{ +} + +EINA_MODULE_INIT(_module_init); +EINA_MODULE_SHUTDOWN(_module_shutdown); diff --git a/src/modules/test_entry/mod.c b/src/modules/test_entry/mod.c index 025d9b4..d2d5171 100644 --- a/src/modules/test_entry/mod.c +++ b/src/modules/test_entry/mod.c @@ -35,3 +35,17 @@ obj_longpress(Evas_Object *obj) { printf("longpress: %p\n", obj); } + +static Eina_Bool +_module_init(void) +{ + return EINA_TRUE; +} + +static void +_module_shutdown(void) +{ +} + +EINA_MODULE_INIT(_module_init); +EINA_MODULE_SHUTDOWN(_module_shutdown); --
[EGIT] [tools/eflete] master 12/34: UTC: update history test
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=d8b6bbeb3e1c88720fe4190342557430fa67809f commit d8b6bbeb3e1c88720fe4190342557430fa67809f Author: Andrii Kroitor Date: Wed Mar 16 12:18:09 2016 +0200 UTC: update history test updated function prototypes one change shouldn't be added to history twice --- tests/test_history/history_undo_redo.c | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/test_history/history_undo_redo.c b/tests/test_history/history_undo_redo.c index 42b7967..48ae3e7 100644 --- a/tests/test_history/history_undo_redo.c +++ b/tests/test_history/history_undo_redo.c @@ -34,7 +34,7 @@ static Evas_Object *pseudo_object; /* test stubs that check args, return specified value, and report what function was called */ static int _function_type_int_undo_return_true_called = 0; static Eina_Bool -_function_type_int_undo_return_true(Evas_Object *obj, int val) +_function_type_int_undo_return_true(Evas_Object *obj, Change *change __UNUSED__, Eina_Bool merge __UNUSED__, int val) { ck_assert(obj == pseudo_object); ck_assert(val == 42); @@ -44,7 +44,7 @@ _function_type_int_undo_return_true(Evas_Object *obj, int val) static int _function_type_int_redo_return_true_called = 0; static Eina_Bool -_function_type_int_redo_return_true(Evas_Object *obj, int val) +_function_type_int_redo_return_true(Evas_Object *obj, Change *change __UNUSED__, Eina_Bool merge __UNUSED__, int val) { ck_assert(obj == pseudo_object); ck_assert(val == 24); @@ -99,6 +99,8 @@ EFLETE_TEST (history_undo_redo_test_p) d1->redo.args.type_i.i1 = 24; change_diff_add(change, d1); history_change_add(history, change); + change = change_add("test"); + change_diff_add(change, d1); history_change_add(history, change); ck_assert(history_undo(history) == true); --
[EGIT] [core/enlightenment] master 01/02: reduce wizard connman timeout timer to 0.5s
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=9eba966126c00ad8de1a20a7182e5f757d8f36b2 commit 9eba966126c00ad8de1a20a7182e5f757d8f36b2 Author: Mike Blumenkrantz Date: Wed Mar 16 14:32:15 2016 -0400 reduce wizard connman timeout timer to 0.5s dbus is not this slow. --- src/modules/wizard/page_110.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/wizard/page_110.c b/src/modules/wizard/page_110.c index cbca7ee..5f710a3 100644 --- a/src/modules/wizard/page_110.c +++ b/src/modules/wizard/page_110.c @@ -127,7 +127,7 @@ wizard_page_show(E_Wizard_Page *pg) _check_connman_owner, pg); if (connman_timeout) ecore_timer_del(connman_timeout); -connman_timeout = ecore_timer_add(2.0, _connman_fail, pg); +connman_timeout = ecore_timer_add(0.5, _connman_fail, pg); have_connman = EINA_TRUE; e_wizard_button_next_enable_set(0); } --
[EGIT] [core/efl] master 01/01: cxx: follow eoid to eo_self rename in cxx generator and bindings
stefan pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=e981bfc4e8f1ac2eaa2d8c1fa120c4ee27b095c2 commit e981bfc4e8f1ac2eaa2d8c1fa120c4ee27b095c2 Author: Stefan Schmidt Date: Wed Mar 16 21:11:17 2016 +0100 cxx: follow eoid to eo_self rename in cxx generator and bindings Bringing efl back to a building state with cxx enabled. --- src/bindings/eo_cxx/eo_cxx_interop.hh | 6 +++--- src/bindings/eo_cxx/eo_inherit.hh | 2 +- src/lib/eolian_cxx/grammar/eo_class_constructors_generator.hh | 8 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/bindings/eo_cxx/eo_cxx_interop.hh b/src/bindings/eo_cxx/eo_cxx_interop.hh index 18af392..1e35d0c 100644 --- a/src/bindings/eo_cxx/eo_cxx_interop.hh +++ b/src/bindings/eo_cxx/eo_cxx_interop.hh @@ -472,11 +472,11 @@ F* alloc_static_callback(F&& f) template inline -void call_ctors(Eo* _obj_eoid, Fs&&... fs) +void call_ctors(Eo* _obj_eo_self, Fs&&... fs) { - std::initializer_list const v {(fs(_obj_eoid), 0)...}; + std::initializer_list const v {(fs(_obj_eo_self), 0)...}; (void) v; - (void) _obj_eoid; + (void) _obj_eo_self; } } } // namespace efl { namespace eolian { diff --git a/src/bindings/eo_cxx/eo_inherit.hh b/src/bindings/eo_cxx/eo_inherit.hh index 9639e33..4944dc4 100644 --- a/src/bindings/eo_cxx/eo_inherit.hh +++ b/src/bindings/eo_cxx/eo_inherit.hh @@ -85,7 +85,7 @@ struct inherit inherit(efl::eo::parent_type _p, Args&& ... args) { _eo_cls = detail::create_class (eina::make_index_sequence()); - _eo_raw = eo_add_ref(_eo_cls, _p._eo_raw, detail::inherit_constructor(eoid, this), ::efl::eolian::call_ctors(eoid, args...)); + _eo_raw = eo_add_ref(_eo_cls, _p._eo_raw, detail::inherit_constructor(eo_self, this), ::efl::eolian::call_ctors(eo_self, args...)); ::efl::eolian::register_ev_del_free_callback(_eo_raw, args...); } diff --git a/src/lib/eolian_cxx/grammar/eo_class_constructors_generator.hh b/src/lib/eolian_cxx/grammar/eo_class_constructors_generator.hh index 2a7091a..21395e9 100644 --- a/src/lib/eolian_cxx/grammar/eo_class_constructors_generator.hh +++ b/src/lib/eolian_cxx/grammar/eo_class_constructors_generator.hh @@ -158,9 +158,9 @@ operator<<(std::ostream& out, functors_constructor_methods const& x) << tab(2) << "{}" << endl; // Struct operator() -out << tab(2) << "void operator()(Eo* _obj_eoid)" << endl +out << tab(2) << "void operator()(Eo* _obj_eo_self)" << endl << tab(2) << "{" << endl -<< tab(3) << "::" << c.impl << "(_obj_eoid" << (c.params.empty() ? "" : ", ") +<< tab(3) << "::" << c.impl << "(_obj_eo_self" << (c.params.empty() ? "" : ", ") << parameters_forward_to_c(c.params) << ");" << endl << tab(2) << "}" << endl; @@ -580,10 +580,10 @@ operator<<(std::ostream& out, function_call_constructor_methods const& x) << tab(2) << "Eo* _ret_eo = eo_add_ref(" << x._cls.eo_name << ", _p._eo_raw"; for (it = first; it != last; ++it) { -out << ", _c" << (it-first) << "(eoid)"; +out << ", _c" << (it-first) << "(eo_self)"; } if (!x._cls.optional_constructors.empty()) - out << ", ::efl::eolian::call_ctors(eoid, _opts...)"; + out << ", ::efl::eolian::call_ctors(eo_self, _opts...)"; out << ");" << endl << endl; for (it = first; it != last; ++it) --
[EGIT] [website/www-content] master 01/10: Wiki page ubuntu-start changed with summary [] by Philippe Jean Guillaumie
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=f7369a34bbd2877378afd594c7c1ad97b6bec85d commit f7369a34bbd2877378afd594c7c1ad97b6bec85d Author: Philippe Jean Guillaumie Date: Tue Mar 8 23:31:27 2016 -0800 Wiki page ubuntu-start changed with summary [] by Philippe Jean Guillaumie --- pages/distros/ubuntu-start.txt | 6 -- 1 file changed, 6 deletions(-) diff --git a/pages/distros/ubuntu-start.txt b/pages/distros/ubuntu-start.txt index b00c693..796b6a6 100644 --- a/pages/distros/ubuntu-start.txt +++ b/pages/distros/ubuntu-start.txt @@ -81,9 +81,3 @@ libxcb-keysyms1-dev libbullet-dev vlc libvlc-dev autoconf libtool Then go to [[../docs-efl-start]] to learn how to install the whole thing ;-) - -//Alternatively, if you do not want to delve into the many subtleties of the compilation process — while retaining a fully functional Ubuntu system when build has finished — check out batden's bash script here:// -[[http://ubuntuforums.org/showthread.php?t=2274982]] - -//This script also takes care of installing all the necessary dependencies: the list of the dependencies is somewhat different from those listed above. -// --
[EGIT] [tools/eflete] master 02/04: group_navigator: indexes at part add function and forgotten part type
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=0c1e8e0ae9033f50c959c951ba0c2d2c92a93380 commit 0c1e8e0ae9033f50c959c951ba0c2d2c92a93380 Author: Vitalii Vorobiov Date: Fri Mar 18 09:40:05 2016 +0200 group_navigator: indexes at part add function and forgotten part type Fixes T3312 --- src/bin/ui/workspace/group_navigator.c | 18 ++ 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/bin/ui/workspace/group_navigator.c b/src/bin/ui/workspace/group_navigator.c index 14cc714..e6d98d2 100644 --- a/src/bin/ui/workspace/group_navigator.c +++ b/src/bin/ui/workspace/group_navigator.c @@ -728,7 +728,6 @@ _popup_add_part_ok_clicked(void *data, assert(pl != NULL); if (elm_object_disabled_get(pl->popup.btn_add)) return; - item = ewe_combobox_select_item_get(pl->popup.combobox); switch (item->index) { @@ -736,27 +735,30 @@ _popup_add_part_ok_clicked(void *data, type = EDJE_PART_TYPE_RECTANGLE; break; case 1: - type = EDJE_PART_TYPE_IMAGE; + type = EDJE_PART_TYPE_TEXT; break; case 2: - type = EDJE_PART_TYPE_SWALLOW; + type = EDJE_PART_TYPE_IMAGE; break; case 3: - type = EDJE_PART_TYPE_TEXTBLOCK; + type = EDJE_PART_TYPE_SWALLOW; break; case 4: - type = EDJE_PART_TYPE_GROUP; + type = EDJE_PART_TYPE_TEXTBLOCK; break; case 5: - type = EDJE_PART_TYPE_BOX; + type = EDJE_PART_TYPE_GROUP; break; case 6: - type = EDJE_PART_TYPE_TABLE; + type = EDJE_PART_TYPE_BOX; break; case 7: - type = EDJE_PART_TYPE_PROXY; + type = EDJE_PART_TYPE_TABLE; break; case 8: + type = EDJE_PART_TYPE_PROXY; + break; + case 9: type = EDJE_PART_TYPE_SPACER; break; } --
[EGIT] [core/efl] master 01/01: evas: fix access to possibility undefined function.
cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=5f908de18d153fc4eea68f349f31834a3350b5a7 commit 5f908de18d153fc4eea68f349f31834a3350b5a7 Author: Cedric BAIL Date: Thu Mar 17 16:12:51 2016 -0700 evas: fix access to possibility undefined function. --- src/lib/evas/canvas/evas_object_image.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c index 2320f6f..097c04f 100644 --- a/src/lib/evas/canvas/evas_object_image.c +++ b/src/lib/evas/canvas/evas_object_image.c @@ -3271,7 +3271,8 @@ _evas_image_efl_gfx_buffer_buffer_get(Eo *eo_obj, Evas_Image_Data *o, // FIXME: length needs to be properly checked with the engine // as we just ignore l,r,t,b here - ENFN->image_stride_get(ENDT, o->engine_data, &stride); + if (ENFN->image_stride_get) + ENFN->image_stride_get(ENDT, o->engine_data, &stride); if (!stride) stride = _evas_common_rgba_image_surface_size(o->cur->image.w, 1, o->cur->cspace, NULL, NULL, NULL, NULL); --
[EGIT] [core/efl] master 01/02: edje_cc: make script_override default value as EINA_FALSE
cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=20c9d087d1d17716c120a3653e74323b6525c792 commit 20c9d087d1d17716c120a3653e74323b6525c792 Author: Jee-Yong Um Date: Fri Mar 18 11:52:52 2016 -0700 edje_cc: make script_override default value as EINA_FALSE Summary: script_override variable is initialized as EINA_FALSE when group is created, but assign EINA_TRUE can mislead some developers to think script_override default value is EINA_TRUE. Reviewers: Jaehyun_Cho Subscribers: cedric, jpeg Differential Revision: https://phab.enlightenment.org/D3803 Signed-off-by: Cedric Bail --- src/bin/edje/edje_cc_handlers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c index edc3542..26f53ca 100644 --- a/src/bin/edje/edje_cc_handlers.c +++ b/src/bin/edje/edje_cc_handlers.c @@ -163,7 +163,7 @@ static Edje_Part_Description_Common *parent_desc = NULL; static Edje_Program *current_program = NULL; static Eina_List *current_program_lookups = NULL; Eina_Bool current_group_inherit = EINA_FALSE; -Eina_Bool script_override = EINA_TRUE; +Eina_Bool script_override = EINA_FALSE; static Edje_Program *sequencing = NULL; static Eina_List *sequencing_lookups = NULL; --
[EGIT] [tools/expedite] master 04/04: migrate to new broken data_get/set api.
cedric pushed a commit to branch master. http://git.enlightenment.org/tools/expedite.git/commit/?id=f8b38f6c24802fb895615c0fef14994f8083629e commit f8b38f6c24802fb895615c0fef14994f8083629e Author: Cedric BAIL Date: Thu Mar 17 16:54:20 2016 -0700 migrate to new broken data_get/set api. --- src/bin/image_data_argb.c | 18 ++-- src/bin/image_data_argb_alpha.c| 19 +++-- src/bin/image_data_ycbcr601pl.c| 31 --- ...mage_data_ycbcr601pl_map_nearest_solid_rotate.c | 18 ++-- src/bin/image_data_ycbcr601pl_map_solid_rotate.c | 18 ++-- src/bin/image_data_ycbcr601pl_wide_stride.c| 98 +++--- 6 files changed, 105 insertions(+), 97 deletions(-) diff --git a/src/bin/image_data_argb.c b/src/bin/image_data_argb.c index 9d1bca5..25666fc 100644 --- a/src/bin/image_data_argb.c +++ b/src/bin/image_data_argb.c @@ -22,18 +22,21 @@ static void _setup(void) { int i; Evas_Object *o; + void *pixels; + + pixels = malloc(sizeof (int) * 640 * 480); for (i = 0; i < 1; i++) { o = eo_add(EVAS_IMAGE_CLASS, evas); o_images[i] = o; -evas_obj_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC); -evas_obj_image_colorspace_set(o, EVAS_COLORSPACE_ARGB); -efl_gfx_view_size_set(o, 640, 480); -evas_obj_image_alpha_set(o, 0); +efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC); +efl_gfx_buffer_alpha_set(o, 0); efl_gfx_fill_set(o, 0, 0, 640, 480); efl_gfx_size_set(o, 640, 480); efl_gfx_visible_set(o, EINA_TRUE); +efl_gfx_buffer_copy_set(o_images[i], pixels, 640, 480, 640 * sizeof (int), EFL_GFX_COLORSPACE_ARGB); } + free(pixels); done = 0; } @@ -60,8 +63,7 @@ static void _loop(double t, int f) efl_gfx_position_set(o_images[i], x, y); efl_gfx_size_set(o_images[i], w, h); efl_gfx_fill_set(o_images[i], 0, 0, w, h); -data = evas_obj_image_data_get(o_images[i], 1); -st = evas_obj_image_stride_get(o_images[i]); +data = efl_gfx_buffer_get(o_images[i], 1, &w, &h, &st, NULL); st = st >> 2; p = data; for (y = 0; y < h; y++) @@ -73,8 +75,8 @@ static void _loop(double t, int f) } p += (st - w); } -evas_obj_image_data_set(o_images[i], data); -evas_obj_image_data_update_add(o_images[i], 0, 0, w, h); +efl_gfx_buffer_set(o_images[i], data, w, h, st << 2, EFL_GFX_COLORSPACE_ARGB); +efl_gfx_buffer_update_add(o_images[i], 0, 0, w, h); } FPS_STD(NAME); } diff --git a/src/bin/image_data_argb_alpha.c b/src/bin/image_data_argb_alpha.c index 714e092..6eb8662 100644 --- a/src/bin/image_data_argb_alpha.c +++ b/src/bin/image_data_argb_alpha.c @@ -22,18 +22,21 @@ static void _setup(void) { int i; Evas_Object *o; + void *pixels; + + pixels = malloc(sizeof (int) * 640 * 480); for (i = 0; i < 1; i++) { o = eo_add(EVAS_IMAGE_CLASS, evas); o_images[i] = o; -evas_obj_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC); -evas_obj_image_colorspace_set(o, EVAS_COLORSPACE_ARGB); -efl_gfx_view_size_set(o, 640, 480); -evas_obj_image_alpha_set(o, 1); +efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC); +efl_gfx_buffer_alpha_set(o, 1); efl_gfx_fill_set(o, 0, 0, 640, 480); efl_gfx_size_set(o, 640, 480); efl_gfx_visible_set(o, EINA_TRUE); +efl_gfx_buffer_copy_set(o_images[i], pixels, 640, 480, 640 * sizeof (int), EFL_GFX_COLORSPACE_ARGB); } + free(pixels); done = 0; } @@ -53,6 +56,7 @@ static void _loop(double t, int f) { unsigned int *data, *p; int a, r, g, b; + w = 640; h = 480; x = (win_w / 2) - (w / 2); @@ -60,8 +64,7 @@ static void _loop(double t, int f) efl_gfx_position_set(o_images[i], x, y); efl_gfx_size_set(o_images[i], w, h); efl_gfx_fill_set(o_images[i], 0, 0, w, h); -data = evas_obj_image_data_get(o_images[i], 1); -st = evas_obj_image_stride_get(o_images[i]); +data = efl_gfx_buffer_get(o_images[i], 1, &w, &h, &st, NULL); st = st >> 2; p = data; for (y = 0; y < h; y++) @@ -84,8 +87,8 @@ static void _loop(double t, int f) } p += (st - w); } -evas_obj_image_data_set(o_images[i], data); -evas_obj_image_data_update_add(o_images[i], 0, 0, w, h); +efl_gfx_buffer_set(o_images[i], data, w, h, st << 2, EFL_GFX_COLORSPACE_ARGB); +efl_gfx_buffer_update_add(o_images[i], 0, 0, w, h); } FPS_STD(NAME); } diff --git a/src/bin/image_data_ycbcr601pl.c b/src/bin/image_data_ycbcr601pl.c index 42a20a5..f28ef97 100644 --- a/src/bin/image_data_ycbcr601pl.c +++ b/src/bin/image_data_ycbcr601pl.c
[EGIT] [tools/eflete] master 15/34: group_navigator: check index instead of string for part add
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=72fc06a56cb7cf0b261e64ee9bc5faee6e4867b9 commit 72fc06a56cb7cf0b261e64ee9bc5faee6e4867b9 Author: Vitalii Vorobiov Date: Tue Mar 15 19:51:32 2016 +0200 group_navigator: check index instead of string for part add --- src/bin/ui/workspace/group_navigator.c | 43 -- 1 file changed, 30 insertions(+), 13 deletions(-) diff --git a/src/bin/ui/workspace/group_navigator.c b/src/bin/ui/workspace/group_navigator.c index d21e120..25a6654 100644 --- a/src/bin/ui/workspace/group_navigator.c +++ b/src/bin/ui/workspace/group_navigator.c @@ -730,19 +730,36 @@ _popup_add_part_ok_clicked(void *data, if (elm_object_disabled_get(pl->popup.btn_add)) return; item = ewe_combobox_select_item_get(pl->popup.combobox); - TODO("add data to combobox item to get rid of string comparsion") -#define CHECK_TYPE(TYPE) (!strcmp(item->title, part_types[TYPE])) type = TYPE; - if CHECK_TYPE(EDJE_PART_TYPE_RECTANGLE) - else if CHECK_TYPE(EDJE_PART_TYPE_TEXT) - else if CHECK_TYPE(EDJE_PART_TYPE_IMAGE) - else if CHECK_TYPE(EDJE_PART_TYPE_SWALLOW) - else if CHECK_TYPE(EDJE_PART_TYPE_TEXTBLOCK) - else if CHECK_TYPE(EDJE_PART_TYPE_GROUP) - else if CHECK_TYPE(EDJE_PART_TYPE_BOX) - else if CHECK_TYPE(EDJE_PART_TYPE_TABLE) - else if CHECK_TYPE(EDJE_PART_TYPE_PROXY) - else if CHECK_TYPE(EDJE_PART_TYPE_SPACER) -#undef CHECK_TYPE + switch (item->index) + { + case 1: + type = EDJE_PART_TYPE_RECTANGLE; + break; + case 2: + type = EDJE_PART_TYPE_IMAGE; + break; + case 3: + type = EDJE_PART_TYPE_SWALLOW; + break; + case 4: + type = EDJE_PART_TYPE_TEXTBLOCK; + break; + case 5: + type = EDJE_PART_TYPE_GROUP; + break; + case 6: + type = EDJE_PART_TYPE_BOX; + break; + case 7: + type = EDJE_PART_TYPE_TABLE; + break; + case 8: + type = EDJE_PART_TYPE_PROXY; + break; + case 9: + type = EDJE_PART_TYPE_SPACER; + break; + } assert(type != EDJE_PART_TYPE_NONE); name = elm_entry_entry_get(pl->popup.entry_name); --
[EGIT] [core/elementary] elementary-1.17 03/03: docs: bring back docs from eo files by switching to the new group name
stefan pushed a commit to branch elementary-1.17. http://git.enlightenment.org/core/elementary.git/commit/?id=090fd8b30a4b787e98e434572628ab5785ca8b89 commit 090fd8b30a4b787e98e434572628ab5785ca8b89 Author: Stefan Schmidt Date: Wed Mar 16 22:52:23 2016 +0100 docs: bring back docs from eo files by switching to the new group name During the migration of docs to the eo file the group name changed to have a Elm_ prefix which resulted in our docs not including this group and not showing any of the docs in there. Switching to the new name fixes this. Having this prefix makes sense especially as we are now merging elm into efl. Hopefully that will be the last change. @fix Ref T3109 --- doc/index.doxy| 42 - src/lib/elm_app.h | 36 src/lib/elm_cache.h | 4 +- src/lib/elm_config.h | 210 +- src/lib/elm_cursor.h | 16 ++-- src/lib/elm_debug.h | 6 +- src/lib/elm_deprecated.h | 4 +- src/lib/elm_finger.h | 4 +- src/lib/elm_focus.h | 44 - src/lib/elm_focus_item.h | 6 +- src/lib/elm_font.h| 14 +-- src/lib/elm_general.h | 20 ++-- src/lib/elm_getting_started.h | 2 +- src/lib/elm_mirroring.h | 10 +- src/lib/elm_object.h | 56 +-- src/lib/elm_object_item.h | 10 +- src/lib/elm_removed.h | 50 +- src/lib/elm_scale.h | 6 +- src/lib/elm_scroll.h | 22 ++--- src/lib/elm_theme.h | 64 ++--- src/lib/elm_transit.h | 88 +- src/lib/els_cursor.c | 2 +- 22 files changed, 358 insertions(+), 358 deletions(-) diff --git a/doc/index.doxy b/doc/index.doxy index eb197a3..1ac6e76 100644 --- a/doc/index.doxy +++ b/doc/index.doxy @@ -4,29 +4,29 @@ * Elementary is mostly composed of widgets, but it also contains some * infrastructure modules that facilitate the use of widgets. These are the * infrastructure modules: - * @li @ref App - * @li @ref Caches - * @li @ref Cursors - * @li @ref Debug - * @li @ref Config - * @li @ref Engine - * @li @ref Fonts - * @li @ref Profile - * @li @ref Fingers - * @li @ref Focus - * @li @ref General + * @li @ref Elm_App + * @li @ref Elm_Caches + * @li @ref Elm_Cursors + * @li @ref Elm_Debug + * @li @ref Elm_Config + * @li @ref Elm_Engine + * @li @ref Elm_Fonts + * @li @ref Elm_Profile + * @li @ref Elm_Fingers + * @li @ref Elm_Focus + * @li @ref Elm_General * @li @ref Elm_Gesture_Layer - * @li @ref Password_last_show + * @li @ref Elm_Password_last_show * @li @ref elm-prefs-data - * @li @ref Start - * @li @ref Scrolling - * @li @ref Scrollhints - * @li @ref Mirroring - * @li @ref Scaling - * @li @ref Styles - * @li @ref Theme - * @li @ref Transit - * @li @ref WidgetNavigation + * @li @ref Elm_Start + * @li @ref Elm_Scrolling + * @li @ref Elm_Scrollhints + * @li @ref Elm_Mirroring + * @li @ref Elm_Scaling + * @li @ref Elm_Styles + * @li @ref Elm_Theme + * @li @ref Elm_Transit + * @li @ref Elm_WidgetNavigation * * The other two main groups in Elementary are: * @li @ref widgetslist - These are the widgets you'll compose your UI out of. diff --git a/src/lib/elm_app.h b/src/lib/elm_app.h index 76c663b..a169f7c 100644 --- a/src/lib/elm_app.h +++ b/src/lib/elm_app.h @@ -1,5 +1,5 @@ /** - * @defgroup App App + * @defgroup Elm_App App * @ingroup Elementary * Provide information in order to make Elementary determine the @b * run time location of the software in question, so other data files @@ -8,7 +8,7 @@ */ /** - * @addtogroup App + * @addtogroup Elm_App * @{ */ @@ -82,7 +82,7 @@ * @see elm_app_data_dir_get() * @see elm_app_locale_dir_get() * - * @ingroup App + * @ingroup Elm_App */ EAPI voidelm_app_info_set(void *mainfunc, const char *dom, const char *checkfile); @@ -91,7 +91,7 @@ EAPI voidelm_app_info_set(void *mainfunc, const char *dom, const char *c * * @param name Application name. * - * @ingroup App + * @ingroup Elm_App * @since 1.8 */ EAPI voidelm_app_name_set(const char *name); @@ -105,7 +105,7 @@ EAPI voidelm_app_name_set(const char *name); * @warning Since this path is very environment dependent, * this will hold whatever value is passed to it. * - * @ingroup App + * @ingroup Elm_App * @since 1.8 */ EAPI voidelm_app_desktop_entry_set(const char *path); @@ -126,7 +126,7 @@ EAPI voidelm_app_desktop_entry_set(const char *path); * @warning You should call this function @b before * elm_app_info_set(). * - * @ingroup App + * @ingroup Elm_App */ EAPI voidelm_app_compile_bin_dir_set(const char *dir); @@ -146,7 +146,7 @@ EAPI voidelm_app_compile_bin_dir_set(const char *dir); * @warning You should call this function @b before * elm_app_info_set(). * - * @ingroup App + * @ingroup Elm
[EGIT] [core/efl] master 04/06: Evas.Image: Create Efl.Canvas.Image for file & data images
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=8367f497b8f1e9a7b365c815f12deeab9c92e1a5 commit 8367f497b8f1e9a7b365c815f12deeab9c92e1a5 Author: Jean-Philippe Andre Date: Wed Mar 16 19:37:04 2016 +0900 Evas.Image: Create Efl.Canvas.Image for file & data images This replaces standard Evas_Object_Image when it is used "normally", ie. it's an image from a file or from a pixel buffer. All other APIs (proxy, snapshot, 3d, gl, ...) are disabled on this object. Also, reduce number of failing calls when the object is not a legacy object, but a legacy function is called. This is because a lot of image APIs are called internally using the legacy APIs, often in order to reset the state of the image object (eg. set file to NULL, etc...) --- src/Makefile_Evas.am | 2 + src/examples/evas/evas-3d-proxy.c | 2 +- src/lib/evas/Evas_Eo.h | 2 +- src/lib/evas/canvas/efl_canvas_proxy.c | 2 +- src/lib/evas/canvas/evas_image.eo | 38 +- src/lib/evas/canvas/evas_image_legacy.c| 217 ++ src/lib/evas/canvas/evas_image_private.h | 50 ++- src/lib/evas/canvas/evas_object_image.c| 462 +++-- src/lib/evas/canvas/evas_object_main.c | 4 +- .../evas/engines/gl_common/evas_gl_preload.c | 2 +- 10 files changed, 251 insertions(+), 530 deletions(-) diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am index 57fe9c4..4f56564 100644 --- a/src/Makefile_Evas.am +++ b/src/Makefile_Evas.am @@ -41,6 +41,7 @@ evas_eolian_pub_files = \ lib/evas/canvas/efl_vg_gradient.eo \ lib/evas/canvas/efl_vg_gradient_radial.eo \ lib/evas/canvas/efl_vg_gradient_linear.eo \ + lib/evas/canvas/efl_canvas_image.eo \ lib/evas/canvas/efl_canvas_snapshot.eo \ lib/evas/canvas/efl_canvas_proxy.eo \ lib/evas/canvas/efl_canvas_scene3d.eo \ @@ -183,6 +184,7 @@ lib/evas/canvas/evas_touch_point.c \ lib/evas/canvas/evas_map.c \ lib/evas/canvas/evas_gl.c \ lib/evas/canvas/evas_out.c \ +lib/evas/canvas/efl_canvas_image.c \ lib/evas/canvas/efl_canvas_proxy.c \ lib/evas/canvas/efl_canvas_snapshot.c \ lib/evas/canvas/efl_canvas_scene3d.c \ diff --git a/src/examples/evas/evas-3d-proxy.c b/src/examples/evas/evas-3d-proxy.c index 0ae5693..06ff5bb 100644 --- a/src/examples/evas/evas-3d-proxy.c +++ b/src/examples/evas/evas-3d-proxy.c @@ -90,7 +90,7 @@ _animate_scene(void *data) } //efl_gfx_buffer_set(source, pixels, 0, 0, stride, 0, 0, 0, 0, 0, 0); - //evas_obj_image_data_update_add(source, 0, 0, IMG_WIDTH, IMG_HEIGHT); + //evas_object_image_data_update_add(source, 0, 0, IMG_WIDTH, IMG_HEIGHT); evas_object_image_data_set(source, pixels); evas_object_image_data_update_add(source, 0, 0, IMG_WIDTH, IMG_HEIGHT); diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h index 718c984..02d01b7 100644 --- a/src/lib/evas/Evas_Eo.h +++ b/src/lib/evas/Evas_Eo.h @@ -341,7 +341,7 @@ typedef void (Evas_Canvas3D_Surface_Func)(Evas_Real *out_x, #include "canvas/evas_canvas3d_scene.eo.h" #include "canvas/evas_image.eo.h" - +#include "canvas/efl_canvas_image.eo.h" #include "canvas/efl_canvas_snapshot.eo.h" #include "canvas/efl_canvas_proxy.eo.h" #include "canvas/efl_canvas_scene3d.eo.h" diff --git a/src/lib/evas/canvas/efl_canvas_proxy.c b/src/lib/evas/canvas/efl_canvas_proxy.c index af94ec0..9648027 100644 --- a/src/lib/evas/canvas/efl_canvas_proxy.c +++ b/src/lib/evas/canvas/efl_canvas_proxy.c @@ -219,7 +219,7 @@ _evas_image_proxy_set(Evas_Object *eo_proxy, Evas_Object *eo_src) Evas_Object_Protected_Data *proxy = eo_data_scope_get(eo_proxy, EVAS_OBJECT_CLASS); Evas_Image_Data *o = eo_data_scope_get(eo_proxy, EVAS_IMAGE_CLASS); - evas_object_image_file_set(eo_proxy, NULL, NULL); + _evas_image_file_set(eo_proxy, NULL, NULL); EINA_COW_WRITE_BEGIN(evas_object_proxy_cow, proxy->proxy, Evas_Object_Proxy_Data, proxy_write) proxy_write->is_proxy = EINA_TRUE; diff --git a/src/lib/evas/canvas/evas_image.eo b/src/lib/evas/canvas/evas_image.eo index bf48249..5761384 100644 --- a/src/lib/evas/canvas/evas_image.eo +++ b/src/lib/evas/canvas/evas_image.eo @@ -1,9 +1,12 @@ type @extern Evas_Object_Image_Pixels_Get_Cb: __undefined_type; /* FIXME: func pointers are not supported. */ -class Evas.Image (Evas.Object, Efl.File, Efl.Image, Efl.Image_Load, Efl.Image_Animated, Efl.Gfx.Buffer, Efl.Gfx.Fill, Efl.Gfx.View, Evas.Filter) +class Evas.Image (Evas.Object, Efl.File, Efl.Image, Efl.Image_Load, + Efl.Image_Animated, Efl.Gfx.Buffer, Efl.Gfx.Fill, + Efl.Gfx.View, Evas.Filter) { + /* Legacy is implement inside Efl.Canvas.Image */ legacy_prefix: evas_object_image; - eo_prefix: evas_obj_image; + eo_prefix: null; methods { /* GL View */ @propert
[EGIT] [bindings/python/python-efl] master 01/01: Shuffle in the latest Eo memes
kuuko pushed a commit to branch master. http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=41c1779e81eb4388528bed6054855206c017f317 commit 41c1779e81eb4388528bed6054855206c017f317 Author: Kai Huuhko Date: Sat Mar 19 01:08:33 2016 +0200 Shuffle in the latest Eo memes --- efl/elementary/systray.pxi | 3 +-- include/efl.c_eo.pxd | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/efl/elementary/systray.pxi b/efl/elementary/systray.pxi index 4407ecc..ab76be3 100644 --- a/efl/elementary/systray.pxi +++ b/efl/elementary/systray.pxi @@ -26,8 +26,7 @@ cdef class Systray(Eo): """ def __init__(self, Eo parent not None, *args, **kwargs): -cdef cEo *obj -eo_add(&obj, elm_systray_class_get(), parent.obj) +cdef cEo *obj = eo_add(elm_systray_class_get(), parent.obj) self._set_obj(obj) self._set_properties_from_keyword_args(kwargs) diff --git a/include/efl.c_eo.pxd b/include/efl.c_eo.pxd index d4906fa..390435f 100644 --- a/include/efl.c_eo.pxd +++ b/include/efl.c_eo.pxd @@ -100,7 +100,7 @@ cdef extern from "Eo.h": int eo_init() int eo_shutdown() -void eo_add(Eo **objp, const Eo_Class *klass, Eo *parent, ...) +Eo *eo_add(const Eo_Class *klass, Eo *parent, ...) Eo *eo_ref(const Eo *obj) void eo_unref(const Eo *obj) int eo_ref_get(const Eo *obj) --
[EGIT] [tools/eflete] master 02/02: property_macros: set NULL value program attributes (signal and source)
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=44c6e7d5c8dbfe74c5404340a2932ed8a477b80c commit 44c6e7d5c8dbfe74c5404340a2932ed8a477b80c Author: Vitalii Vorobiov Date: Fri Mar 18 14:14:11 2016 +0200 property_macros: set NULL value program attributes (signal and source) Instead of "" --- src/bin/ui/property_macros.h | 53 +++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/src/bin/ui/property_macros.h b/src/bin/ui/property_macros.h index 88aa8be..8a3be98 100644 --- a/src/bin/ui/property_macros.h +++ b/src/bin/ui/property_macros.h @@ -580,6 +580,57 @@ prop_##SUB##_##VALUE##_update(Group_Prop_Data *pd) \ } /** + * Macro defines a callback for programs added by COMMON_ENTRY_ADD. + * + * @param SUB The prefix of main parameter of part attribute + * @param VALUE The value of part attribute + * @param VALIDATOR The entry validator + * @param ARGS The edje edit function arguments + * + * @ingroup Property_Macro + */ +#define PROGRAM_ENTRY_CALLBACK(SUB, VALUE, VALIDATOR, ARGS, DESCRIPTION) \ +static void \ +_on_##SUB##_##VALUE##_change(void *data, \ + Evas_Object *obj, \ + void *ei __UNUSED__) \ +{ \ + Group_Prop_Data *pd = (Group_Prop_Data *)data; \ + if (VALIDATOR && (elm_validator_regexp_status_get(VALIDATOR)) != ELM_REG_NOERROR) \ + return; \ + if (!pd->change) pd->change = change_add(NULL); \ + const char *text = elm_entry_entry_get(obj); \ + char *value = elm_entry_markup_to_utf8(text); \ + if (strcmp(value, "") == 0) \ + { \ +free(value); \ +value = NULL; \ + } \ + editor_##SUB##_##VALUE##_set(pd->group->edit_object, pd->change, true ARGS, value); \ + evas_object_smart_callback_call(ap.win, SIGNAL_PROPERTY_ATTRIBUTE_CHANGED, NULL); \ + if (value) free(value); \ +} \ +static void \ +_on_##SUB##_##VALUE##_activated(void *data, \ +Evas_Object *obj __UNUSED__, \ +void *ei __UNUSED__) \ +{ \ + Group_Prop_Data *pd = (Group_Prop_Data *)data; \ + if (VALIDATOR && (elm_validator_regexp_status_get(VALIDATOR)) != ELM_REG_NOERROR) \ + return; \ + if (!pd->change) \ + return; \ + Eina_Stringshare *val = edje_edit_##SUB##_##VALUE##_get(pd->group->edit_object ARGS); \ + Eina_Stringshare *msg = eina_stringshare_printf(DESCRIPTION, val); \ + change_description_set(pd->change, msg); \ + history_change_add(pd->group->history, pd->change); \ + pd->change = NULL; \ + prop_##SUB##_##VALUE##_update(pd); \ + eina_stringshare_del(msg); \ + eina_stringshare_del(val); \ +} + +/** * Macro defines a callback for COMMON_ENTRY_ADD. * * @param SUB The prefix of main parameter of part attribute @@ -885,7 +936,7 @@ _on_group_##SUB1##_##VALUE##_change(void *data, \ * @ingroup Property_Macro */ #define PROGRAM_ATTR_1ENTRY_CALLBACK(SUB, VALUE, VALIDATOR, DESCRIPTION) \ - COMMON_ENTRY_CALLBACK(SUB, VALUE, VALIDATOR, PROGRAM_ARGS, DESCRIPTION) \ + PROGRAM_ENTRY_CALLBACK(SUB, VALUE, VALIDATOR, PROGRAM_ARGS, DESCRIPTION) \ /*/ /* PROGRAM 1 COMBOBOX LIST CONTROL */ --
[EGIT] [core/elementary] master 01/01: docs: fix invalid end of group
jayji pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=6d609226eb0601391ce15afbf27bac41e0f70fa8 commit 6d609226eb0601391ce15afbf27bac41e0f70fa8 Author: Jean Guyomarc'h Date: Wed Mar 16 23:18:04 2016 +0100 docs: fix invalid end of group --- src/lib/elm_color_class.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/elm_color_class.h b/src/lib/elm_color_class.h index cbcd6a3..97a5031 100644 --- a/src/lib/elm_color_class.h +++ b/src/lib/elm_color_class.h @@ -76,6 +76,6 @@ EAPI void elm_color_class_list_cb_set(Elm_Color_Class_List_Cb cb); * @since 1.14 **/ EAPI Eina_List *elm_color_class_util_edje_file_list(Eina_File *f); -/** }@ */ +/** @} */ #endif --
[EGIT] [core/efl] master 01/06: Evas.Image: Fix ERR message (invalid call)
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=6b03d46d545ec228708ace4bebeff85704f3f1be commit 6b03d46d545ec228708ace4bebeff85704f3f1be Author: Jean-Philippe Andre Date: Wed Mar 16 19:03:41 2016 +0900 Evas.Image: Fix ERR message (invalid call) There was an unintended change from a silent return to EINA_SAFETY inside _evas_object_image_free(). This avoids calling the function altogether. --- src/lib/evas/canvas/evas_object_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c index 26959bf..71e0276 100644 --- a/src/lib/evas/canvas/evas_object_main.c +++ b/src/lib/evas/canvas/evas_object_main.c @@ -241,7 +241,8 @@ evas_object_free(Evas_Object *eo_obj, int clean_layer) int was_smart_child = 0; - _evas_object_image_free(eo_obj); + if (eo_isa(eo_obj, EVAS_IMAGE_CLASS)) + _evas_object_image_free(eo_obj); evas_object_map_set(eo_obj, NULL); if (obj->map->prev.map) evas_map_free(obj->map->prev.map); if (obj->map->cache_map) evas_map_free(obj->map->cache_map); --
[EGIT] [tools/enventor] master 01/01: statusbar: fix view sizing issue when an invert button is clicked repeatedly.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=d23793101b6dc91dab6827f0b4ab4beb35309c0f commit d23793101b6dc91dab6827f0b4ab4beb35309c0f Author: Hermet Park Date: Wed Mar 16 21:27:04 2016 +0900 statusbar: fix view sizing issue when an invert button is clicked repeatedly. previously, the button was available even if the inverting animation was going on. This caused the corruption view size because of context loss. We could avoid this issue by freezing button when transition is going on. --- src/bin/statusbar.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/bin/statusbar.c b/src/bin/statusbar.c index 31e0784..8964d77 100644 --- a/src/bin/statusbar.c +++ b/src/bin/statusbar.c @@ -85,7 +85,7 @@ view_invert_transit_end(void *data, Elm_Transit *transit EINA_UNUSED) } static void -view_invert_btn_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, +view_invert_btn_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) { invert_data *id = malloc(sizeof(invert_data)); @@ -98,6 +98,7 @@ view_invert_btn_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, id->diff_h = w - h; Elm_Transit *transit = elm_transit_add(); + elm_transit_object_add(transit, obj); elm_transit_effect_add(transit, view_invert_transit_op, id, view_invert_transit_end); elm_transit_tween_mode_set(transit, ELM_TRANSIT_TWEEN_MODE_DECELERATE); --
[EGIT] [core/elementary] master 02/04: Elm_glveiw: change elm_glview_draw_request_set to elm_glview_draw_request.
jypark pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=ec86e5fdcc9e74fd1969747b70122872299c524d commit ec86e5fdcc9e74fd1969747b70122872299c524d Author: Ji-Youn Park Date: Fri Mar 11 16:11:00 2016 +0830 Elm_glveiw: change elm_glview_draw_request_set to elm_glview_draw_request. change draw_reqeuest property to method. --- src/lib/elm_glview.c | 10 +- src/lib/elm_glview.eo | 10 -- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/lib/elm_glview.c b/src/lib/elm_glview.c index e16eab5..f3f7c12 100644 --- a/src/lib/elm_glview.c +++ b/src/lib/elm_glview.c @@ -79,7 +79,7 @@ _glview_update_surface(Evas_Object *obj) sd->config->options_bits = opt; evas_gl_native_surface_get(sd->evasgl, sd->surface, &ns); evas_object_image_native_surface_set(wd->resize_obj, &ns); - elm_glview_draw_request_set(obj); + elm_glview_draw_request(obj); // fake a resize event so that clients can reconfigure their viewport sd->resized = EINA_TRUE; @@ -313,7 +313,7 @@ elm_glview_changed_set(Evas_Object *obj) { ELM_GLVIEW_CHECK(obj); - elm_glview_draw_request_set(obj); + elm_glview_draw_request(obj); } EOLIAN static void @@ -439,7 +439,7 @@ _elm_glview_resize_policy_set(Eo *obj, Elm_Glview_Data *sd, Elm_GLView_Resize_Po case ELM_GLVIEW_RESIZE_POLICY_SCALE: sd->scale_policy = policy; _glview_update_surface(obj); -elm_glview_draw_request_set(obj); +elm_glview_draw_request(obj); return EINA_TRUE; default: @@ -478,7 +478,7 @@ _elm_glview_size_set(Eo *obj, Elm_Glview_Data *sd, int w, int h) sd->h = h; _glview_update_surface(obj); - elm_glview_draw_request_set(obj); + elm_glview_draw_request(obj); } EOLIAN static void @@ -515,7 +515,7 @@ _elm_glview_render_func_set(Eo *obj EINA_UNUSED, Elm_Glview_Data *sd, Elm_GLView } EOLIAN static void -_elm_glview_draw_request_set(Eo *obj, Elm_Glview_Data *sd) +_elm_glview_draw_request(Eo *obj, Elm_Glview_Data *sd) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); diff --git a/src/lib/elm_glview.eo b/src/lib/elm_glview.eo index 20c44ab..4250dfe 100644 --- a/src/lib/elm_glview.eo +++ b/src/lib/elm_glview.eo @@ -122,11 +122,6 @@ class Elm.Glview (Elm.Widget) policy: Elm.GLView.Resize.Policy; [[The scaling policy.]] } } - @property draw_request { - set { -[[Notifies that there has been changes in the GLView.]] - } - } @property resize_func { set { [[Set the resize function that gets called when resize happens. @@ -208,7 +203,7 @@ class Elm.Glview (Elm.Widget) The render function gets called in the main loop but whether it runs depends on the rendering policy and whether - @.draw_request.set gets called. + @.draw_request called. ]] } values { @@ -249,6 +244,9 @@ class Elm.Glview (Elm.Widget) return: int; [[A window rotation in degrees (0, 90, 180 or 270).]] } } + draw_request { + [[Notifies that there has been changes in the GLView.]] + } } implements { class.constructor; --
[EGIT] [tools/eflete] master 03/34: UTC: delete main_window test
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=ef1ef15f8a1ce193ecab1a2f0a2d36d9195c02f7 commit ef1ef15f8a1ce193ecab1a2f0a2d36d9195c02f7 Author: Vyacheslav Reutskiy Date: Wed Mar 16 09:49:28 2016 +0200 UTC: delete main_window test I don't know why we no long time hold this test. This test not valid long-long time. So move to trash Change-Id: I2b7e6247cf2af79402477ac0a748fd43f26d4ba0 --- tests/Makefile.am | 22 -- tests/test_about_window/about_window_add.c | 74 --- tests/test_about_window/test_about_window.c| 39 -- tests/test_about_window/test_about_window.h| 28 tests/test_ui_main_window/test_ui_main_window.c| 49 - tests/test_ui_main_window/test_ui_main_window.h| 33 - tests/test_ui_main_window/ui_main_window_add.c | 84 -- tests/test_ui_main_window/ui_main_window_del.c | 76 tests/test_ui_main_window/ui_menu_add.c| 80 - tests/test_ui_main_window/ui_menu_disable_set.c| 80 - .../ui_menu_items_list_disable_set.c | 79 tests/test_ui_main_window/ui_part_select.c | 38 -- tests/test_ui_main_window/ui_state_select.c| 38 -- tests/test_ui_main_window/ui_style_back.c | 38 -- tests/test_ui_main_window/ui_style_delete.c| 38 -- 15 files changed, 796 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 4adb226..a223f56 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -16,9 +16,7 @@ modal_window_test \ project_manager_test \ config_test \ cursor_test \ -ui_main_window_test \ ui_workspace_test \ -about_window_test \ colorselector_test \ shortcuts_test @@ -214,20 +212,6 @@ cursor_test_SOURCES = \ cursor_test_CFLAGS = ${FLAGS} cursor_test_LDADD = ${LD} -ui_main_window_test_SOURCES = \ -../tests/test_ui_main_window/test_ui_main_window.c \ -../tests/test_ui_main_window/ui_main_window_add.c \ -../tests/test_ui_main_window/ui_main_window_del.c \ -../tests/test_ui_main_window/ui_menu_add.c \ -../tests/test_ui_main_window/ui_menu_disable_set.c \ -../tests/test_ui_main_window/ui_menu_items_list_disable_set.c \ -../tests/test_ui_main_window/ui_part_select.c \ -../tests/test_ui_main_window/ui_state_select.c \ -../tests/test_ui_main_window/ui_style_back.c \ -../tests/test_ui_main_window/ui_style_delete.c -ui_main_window_test_CFLAGS = ${FLAGS} -ui_main_window_test_LDADD = ${LD} - #preference_test_SOURCES = \ #../tests/test_preference/test_preference.c \ #../tests/test_preference/preference_add.c \ @@ -258,12 +242,6 @@ live_widget_test_SOURCES = \ live_widget_test_CFLAGS = ${FLAGS} live_widget_test_LDADD = ${LD} -about_window_test_SOURCES = \ -../tests/test_about_window/test_about_window.c \ -../tests/test_about_window/about_window_add.c -about_window_test_CFLAGS = ${FLAGS} -about_window_test_LDADD = ${LD} - shortcuts_test_SOURCES = \ ../tests/test_shortcuts/test_shortcuts.c \ ../tests/test_shortcuts/shortcuts_init.c \ diff --git a/tests/test_about_window/about_window_add.c b/tests/test_about_window/about_window_add.c deleted file mode 100644 index e6511db..000 --- a/tests/test_about_window/about_window_add.c +++ /dev/null @@ -1,74 +0,0 @@ -/** - * Edje Theme Editor - * Copyright (C) 2013-2014 Samsung Electronics. - * - * This file is part of Edje Theme Editor. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; If not, see www.gnu.org/licenses/lgpl.html. - */ - -#include "test_about_window.h" - -/** - * @addtogroup about_window_test - * @{ - * @addtogroup about_window_add - * @{ - * modal_window - * - * @} - */ - -/** - * @addtogroup about_window_add - * @{ - * - * about_window_add - * about_window_add_test_p - * - * @precondition - * @step 1 initialized efl and app - * @step 2 main_window created - * - * @procedure - * @step 1 Call about_window_add() - * @step 2 Check returned pointer - * - * void - * Evas_Object pointer returned - * - * @} - */ -EFLETE_TEST (about_window_add_test_p) -{ - elm_init(0,0); - Evas_Object *about; - - app_init(); - ui_main_window_add(); - about = about_window_add(); - ck_assert_msg(about != NULL, "cannot create new About Window"); - - evas_object_del(about); - app_shutdown(); - elm_shutdown(); -} -END_TEST - -/** - * @a
[EGIT] [core/efl] master 02/03: edje: remove unnecessary repetition during copying code
cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=37408aef95ee5794f9030ece34be9d6b097d064e commit 37408aef95ee5794f9030ece34be9d6b097d064e Author: Jee-Yong Um Date: Thu Mar 17 11:13:10 2016 -0700 edje: remove unnecessary repetition during copying code Summary: Code doesn't need to be copied every time when program is copied. Reviewers: cedric Reviewed By: cedric Subscribers: jpeg Differential Revision: https://phab.enlightenment.org/D3799 Signed-off-by: Cedric BAIL --- src/bin/edje/edje_cc_handlers.c | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c index 8fb43cf..5c6f14d 100644 --- a/src/bin/edje/edje_cc_handlers.c +++ b/src/bin/edje/edje_cc_handlers.c @@ -4438,6 +4438,10 @@ st_collections_group_inherit(void) cd2 = eina_list_nth(codes, de->id); cd = eina_list_data_get(eina_list_last(codes)); + cd->is_lua = cd2->is_lua; + cd->shared = STRDUP(cd2->shared); + cd->original = STRDUP(cd2->original); + EINA_LIST_FOREACH(cd2->programs, l, cp2) { cp = mem_alloc(SZ(Code_Program)); @@ -4446,9 +4450,6 @@ st_collections_group_inherit(void) cp->l2 = cp2->l2; cp->script = STRDUP(cp2->script); cp->original = STRDUP(cp2->original); -cd->is_lua = cd2->is_lua; -cd->shared = STRDUP(cd2->shared); -cd->original = STRDUP(cd2->original); cd->programs = eina_list_append(cd->programs, cp); data_queue_copied_anonymous_lookup(pc, &(cp2->id), &(cp->id)); } --
[EGIT] [tools/edi] master 01/01: Update to latest eo_add syntax
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/tools/edi.git/commit/?id=0e3a6f6090b7b9918bf187bf3960b9639ac0b5dc commit 0e3a6f6090b7b9918bf187bf3960b9639ac0b5dc Author: Andy Williams Date: Fri Mar 18 19:42:07 2016 + Update to latest eo_add syntax --- elm_code/src/bin/elm_code_test_main.c| 8 elm_code/src/lib/elm_code_diff_widget.c | 4 ++-- elm_code/src/lib/widget/elm_code_widget.c| 2 +- elm_code/src/tests/widget/elm_code_test_widget.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/elm_code/src/bin/elm_code_test_main.c b/elm_code/src/bin/elm_code_test_main.c index 126f8a7..5779ee7 100644 --- a/elm_code/src/bin/elm_code_test_main.c +++ b/elm_code/src/bin/elm_code_test_main.c @@ -66,7 +66,7 @@ _elm_code_test_welcome_setup(Evas_Object *parent) Elm_Code_Widget *widget; code = elm_code_create(); - eo_add(&widget, ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(widget, code)); + widget = eo_add(ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(eo_self, code)); elm_obj_code_widget_font_set(widget, NULL, 12); eo_event_callback_add(widget, &ELM_CODE_EVENT_LINE_LOAD_DONE, _elm_code_test_line_done_cb, NULL); eo_event_callback_add(widget, ELM_CODE_WIDGET_EVENT_LINE_CLICKED, _elm_code_test_line_clicked_cb, code); @@ -94,7 +94,7 @@ _elm_code_test_editor_setup(Evas_Object *parent) Elm_Code_Widget *widget; code = elm_code_create(); - eo_add(&widget, ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(widget, code)); + widget = eo_add(ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(eo_self, code)); elm_obj_code_widget_font_set(widget, NULL, 14); elm_obj_code_widget_editable_set(widget, EINA_TRUE); elm_obj_code_widget_show_whitespace_set(widget, EINA_TRUE); @@ -121,7 +121,7 @@ _elm_code_test_mirror_setup(Elm_Code *code, char *font_name, Evas_Object *parent { Elm_Code_Widget *widget; - eo_add(&widget, ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(widget, code)); + widget = eo_add(ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(eo_self, code)); elm_obj_code_widget_font_set(widget, font_name, 11); elm_obj_code_widget_line_numbers_set(widget, EINA_TRUE); @@ -144,7 +144,7 @@ _elm_code_test_diff_inline_setup(Evas_Object *parent) code = elm_code_create(); elm_code_file_open(code, path); - eo_add(&diff, ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(diff, code)); + diff = eo_add(ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(eo_self, code)); evas_object_size_hint_weight_set(diff, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(diff, EVAS_HINT_FILL, EVAS_HINT_FILL); diff --git a/elm_code/src/lib/elm_code_diff_widget.c b/elm_code/src/lib/elm_code_diff_widget.c index ac66d36..7efb848 100644 --- a/elm_code/src/lib/elm_code_diff_widget.c +++ b/elm_code/src/lib/elm_code_diff_widget.c @@ -95,7 +95,7 @@ elm_code_diff_widget_add(Evas_Object *parent, Elm_Code *code) // left side of diff wcode1 = elm_code_create(); elm_code_parser_standard_add(wcode1, ELM_CODE_PARSER_STANDARD_DIFF); - eo_add(&widget_left, ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(widget_left, wcode1)); + widget_left = eo_add(ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(eo_self, wcode1)); evas_object_size_hint_weight_set(widget_left, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(widget_left, EVAS_HINT_FILL, EVAS_HINT_FILL); @@ -106,7 +106,7 @@ elm_code_diff_widget_add(Evas_Object *parent, Elm_Code *code) // right side of diff wcode2 = elm_code_create(); elm_code_parser_standard_add(wcode2, ELM_CODE_PARSER_STANDARD_DIFF); - eo_add(&widget_right, ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(widget_right, wcode2)); + widget_right = eo_add(ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(eo_self, wcode2)); evas_object_size_hint_weight_set(widget_right, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(widget_right, EVAS_HINT_FILL, EVAS_HINT_FILL); diff --git a/elm_code/src/lib/widget/elm_code_widget.c b/elm_code/src/lib/widget/elm_code_widget.c index ed19d61..1b91391 100644 --- a/elm_code/src/lib/widget/elm_code_widget.c +++ b/elm_code/src/lib/widget/elm_code_widget.c @@ -55,7 +55,7 @@ elm_code_widget_add(Evas_Object *parent, Elm_Code *code) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); Evas_Object *obj = NULL; - eo_add(&obj, MY_CLASS, parent, elm_obj_code_widget_code_set(obj, code)); + obj = eo_add(MY_CLASS, parent, elm_obj_code_widget_code_set(eo_self, code)); return obj; } diff --git a/elm_code/src/tests/widget/elm_code_test_widget.c b/elm_code/src/tests/widget/elm_code_test_widget.c index c65d6b8..3471e3c 100644 --- a/elm_code/src/tests/widget/elm_code_test_widget.c +++
[EGIT] [core/elementary] master 01/01: Evas.Draggable_Interface: move editable_set/get to lecacy API
jypark pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=09145dd66f3481754502edeca8a7e0de4203701b commit 09145dd66f3481754502edeca8a7e0de4203701b Author: Ji-Youn Park Date: Sat Mar 19 10:00:19 2016 +0830 Evas.Draggable_Interface: move editable_set/get to lecacy API Elm_XXX_editable_set/get is related with drag and drop. Elm_entry, Elm_image, Elm_photo, Elm_thumb has editable API. If user call elm_entry_editable_set(obj, EINA_TRUE), elm entry's content(text) can be changed into dragging text. elm_image(photo,thumb also) is same. its content(image) also can be changed into dragging image. so changed for these widget to use drag_target property in evas_draggable_interface --- src/lib/elm_entry.c| 17 +++-- src/lib/elm_entry.eo | 27 --- src/lib/elm_entry_legacy.h | 29 + src/lib/elm_image.c| 17 +++-- src/lib/elm_image.eo | 17 +++-- src/lib/elm_image_legacy.h | 23 +++ src/lib/elm_photo.c| 17 +++-- src/lib/elm_photo.eo | 18 ++ src/lib/elm_photo_legacy.h | 21 + src/lib/elm_thumb.c| 23 ++- src/lib/elm_thumb.eo | 25 - src/lib/elm_thumb_legacy.h | 23 +++ 12 files changed, 172 insertions(+), 85 deletions(-) diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c index 42279fa..81676b2 100644 --- a/src/lib/elm_entry.c +++ b/src/lib/elm_entry.c @@ -4107,7 +4107,7 @@ _elm_entry_line_wrap_get(Eo *obj EINA_UNUSED, Elm_Entry_Data *sd) } EOLIAN static void -_elm_entry_editable_set(Eo *obj, Elm_Entry_Data *sd, Eina_Bool editable) +_elm_entry_evas_draggable_interface_drag_target_set(Eo *obj, Elm_Entry_Data *sd, Eina_Bool editable) { if (sd->editable == editable) return; sd->editable = editable; @@ -4130,7 +4130,7 @@ _elm_entry_editable_set(Eo *obj, Elm_Entry_Data *sd, Eina_Bool editable) } EOLIAN static Eina_Bool -_elm_entry_editable_get(Eo *obj EINA_UNUSED, Elm_Entry_Data *sd) +_elm_entry_evas_draggable_interface_drag_target_get(Eo *obj EINA_UNUSED, Elm_Entry_Data *sd) { return sd->editable; } @@ -5855,4 +5855,17 @@ _elm_entry_elm_interface_atspi_accessible_name_get(Eo *obj, Elm_Entry_Data *sd) return ret ? strdup(ret) : NULL; } +/* Legacy deprecated functions */ +EAPI void +elm_entry_editable_set(Evas_Object *obj, Eina_Bool edit) +{ + evas_draggable_interface_drag_target_set(obj, edit); +} + +EAPI Eina_Bool +elm_entry_editable_get(const Evas_Object *obj) +{ + return evas_draggable_interface_drag_target_get(obj); +} + #include "elm_entry.eo.c" diff --git a/src/lib/elm_entry.eo b/src/lib/elm_entry.eo index 166c6c7..71825e2 100644 --- a/src/lib/elm_entry.eo +++ b/src/lib/elm_entry.eo @@ -112,7 +112,8 @@ enum Elm.Cnp_Mode class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interface, Elm.Interface_Atspi_Text, Elm.Interface_Atspi_Editable_Text, Efl.File, - Evas.Selectable_Interface, Evas.Scrollable_Interface) + Evas.Selectable_Interface, Evas.Scrollable_Interface, + Evas.Draggable_Interface) { eo_prefix: elm_obj_entry; methods { @@ -261,28 +262,6 @@ class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interface, autocapital_type: Elm.Autocapital.Type; [[The type of autocapitalization.]] } } - @property editable { - set { -[[Sets if the entry is to be editable or not. - - By default, entries are editable and when focused, any text input by the - user will be inserted at the current cursor position. But calling this - function with $editable as $false will prevent the user from - inputting text into the entry. - - The only way to change the text of a non-editable entry is to use - \@ref elm_object_text_set, \@ref elm_entry_entry_insert and other related - functions. -]] - } - get { -[[Get whether the entry is editable or not.]] - } - values { -editable: bool; [[If $true, user input will be inserted in the entry, -if not, the entry is read-only and no user input is allowed.]] - } - } @property anchor_hover_style { set { [[Set the style that the hover should use @@ -925,6 +904,8 @@ class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interface, Evas.Object_Smart.del; Evas.Object_Smart.show; Evas.Object_Smart.hide; + Evas.Draggable_Interface.drag_target.set; + Evas.Draggable_Interface.drag_target.get; Elm.Widget.activate; Elm.Widget.focus_direction_manager_is; Elm.W
[EGIT] [core/elementary] master 02/02: elm_widget: update child object focus_order.
cedric pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=b78720016a9023cb57ec2a05c8cfbdf6eeae600f commit b78720016a9023cb57ec2a05c8cfbdf6eeae600f Author: Umesh Tanwar Date: Fri Mar 18 11:56:59 2016 -0700 elm_widget: update child object focus_order. Summary: _parent_focus() when called recursively updates the sd->focus_order for parent obeject only. The sibling's sd->focus_order not get updated. So updated the focus_order for siblings. Signed-off-by: Umesh Tanwar Test Plan: {F30149} correct case: 1. Press Enter key on click button. A popoup will come. 2. Pressing enter key on popup button the popup hides and focus goes back to click button. issue case: 1. Press Enter key on click button. A popoup will come. 2. press Alt+tab twice. 3. Pressing enter key on popup button the popup hides and focus does not go back to click button. Reviewers: raster, cedric Subscribers: singh.amitesh Differential Revision: https://phab.enlightenment.org/D3807 --- src/lib/elm_widget.c | 23 +++ 1 file changed, 23 insertions(+) diff --git a/src/lib/elm_widget.c b/src/lib/elm_widget.c index b110f32..4121519 100644 --- a/src/lib/elm_widget.c +++ b/src/lib/elm_widget.c @@ -792,6 +792,27 @@ _elm_widget_focus_highlight_style_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data } static void +_child_focus_order_update(Evas_Object* parent, Evas_Object* obj) +{ + const Eina_List *l; + Evas_Object *child; + ELM_WIDGET_DATA_GET(parent, sdp); + EINA_LIST_FOREACH(sdp->subobjs, l, child) + { +if (!_elm_widget_is(child) || (child == obj)) continue; + ELM_WIDGET_DATA_GET(child,sdc); + +if(sdc->can_focus || (sdc->child_can_focus)) + { + focus_order++; +sdc->focus_order = focus_order; + } + _child_focus_order_update(child, NULL); + } + +} + +static void _parent_focus(Evas_Object *obj, Elm_Object_Item *item) { API_ENTRY return; @@ -820,6 +841,8 @@ _parent_focus(Evas_Object *obj, Elm_Object_Item *item) if (_elm_config->access_mode == ELM_ACCESS_MODE_ON) _elm_access_highlight_set(obj); + + if (o) _child_focus_order_update(o, obj); } static void --