[EGIT] [core/elementary] master 01/01: toolbar: Revert a theme change for shrink mode signals.
jaehwan pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=352ba03e2cd782f7e2626a3f9462aef40faa3b34 commit 352ba03e2cd782f7e2626a3f9462aef40faa3b34 Author: Youngbok ShinDate: Wed Jan 6 19:38:05 2016 +0900 toolbar: Revert a theme change for shrink mode signals. Summary: It was changed for testing shrink mode signals. But, it was unnecessary change for default theme. Test Plan: N/A Reviewers: zmike, jaehwan Differential Revision: https://phab.enlightenment.org/D3536 --- data/themes/edc/elm/toolbar.edc | 90 +++-- 1 file changed, 6 insertions(+), 84 deletions(-) diff --git a/data/themes/edc/elm/toolbar.edc b/data/themes/edc/elm/toolbar.edc index f6cb533..d932ff2 100644 --- a/data/themes/edc/elm/toolbar.edc +++ b/data/themes/edc/elm/toolbar.edc @@ -379,8 +379,6 @@ group { name: "elm/toolbar/item/default"; #define DISABLE 4 script { public btmode; - public vertical = 0; - public scroll = 0; public eval_mode(m) { new m1 = m & MASK; new d = m & DISABLE; @@ -434,44 +432,6 @@ group { name: "elm/toolbar/item/default"; } } } - - public enable_scroll() { - set_int(scroll, 1); - - if (get_int(vertical)) -set_state(PART:"base", "vert_scroll", 0.0); - else -set_state(PART:"base", "scroll", 0.0); - } - - public disable_scroll() { - set_int(scroll, 0); - - if (get_int(vertical)) -set_state(PART:"base", "vert", 0.0); - else -set_state(PART:"base", "default", 0.0); - } - - public enable_vertical() { - set_int(vertical, 1); - - if (get_int(scroll)) -set_state(PART:"base", "vert_scroll", 0.0); - else -set_state(PART:"base", "vert", 0.0); - set_state(PART:"bend_clip", "vert", 0.0); - } - - public disable_vertical() { - set_int(vertical, 0); - - if (get_int(scroll)) -set_state(PART:"base", "scroll", 0.0); - else -set_state(PART:"base", "default", 0.0); - set_state(PART:"bend_clip", "default", 0.0); - } } parts { part { name: "base"; type: SPACER; @@ -481,14 +441,6 @@ group { name: "elm/toolbar/item/default"; rel1.offset: -1 0; rel2.offset: 0 -1; } - description { state: "scroll" 0.0; -inherit: "default" 0.0; -min: 80 0; - } - description { state: "vert_scroll" 0.0; -inherit: "vert" 0.0; -min: 0 80; - } } part { name: "shadow1"; mouse_events: 0; description { state: "default" 0.0; @@ -858,45 +810,15 @@ group { name: "elm/toolbar/item/default"; programs { program { signal: "elm,orient,horizontal"; source: "elm"; - script { -disable_vertical(); - } + action: STATE_SET "default" 0.0; + target: "base"; + target: "bend_clip"; } program { signal: "elm,orient,vertical"; source: "elm"; - script { -enable_vertical(); - } - } - program { - signal: "elm,state,shrink,scroll"; source: "elm"; - script { -enable_scroll(); - } - } - program { - signal: "elm,state,shrink,none"; source: "elm"; - script { -disable_scroll() - } - } - program { - signal: "elm,state,shrink,hide"; source: "elm"; - script { -disable_scroll() - } - } - program { - signal: "elm,state,shrink,menu"; source: "elm"; - script { -disable_scroll() - } - } - program { - signal: "elm,state,shrink,expand"; source: "elm"; - script { -disable_scroll() - } + action: STATE_SET "vert" 0.0; + target: "base"; + target: "bend_clip"; } program { name: "st0"; --
[EGIT] [core/efl] master 08/08: eldbus: add missing since tags for all new symbols
stefan pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=9154fbb0e0167d7a004892bc83a5bebb687284e0 commit 9154fbb0e0167d7a004892bc83a5bebb687284e0 Author: Stefan SchmidtDate: Wed Jan 6 16:31:55 2016 +0100 eldbus: add missing since tags for all new symbols --- src/lib/eldbus/eldbus_freedesktop.h | 2 ++ src/lib/eldbus/eldbus_introspection.h | 10 ++ 2 files changed, 12 insertions(+) diff --git a/src/lib/eldbus/eldbus_freedesktop.h b/src/lib/eldbus/eldbus_freedesktop.h index 838fee0..accf605 100644 --- a/src/lib/eldbus/eldbus_freedesktop.h +++ b/src/lib/eldbus/eldbus_freedesktop.h @@ -249,6 +249,8 @@ EAPI Eldbus_Pending *eldbus_proxy_property_set(Eldbus_Proxy *proxy, const * @param cb The callback to be called when receiving an answer. * @param data Data to be passed to the callback. * @return Eldbus_Pending object corresponding to the message sent. + * + * @since 1.17 */ EAPI Eldbus_Pending*eldbus_proxy_property_value_set(Eldbus_Proxy *proxy, const char *name, const char *sig, const Eina_Value *value, Eldbus_Message_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2, 3, 4); diff --git a/src/lib/eldbus/eldbus_introspection.h b/src/lib/eldbus/eldbus_introspection.h index 4f37460..bb6078a 100644 --- a/src/lib/eldbus/eldbus_introspection.h +++ b/src/lib/eldbus/eldbus_introspection.h @@ -84,6 +84,8 @@ struct _Eldbus_Introspection_Annotation * * @param xml The introspection xml * @return The introspection object tree + * + * @since 1.17 */ EAPI Eldbus_Introspection_Node *eldbus_introspection_parse(const char *xml); @@ -91,6 +93,8 @@ EAPI Eldbus_Introspection_Node *eldbus_introspection_parse(const char *xml); * @brief Frees the introspection object tree * * @param node The root node of introspection tree + * + * @since 1.17 */ EAPI void eldbus_introspection_node_free(Eldbus_Introspection_Node *node); @@ -100,6 +104,8 @@ EAPI void eldbus_introspection_node_free(Eldbus_Introspection_Node *node); * @param interfaces The list of interfaces of type @c Eldbus_Introspection_Interface * @param name The interfaces's name to search for * @return Returns the interface found or @c NULL if not + * + * @since 1.17 */ EAPI Eldbus_Introspection_Interface *eldbus_introspection_interface_find(Eina_List *interfaces, const char *name); @@ -109,6 +115,8 @@ EAPI Eldbus_Introspection_Interface *eldbus_introspection_interface_find(Eina_Li * @param properties The list of properties of type @c Eldbus_Introspection_Property * @param name The properties's name to search for * @return Returns the property found or @c NULL if not + * + * @since 1.17 */ EAPI Eldbus_Introspection_Property *eldbus_introspection_property_find(Eina_List *properties, const char *name); @@ -118,6 +126,8 @@ EAPI Eldbus_Introspection_Property *eldbus_introspection_property_find(Eina_List * @param arguments The list of arguments of type @c Eldbus_Introspection_Property * @param name The arguments's name to search for * @return Returns the argument found or @c NULL if not + * + * @since 1.17 */ EAPI Eldbus_Introspection_Argument *eldbus_introspection_argument_find(Eina_List *arguments, const char *name); --
[EGIT] [tools/erigo] master 05/07: Update toolbar's items which should be separators
yakov pushed a commit to branch master. http://git.enlightenment.org/tools/erigo.git/commit/?id=5eaae08eecb13268610261da61296c179e32b2a7 commit 5eaae08eecb13268610261da61296c179e32b2a7 Author: Yakov GoldbergDate: Mon Jan 4 19:43:04 2016 +0200 Update toolbar's items which should be separators Change layout json file and logic code according changes. --- src/bin/gui/egui_layout.json | 4 ++-- src/bin/gui/egui_logic.c | 4 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/bin/gui/egui_layout.json b/src/bin/gui/egui_layout.json index ee16f39..01c5b79 100644 --- a/src/bin/gui/egui_layout.json +++ b/src/bin/gui/egui_layout.json @@ -949,7 +949,7 @@ }, "toolbar_separator1_it": { - "type":"regular", + "type":"separator", "public":true, "icon":null, "label":null, @@ -973,7 +973,7 @@ }, "toolbar_separator2_it": { - "type":"regular", + "type":"separator", "public":true, "icon":null, "label":null, diff --git a/src/bin/gui/egui_logic.c b/src/bin/gui/egui_logic.c index 210490b..f3b4f92 100644 --- a/src/bin/gui/egui_logic.c +++ b/src/bin/gui/egui_logic.c @@ -1011,13 +1011,9 @@ egui_start(const char *filename) elm_object_item_data_set(it, (void *) ITEM_CLOSE); elm_object_item_disabled_set(it, EINA_TRUE); - elm_toolbar_item_separator_set(g_main_wdgs->main_win->toolbar_separator1_it, EINA_TRUE); - elm_object_item_data_set(g_main_wdgs->main_win->toolbar_rm_it, (void *) (intptr_t) RSRC_MNGR); elm_object_item_data_set(g_main_wdgs->main_win->toolbar_settings_it, (void *) (intptr_t) SETTINGS_WIN); - elm_toolbar_item_separator_set(g_main_wdgs->main_win->toolbar_separator2_it, EINA_TRUE); - elm_object_item_data_set(g_main_wdgs->main_win->toolbar_undo_it, (void *) (intptr_t) CTX_UNDO); elm_object_item_disabled_set(g_main_wdgs->main_win->toolbar_undo_it, EINA_TRUE); elm_object_item_data_set(g_main_wdgs->main_win->toolbar_redo_it, (void *) (intptr_t) CTX_REDO); --
[EGIT] [tools/erigo] master 01/07: Fix creation of separators for menu in simulation mode
yakov pushed a commit to branch master. http://git.enlightenment.org/tools/erigo.git/commit/?id=b261366882e648fe4968a4b5b583354b62373949 commit b261366882e648fe4968a4b5b583354b62373949 Author: Yakov GoldbergDate: Mon Jan 4 17:11:12 2016 +0200 Fix creation of separators for menu in simulation mode --- src/lib/simulator.c | 10 +- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/lib/simulator.c b/src/lib/simulator.c index 446505f..27f4776 100644 --- a/src/lib/simulator.c +++ b/src/lib/simulator.c @@ -240,7 +240,15 @@ _item_add(Gui_Session *session, const Gui_Widget *wdg, const Item_Container_Item { label = STRING_GET(val); } -eo_do(session_eo_get(session, wdg), it = elm_obj_menu_item_add(parent_it, icon, label, cb_func, NULL)); + +if (item_container_item_type_get(wit) == ITEM_SEPARATOR) + { + eo_do(session_eo_get(session, wdg), it = elm_obj_menu_item_separator_add(parent_it)); + } +else + { + eo_do(session_eo_get(session, wdg), it = elm_obj_menu_item_add(parent_it, icon, label, cb_func, NULL)); + } goto end; } --
[EGIT] [tools/erigo] master 02/07: Fix code generation of separators for menu
yakov pushed a commit to branch master. http://git.enlightenment.org/tools/erigo.git/commit/?id=389f9ab8969304f6202078ce540e152448c0cfa0 commit 389f9ab8969304f6202078ce540e152448c0cfa0 Author: Yakov GoldbergDate: Mon Jan 4 18:13:48 2016 +0200 Fix code generation of separators for menu --- src/lib/database.h | 1 + src/lib/generator.c | 22 ++ 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/lib/database.h b/src/lib/database.h index 0926bab..3612219 100644 --- a/src/lib/database.h +++ b/src/lib/database.h @@ -143,6 +143,7 @@ typedef struct _Container_Desc Container_Desc; #define FILE_SET "file" #define CONTENT_SET "content_set" #define ITEM_PUSH "item_push" +#define ITEM_SEPARATOR_ADD "item_separator_add" Eina_Bool db_init(const char *db_path, const char *all_eo_path, const char *black_list); diff --git a/src/lib/generator.c b/src/lib/generator.c index c16fb10..8eeb5cf 100644 --- a/src/lib/generator.c +++ b/src/lib/generator.c @@ -481,19 +481,31 @@ _item_iterate(Gui_Session *session, Widget_Context *wdg_ctx, const Gui_Widget *w Global_Gen_Context *gl_ctx = wdg_ctx->gl_ctx; const Gui_Widget_Property *prop = item_container_item_prop_get(wit); Eid *wit_id = item_container_item_eid_get(wit); - const Op_Desc *op_desc; - const Eina_List *itr; + const Op_Desc *op_desc = NULL; + const Eina_List *itr = NULL; + Eina_Bool item_is_separator = EINA_FALSE; const char *item_name = NULL; if (item_container_item_public_get(wit) || item_container_item_subitems_get(wit)) item_name = eid_name_get(wit_id); + Eina_Stringshare *class_id = wdg_class_name_get(wdg); if (!class_id) { ERR("Property \"class\" is missing in widget: \"%s\"\n", wdg_name_get(wdg)); return; } - op_desc = prop_op_desc_get(prop); + + if (!strcmp(class_id, DB_DEF_MENU_CLASS)) + { +if (item_container_item_type_get(wit) == ITEM_SEPARATOR) + { + op_desc = db_mro_op_desc_get(DB_DEF_MENU_CLASS, DB_DEF_MENU_CLASS, ITEM_SEPARATOR_ADD); + item_is_separator = EINA_TRUE; + } + } + + if (!op_desc) op_desc = prop_op_desc_get(prop); if (!op_desc) { ERR("Op Desc for property: \"%s\" was not found in hash table.", prop_name_get(prop)); @@ -517,7 +529,7 @@ _item_iterate(Gui_Session *session, Widget_Context *wdg_ctx, const Gui_Widget *w else { eina_strbuf_append_printf(wdg_ctx->buf, " eo_do(%s, %s%s%s(", - wdg_name_get(wdg), item_name?item_name:"", item_name?" = ":"", + wdg_name_get(wdg), item_name ? item_name : "", item_name?" = ":"", db_op_desc_func_name_get(op_desc)); } if (item_name) wdg_ctx->declarations = eina_list_append(wdg_ctx->declarations, wit_id); @@ -534,6 +546,8 @@ _item_iterate(Gui_Session *session, Widget_Context *wdg_ctx, const Gui_Widget *w if (values_lst != itr) eina_strbuf_append_printf(wdg_ctx->buf, ", "); _format_string_add(val, wdg_ctx->buf); +/*If item is a separator add only first parameter, which is parent item*/ +if (item_is_separator) break; } if (legacy_name) { --
[EGIT] [core/enlightenment] master 02/04: define EFL_BETA_API_SUPPORT explicitly in e.h if wayland support is enabled
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=c5f6d18b013108f35bdab4a599b5247cc968727c commit c5f6d18b013108f35bdab4a599b5247cc968727c Author: Mike BlumenkrantzDate: Wed Jan 6 12:57:46 2016 -0500 define EFL_BETA_API_SUPPORT explicitly in e.h if wayland support is enabled --- src/bin/e.h | 4 1 file changed, 4 insertions(+) diff --git a/src/bin/e.h b/src/bin/e.h index 0993e65..6b7ea51 100644 --- a/src/bin/e.h +++ b/src/bin/e.h @@ -16,6 +16,10 @@ # include "config.h" # endif +#ifdef HAVE_WAYLAND +# define EFL_BETA_API_SUPPORT +#endif + # define USE_IPC # if 0 # define OBJECT_PARANOIA_CHECK --
[EGIT] [core/enlightenment] master 03/04: remove defines for various beta api in other places
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=2381280cc2d6b48d478cad7a2f03cf6e8611ff61 commit 2381280cc2d6b48d478cad7a2f03cf6e8611ff61 Author: Mike BlumenkrantzDate: Wed Jan 6 13:01:38 2016 -0500 remove defines for various beta api in other places --- src/bin/Makefile.mk | 2 +- src/modules/Makefile_ibox.mk| 2 +- src/modules/conf_theme/e_int_config_color_classes.c | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/bin/Makefile.mk b/src/bin/Makefile.mk index 3e7266d..2974e46 100644 --- a/src/bin/Makefile.mk +++ b/src/bin/Makefile.mk @@ -377,7 +377,7 @@ src/bin/e_comp_wl_input.c \ src/bin/e_comp_wl.c endif -src_bin_enlightenment_CPPFLAGS = $(E_CPPFLAGS) -DEFL_BETA_API_SUPPORT -DEFL_EO_API_SUPPORT -DE_LOGGING=1 @WAYLAND_CFLAGS@ @WAYLAND_EGL_CFLAGS@ @ECORE_X_CFLAGS@ +src_bin_enlightenment_CPPFLAGS = $(E_CPPFLAGS) -DE_LOGGING=1 @WAYLAND_CFLAGS@ @WAYLAND_EGL_CFLAGS@ @ECORE_X_CFLAGS@ src_bin_enlightenment_SOURCES = \ src/bin/e_main.c \ $(enlightenment_src) diff --git a/src/modules/Makefile_ibox.mk b/src/modules/Makefile_ibox.mk index fbed022..750a3de 100644 --- a/src/modules/Makefile_ibox.mk +++ b/src/modules/Makefile_ibox.mk @@ -10,7 +10,7 @@ iboxpkgdir = $(MDIR)/ibox/$(MODULE_ARCH) iboxpkg_LTLIBRARIES = src/modules/ibox/module.la src_modules_ibox_module_la_LIBADD = $(MOD_LIBS) -src_modules_ibox_module_la_CPPFLAGS = -DEFL_BETA_API_SUPPORT -DEFL_EO_API_SUPPORT $(MOD_CPPFLAGS) +src_modules_ibox_module_la_CPPFLAGS = $(MOD_CPPFLAGS) src_modules_ibox_module_la_LDFLAGS = $(MOD_LDFLAGS) src_modules_ibox_module_la_SOURCES = src/modules/ibox/e_mod_main.c \ src/modules/ibox/e_mod_main.h \ diff --git a/src/modules/conf_theme/e_int_config_color_classes.c b/src/modules/conf_theme/e_int_config_color_classes.c index 6659c5c..7486a1d 100644 --- a/src/modules/conf_theme/e_int_config_color_classes.c +++ b/src/modules/conf_theme/e_int_config_color_classes.c @@ -1,6 +1,4 @@ #include "e.h" -#define EFL_BETA_API_SUPPORT -#include static char * _translate(char *str) --
[EGIT] [core/elementary] master 02/03: elm_combox: add missing since tags for new APIs
stefan pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=110a9affa641e72c795f5a6f22296421aa204fa7 commit 110a9affa641e72c795f5a6f22296421aa204fa7 Author: Stefan SchmidtDate: Wed Jan 6 17:33:54 2016 +0100 elm_combox: add missing since tags for new APIs --- src/lib/elm_combobox.eo | 6 ++ 1 file changed, 6 insertions(+) diff --git a/src/lib/elm_combobox.eo b/src/lib/elm_combobox.eo index 96cbb7e..e90e53e 100644 --- a/src/lib/elm_combobox.eo +++ b/src/lib/elm_combobox.eo @@ -10,6 +10,8 @@ class Elm_Combobox (Elm.Button, Evas.Selectable_Interface, This will return EINA_TRUE if the combobox is expanded or EINA_FALSE if it is not expanded. + + @since 1.17 ]] return: bool; } @@ -17,11 +19,15 @@ class Elm_Combobox (Elm.Button, Evas.Selectable_Interface, hover_begin { [[This triggers the combobox popup from code, the same as if the user had clicked the button. + + @since 1.17 ]] } hover_end { [[This dismisses the combobox popup as if the user had clicked outside the hover. + + @since 1.17 ]] } } --
[EGIT] [apps/equate] master 02/02: Remove old CVS ignores
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/apps/equate.git/commit/?id=f3b41611de1267da32aacf9534b63f1f99a1b2f3 commit f3b41611de1267da32aacf9534b63f1f99a1b2f3 Author: Andy WilliamsDate: Wed Jan 6 20:29:21 2016 + Remove old CVS ignores --- data/.cvsignore| 5 - data/images/.cvsignore | 3 --- src/.cvsignore | 6 -- 3 files changed, 14 deletions(-) diff --git a/data/.cvsignore b/data/.cvsignore deleted file mode 100644 index 901ed98..000 --- a/data/.cvsignore +++ /dev/null @@ -1,5 +0,0 @@ -Makefile -Makefile.in -equate.edj -text.edj - diff --git a/data/images/.cvsignore b/data/images/.cvsignore deleted file mode 100644 index 22a4e72..000 --- a/data/images/.cvsignore +++ /dev/null @@ -1,3 +0,0 @@ -Makefile -Makefile.in - diff --git a/src/.cvsignore b/src/.cvsignore deleted file mode 100644 index 83ed5d6..000 --- a/src/.cvsignore +++ /dev/null @@ -1,6 +0,0 @@ -.deps -.libs -Makefile -Makefile.in -equate - --
[EGIT] [apps/equate] master 01/01: Update metadata to remove edje and fix distcheck
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/apps/equate.git/commit/?id=404adc74c04e746c3f19dda6d816283b7a5ef7a0 commit 404adc74c04e746c3f19dda6d816283b7a5ef7a0 Author: Andy WilliamsDate: Wed Jan 6 22:52:56 2016 + Update metadata to remove edje and fix distcheck --- AUTHORS | 2 +- configure.ac | 5 + 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/AUTHORS b/AUTHORS index 51608a1..97994d4 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,6 +1,6 @@ ajwillia.ms (Andy Williams) -much code and theming from +much code and support from digitalfallout and atmos Many thanks to the e developers for all their help! diff --git a/configure.ac b/configure.ac index 4999e38..bb0f8ff 100644 --- a/configure.ac +++ b/configure.ac @@ -29,7 +29,7 @@ PKG_PROG_PKG_CONFIG ### Checks for libraries -PKG_CHECK_MODULES([EQUATE], [elementary edje ecore-evas ecore ecore-input evas >= 1.0.0]) +PKG_CHECK_MODULES([EQUATE], [elementary ecore-evas ecore ecore-input evas >= 1.0.0]) ### Checks for compiler characteristics @@ -37,13 +37,10 @@ PKG_CHECK_MODULES([EQUATE], [elementary edje ecore-evas ecore ecore-input evas > AC_HEADER_STDC -EFL_WITH_BIN([edje], [edje-cc], [edje_cc]) - AC_CONFIG_FILES([ Makefile src/Makefile data/Makefile -data/images/Makefile ]) AC_OUTPUT --
[EGIT] [core/efl] master 02/02: Evas: Document Evas.Render_Op
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=c4b25604c740d5ac05fc86b2a9a0ebd520608005 commit c4b25604c740d5ac05fc86b2a9a0ebd520608005 Author: Jean-Philippe AndreDate: Thu Jan 7 15:08:33 2016 +0900 Evas: Document Evas.Render_Op 1. MASK is not used for masking 2. only BLEND and COPY actually work Should we merge Efl.Gfx.Render_Op and Evas.Render_Op? (this would mean Efl.Gfx.Render_Op.copy = 2 instead of 1) --- src/lib/evas/canvas/evas_object.eo | 19 +-- src/lib/evas/canvas/evas_types.eot | 24 2 files changed, 29 insertions(+), 14 deletions(-) diff --git a/src/lib/evas/canvas/evas_object.eo b/src/lib/evas/canvas/evas_object.eo index af5b853..8baa965 100644 --- a/src/lib/evas/canvas/evas_object.eo +++ b/src/lib/evas/canvas/evas_object.eo @@ -175,7 +175,20 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, Efl.Gfx.Base, Efl.Gfx.Stac } @property render_op { set { -[[Sets the render_op to be used for rendering the Evas object.]] +[[Sets the render mode to be used for compositing the Evas object. + + Note that only copy and blend modes are actually supported: + - @Evas.Render_Op.blend means the object will be merged on top of +objects below it using simple alpha compositing. + - @Evas.Render_Op.copy means this object's pixels will replace +everything that is below, making this object opaque. + + Please do not assume that @Evas.Render_Op.copy mode can be used + to "poke" holes in a window (to see through it), as only the + compositor can ensure that. Copy mode should only be used with + otherwise opaque widgets, or inside non-window surfaces (eg. a + transparent background inside an Ecore.Evas.Buffer). +]] } get { [[Retrieves the current value of the operation used for @@ -183,7 +196,9 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, Efl.Gfx.Base, Efl.Gfx.Stac ]] } values { -render_op: Evas.Render_Op; [[One of the Evas_Render_Op values.]] +render_op: Evas.Render_Op; [[One of the Evas_Render_Op values. + Only blend (default) and copy modes + are supported.]] } } @property freeze_events { diff --git a/src/lib/evas/canvas/evas_types.eot b/src/lib/evas/canvas/evas_types.eot index 2b41d4e..9f7075f 100644 --- a/src/lib/evas/canvas/evas_types.eot +++ b/src/lib/evas/canvas/evas_types.eot @@ -18,18 +18,18 @@ enum Evas.Render_Op { [[How the object should be rendered to output.]] legacy: Evas_Render; - blend = 0, [[default op: d = d*(1-sa) + s]] - blend_rel = 1, [[d = d*(1 - sa) + s*da]] - copy = 2, [[d = s]] - copy_rel = 3, [[d = s*da]] - add = 4, [[d = d + s]] - add_rel = 5, [[d = d + s*da]] - sub = 6, [[d = d - s]] - sub_rel = 7, [[d = d - s*da]] - tint = 8, [[d = d*s + d*(1 - sa) + s*(1 - da)]] - tint_rel = 9, [[d = d*(1 - sa + s)]] - mask = 10, [[d = d*sa]] - mul = 11 [[d = d*s]] + blend = 0, [[Default render operation: d = d*(1-sa) + s. The object will be merged onto the bottom objects using simple alpha compositing (a over b).]] + blend_rel = 1, [[DEPRECATED. d = d*(1 - sa) + s*da]] + copy = 2, [[Copy mode, d = s. The object's pixels will replace everything that was below, effectively hiding them.]] + copy_rel = 3, [[DEPRECATED. d = s*da]] + add = 4, [[DEPRECATED. d = d + s]] + add_rel = 5, [[DEPRECATED. d = d + s*da]] + sub = 6, [[DEPRECATED. d = d - s]] + sub_rel = 7, [[DEPRECATED. d = d - s*da]] + tint = 8, [[DEPRECATED. d = d*s + d*(1 - sa) + s*(1 - da)]] + tint_rel = 9, [[DEPRECATED. d = d*(1 - sa + s)]] + mask = 10, [[DEPRECATED. d = d*sa. For masking support, please use Evas.Object.clip_set or EDC "clip_to" instead.]] + mul = 11 [[DEPRECATED. d = d*s]] } enum Evas.Object_Pointer_Mode { --
[EGIT] [core/efl] master 02/02: Evas render: Fix render artifacts with a mapped object
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=e61182f7aca6504ba19fb2847ae7352c336e0e4e commit e61182f7aca6504ba19fb2847ae7352c336e0e4e Author: Jean-Philippe AndreDate: Wed Jan 6 22:08:58 2016 +0900 Evas render: Fix render artifacts with a mapped object Problem visible in Enventor "map" example, with the SW engine. Fixes T2979 --- src/lib/evas/canvas/evas_render.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/evas/canvas/evas_render.c b/src/lib/evas/canvas/evas_render.c index bfa350d..c9bc480 100644 --- a/src/lib/evas/canvas/evas_render.c +++ b/src/lib/evas/canvas/evas_render.c @@ -615,7 +615,7 @@ _evas_render_phase1_object_process(Evas_Public_Data *e, Evas_Object *eo_obj, } return clean_them; } - else if (hmap) // && !can_map) // FIXME + else if (hmap && !can_map) { RD(level, " had map - restack objs\n"); //OBJ_ARRAY_PUSH(restack_objects, obj); @@ -632,7 +632,7 @@ _evas_render_phase1_object_process(Evas_Public_Data *e, Evas_Object *eo_obj, *redraw_all = 1; } } -if (!(map && !can_map) && obj->cur->clipper) +if (!map && obj->cur->clipper) { // Fix some bad clipping issues after an evas_map animation finishes evas_object_change(obj->cur->clipper->object, obj->cur->clipper); --
[EGIT] [core/efl] master 01/02: build: if we have this option we at least need to make sure the docs are matching
stefan pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=33975599145e6239bec604c8f9e662930cdc96af commit 33975599145e6239bec604c8f9e662930cdc96af Author: Stefan SchmidtDate: Thu Jan 7 08:41:09 2016 +0100 build: if we have this option we at least need to make sure the docs are matching Putting aside the question if we need or want this option we should make sure people at least have correctly updated documentation. We switched the option to ..abb but not the docs. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 7bcc6bb..c213e39 100644 --- a/configure.ac +++ b/configure.ac @@ -5566,7 +5566,7 @@ if test -n "$CFOPT_WARNING"; then echo "_" if test -n "$BARF_OK"; then echo "Please add the following option to acknowledge this:" -echo " --enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-aba" +echo " --enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-abb" echo "_" rm -f Makefile exit 1 --
[EGIT] [core/efl] master 01/02: eina: Updated testcases of strbuf_substr_get.
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=b598f8eb73508b0b794f9880fe1df95a0684ac72 commit b598f8eb73508b0b794f9880fe1df95a0684ac72 Author: Srivardhan HebbarDate: Thu Jan 7 15:35:06 2016 +0900 eina: Updated testcases of strbuf_substr_get. Summary: Fixes T2949. Signed-off-by: Srivardhan Hebbar Reviewers: cedric, jpeg Reviewed By: jpeg Maniphest Tasks: T2949 Differential Revision: https://phab.enlightenment.org/D3460 --- src/tests/eina/eina_test_strbuf.c | 10 -- 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/tests/eina/eina_test_strbuf.c b/src/tests/eina/eina_test_strbuf.c index 8f68df3..6c8f4db 100644 --- a/src/tests/eina/eina_test_strbuf.c +++ b/src/tests/eina/eina_test_strbuf.c @@ -526,17 +526,17 @@ START_TEST(strbuf_substr_get) eina_strbuf_append(buf, "string"); substr = eina_strbuf_substr_get(buf, 2, 3); str = eina_strbuf_string_get(substr); - fail_unless(str || strcmp(str, "rin")); + fail_unless(str && !strcmp(str, "rin")); eina_strbuf_free(substr); substr = eina_strbuf_substr_get(buf, 0, 6); str = eina_strbuf_string_get(substr); - fail_unless(str || strcmp(str, "string")); + fail_unless(str && !strcmp(str, "string")); eina_strbuf_free(substr); substr = eina_strbuf_substr_get(buf, 6, 0); str = eina_strbuf_string_get(substr); - fail_unless(str || strcmp(str, "0")); + fail_unless(str && !strcmp(str, "")); eina_strbuf_free(substr); substr = eina_strbuf_substr_get(buf, 6, 1); @@ -550,9 +550,7 @@ START_TEST(strbuf_substr_get) eina_strbuf_free(substr); substr = eina_strbuf_substr_get(NULL, 0, 7); - str = eina_strbuf_string_get(substr); - fail_if(str); - eina_strbuf_free(substr); + fail_if(substr); eina_strbuf_free(buf); eina_shutdown(); --
[EGIT] [core/elementary] master 01/01: elm_sys_notify: add missing since tags for notification server support
stefan pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=7a2a98094aa278996c0f0bcfebcdbf2e005b55ca commit 7a2a98094aa278996c0f0bcfebcdbf2e005b55ca Author: Stefan SchmidtDate: Wed Jan 6 19:38:46 2016 +0100 elm_sys_notify: add missing since tags for notification server support --- src/lib/elm_sys_notify.eo | 9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/lib/elm_sys_notify.eo b/src/lib/elm_sys_notify.eo index 7eb0df2..9adae9f 100644 --- a/src/lib/elm_sys_notify.eo +++ b/src/lib/elm_sys_notify.eo @@ -50,7 +50,7 @@ class Elm.Sys_Notify (Eo.Base, Elm.Sys_Notify_Interface) get { [[Get the notification servers that have been registered - @since 1.16 + @since 1.17 ]] } set { @@ -60,6 +60,8 @@ class Elm.Sys_Notify (Eo.Base, Elm.Sys_Notify_Interface) fullfill very specific purposes. Use elm_need_sys_notify() which activates the default available notification servers. + + @since 1.17 ]] return: bool; [[$true on success, $false on failure]] } @@ -73,7 +75,10 @@ class Elm.Sys_Notify (Eo.Base, Elm.Sys_Notify_Interface) singleton_get @class { [[Returns the singleton instance of the notification manager Elm.Sys_Notify. It is initialized upon the first call of this - function]] + function + + @since 1.17 + ]] return: Elm.Sys_Notify *; [[The unique notification manager]] } } --
[EGIT] [core/efl] master 01/01: build: add uuid as dependency for wayland build
stefan pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=c27fd0fff55dbd29f760f350440cca0ff2bc2e5f commit c27fd0fff55dbd29f760f350440cca0ff2bc2e5f Author: Stefan SchmidtDate: Wed Jan 6 19:53:56 2016 +0100 build: add uuid as dependency for wayland build The wayland build requires uuid which we need to make sure we have as dependency. Not a real problem as all wayland supported systems should have it. Based on a patch by aerodynamik. Thanks! Fixes T2951 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 56feb7f..7bcc6bb 100644 --- a/configure.ac +++ b/configure.ac @@ -3215,7 +3215,7 @@ EFL_INTERNAL_DEPEND_PKG([ECORE_WAYLAND], [eo]) EFL_INTERNAL_DEPEND_PKG([ECORE_WAYLAND], [eina]) EFL_DEPEND_PKG([ECORE_WAYLAND], [WAYLAND], - [wayland-client >= 1.8.0 wayland-cursor >= 1.8.0 xkbcommon >= 0.5.0]) + [wayland-client >= 1.8.0 wayland-cursor >= 1.8.0 xkbcommon >= 0.5.0 uuid]) EFL_EVAL_PKGS([ECORE_WAYLAND]) --
[EGIT] [core/elementary] master 03/03: elementary_test: remove wrong usage of EINA_UNUSED.
cedric pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=f381c2d26bc73991f60f21604615821d44d2ff2b commit f381c2d26bc73991f60f21604615821d44d2ff2b Author: Umesh TanwarDate: Wed Jan 6 11:27:10 2016 -0800 elementary_test: remove wrong usage of EINA_UNUSED. Summary: If argument variable is not used in function, then only that variable should be declared as EINA_UNUSED. Signed-off-by: Umesh Tanwar @fix Reviewers: Hermet, singh.amitesh Subscribers: sachin.dev Differential Revision: https://phab.enlightenment.org/D3525 Signed-off-by: Cedric BAIL --- src/bin/test_transit.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bin/test_transit.c b/src/bin/test_transit.c index 9a04fb5..fb4e524 100644 --- a/src/bin/test_transit.c +++ b/src/bin/test_transit.c @@ -115,7 +115,7 @@ _transit_del_cb(void *data, Elm_Transit *transit EINA_UNUSED) } static void -_transit_image_animation(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +_transit_image_animation(void *data, Evas_Object *obj, void *event_info EINA_UNUSED) { Eina_List *images = NULL; char buf[PATH_MAX]; @@ -145,7 +145,7 @@ _transit_image_animation(void *data, Evas_Object *obj EINA_UNUSED, void *event_i } static void -_transit_resizing(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +_transit_resizing(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) { Elm_Transit *trans; @@ -175,7 +175,7 @@ _transit_flip(void *data, Evas_Object *obj, void *event_info EINA_UNUSED) } static void -_transit_zoom(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +_transit_zoom(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) { Elm_Transit *trans; --