[EGIT] [tools/eflete] master 09/34: UTC: update diff test
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=3f6a0d86d9c4faeafa7ca2e7419c6fbe0296d330
commit 3f6a0d86d9c4faeafa7ca2e7419c6fbe0296d330
Author: Andrii Kroitor
Date: Wed Mar 16 11:38:17 2016 +0200
UTC: update diff test
function protopypes were changed.
undo/redo now has abort() if function returns false, so we shouldn't check
this in test
---
tests/test_diff/diff_undo_redo.c | 35 ++-
1 file changed, 2 insertions(+), 33 deletions(-)
diff --git a/tests/test_diff/diff_undo_redo.c b/tests/test_diff/diff_undo_redo.c
index 0fa9fd5..cb94847 100644
--- a/tests/test_diff/diff_undo_redo.c
+++ b/tests/test_diff/diff_undo_redo.c
@@ -68,7 +68,7 @@ END_TEST
/* test stubs that check args, return specified value, and report what
function was called */
static Eina_Bool _function_type_int_undo_return_true_called = false;
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);
@@ -76,19 +76,9 @@ _function_type_int_undo_return_true(Evas_Object *obj, int
val)
return true;
}
-static Eina_Bool _function_type_int_undo_return_false_called = false;
-static Eina_Bool
-_function_type_int_undo_return_false(Evas_Object *obj, int val)
-{
- ck_assert(obj == pseudo_object);
- ck_assert(val == 24);
- _function_type_int_undo_return_false_called = true;
- return false;
-}
-
static Eina_Bool _function_type_int_redo_return_true_called = false;
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 == 42);
@@ -96,16 +86,6 @@ _function_type_int_redo_return_true(Evas_Object *obj, int
val)
return true;
}
-static Eina_Bool _function_type_int_redo_return_false_called = false;
-static Eina_Bool
-_function_type_int_redo_return_false(Evas_Object *obj, int val)
-{
- ck_assert(obj == pseudo_object);
- ck_assert(val == 24);
- _function_type_int_redo_return_false_called = true;
- return false;
-}
-
/**
* @addtogroup diff_undo_redo
* @{
@@ -148,17 +128,6 @@ EFLETE_TEST (diff_undo_redo_test_p2)
ck_assert(_function_type_int_undo_return_true_called);
ck_assert(diff_redo(pseudo_object, &diff) == true);
ck_assert(_function_type_int_redo_return_true_called);
-
- diff.undo.type = FUNCTION_TYPE_INT;
- diff.undo.function = _function_type_int_undo_return_false;
- diff.undo.args.type_i.i1 = 24;
- diff.redo.type = FUNCTION_TYPE_INT;
- diff.redo.function = _function_type_int_redo_return_false;
- diff.redo.args.type_i.i1 = 24;
- ck_assert(diff_undo(pseudo_object, &diff) == false);
- ck_assert(_function_type_int_undo_return_false_called);
- ck_assert(diff_redo(pseudo_object, &diff) == false);
- ck_assert(_function_type_int_redo_return_false_called);
}
END_TEST
--
[EGIT] [tools/eflete] master 13/34: group_navigator: set Action on program creation
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=27494c066f08f4a4d32700b69ee726ff099a8369
commit 27494c066f08f4a4d32700b69ee726ff099a8369
Author: Vitalii Vorobiov
Date: Tue Mar 15 16:25:12 2016 +
group_navigator: set Action on program creation
---
src/bin/ui/workspace/group_navigator.c | 78 ++
1 file changed, 70 insertions(+), 8 deletions(-)
diff --git a/src/bin/ui/workspace/group_navigator.c
b/src/bin/ui/workspace/group_navigator.c
index b8d854e..d21e120 100644
--- a/src/bin/ui/workspace/group_navigator.c
+++ b/src/bin/ui/workspace/group_navigator.c
@@ -80,6 +80,19 @@ static char *part_types[] = {
N_("PROXY"),
N_("SPACER")
};
+static const char *program_actions[] = {
+ N_("NONE"),
+ N_("STATE SET"),
+ N_("SIGNAL EMIT"),
+ N_("DRAG VALUE SET"),
+ N_("DRAG VALUE STEP"),
+ N_("DRAG VALUE PAGE"),
+ N_("PLAY SAMPLE"),
+ N_("PLAY TONE"),
+ N_("ACTION STOP"),
+ NULL
+};
+
static const unsigned int part_types_count = 12;
static char *
@@ -666,18 +679,17 @@ _program_validate(void *data,
void *event_info __UNUSED__)
{
Part_List *pl = data;
- const char *name, *program;
- Eina_Bool valid;
- Eina_List *l;
+ const char *program;
assert(pl != NULL);
- name = elm_entry_entry_get(pl->popup.entry_name);
- valid = (elm_validator_regexp_status_get(pl->name_validator) ==
ELM_REG_NOERROR);
- EINA_LIST_FOREACH(pl->group->programs, l, program)
- valid = valid && strcmp(program, name);
+ program = elm_entry_entry_get(pl->popup.entry_name);
- elm_object_disabled_set(pl->popup.btn_add, !valid);
+ if ((elm_validator_regexp_status_get(pl->name_validator) !=
ELM_REG_NOERROR) ||
+ (edje_edit_program_exist(pl->group->edit_object, program)))
+ elm_object_disabled_set(pl->popup.btn_add, true);
+ else
+ elm_object_disabled_set(pl->popup.btn_add, false);
}
static void
@@ -1125,6 +1137,8 @@ _popup_add_program_ok_clicked(void *data,
Evas_Object *obj __UNUSED__,
void *event_info __UNUSED__)
{
+ Ewe_Combobox_Item *item;
+ Edje_Action_Type type = EDJE_ACTION_TYPE_NONE;
Part_List *pl = data;
const char *name;
Eina_Stringshare *msg;
@@ -1134,11 +1148,44 @@ _popup_add_program_ok_clicked(void *data,
if (elm_object_disabled_get(pl->popup.btn_add)) return;
+ item = ewe_combobox_select_item_get(pl->popup.combobox);
+ switch (item->index)
+ {
+ case 0:
+ type = EDJE_ACTION_TYPE_NONE;
+ break;
+ case 1:
+ type = EDJE_ACTION_TYPE_STATE_SET;
+ break;
+ case 2:
+ type = EDJE_ACTION_TYPE_SIGNAL_EMIT;
+ break;
+ case 3:
+ type = EDJE_ACTION_TYPE_DRAG_VAL_SET;
+ break;
+ case 4:
+ type = EDJE_ACTION_TYPE_DRAG_VAL_STEP;
+ break;
+ case 5:
+ type = EDJE_ACTION_TYPE_DRAG_VAL_PAGE;
+ break;
+ case 6:
+ type = EDJE_ACTION_TYPE_SOUND_SAMPLE;
+ break;
+ case 7:
+ type = EDJE_ACTION_TYPE_SOUND_TONE;
+ break;
+ case 8:
+ type = EDJE_ACTION_TYPE_ACTION_STOP;
+ break;
+ }
+
name = elm_entry_entry_get(pl->popup.entry_name);
msg = eina_stringshare_printf(_("added new program \"%s\""), name);
change = change_add(msg);
editor_program_add(pl->group->edit_object, change, false, name);
+ editor_program_action_set(pl->group->edit_object, change, false, name,
type);
history_change_add(pl->group->history, change);
eina_stringshare_del(msg);
@@ -1152,6 +1199,7 @@ _on_menu_add_program_clicked(void *data __UNUSED__,
{
Part_List *pl = evas_object_data_get(obj, GROUP_NAVIGATOR_DATA);
Evas_Object *box, *item;
+ unsigned int i;
assert(pl != NULL);
@@ -1170,6 +1218,20 @@ _on_menu_add_program_clicked(void *data __UNUSED__,
elm_object_part_content_set(item, "elm.swallow.content",
pl->popup.entry_name);
elm_box_pack_end(box, item);
+ LAYOUT_PROP_ADD(box, _("Transition type:"), "property", "1swallow")
+ EWE_COMBOBOX_ADD(item, pl->popup.combobox)
+ ewe_combobox_select_item_set(pl->popup.combobox, 0);
+
+ for (i = 0; program_actions[i]; i++)
+ {
+ewe_combobox_item_add(pl->popup.combobox, program_actions[i]);
+ }
+ ewe_combobox_select_item_set(pl->popup.combobox, 0);
+ elm_object_part_content_set(item, "elm.swallow.content",
pl->popup.combobox);
+ evas_object_smart_callback_add(pl->popup.combobox, "collapsed",
_combobox_collapsed, pl);
+
+ elm_box_pack_end(box, item);
+
elm_object_content_set(ap.popup, box);
BUTTON_ADD(ap.popup, pl->popup.btn_add, _("Add"));
--
[EGIT] [core/efl] master 06/06: Efl.Canvas.Surface: Fix linking of inexisting functions
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=ca65f66fc02af69b5b86d82b3b0f36bb3b6f00c2
commit ca65f66fc02af69b5b86d82b3b0f36bb3b6f00c2
Author: Jean-Philippe Andre
Date: Thu Mar 17 14:02:26 2016 +0900
Efl.Canvas.Surface: Fix linking of inexisting functions
The EO files specified some functions that were not implemented.
Somehow this links fine with recent GCC but older versions have
trouble.
---
src/lib/evas/canvas/efl_canvas_surface.eo | 1 +
src/lib/evas/canvas/efl_canvas_surface_tbm.eo | 1 -
src/lib/evas/canvas/efl_canvas_surface_wayland.eo | 1 -
src/lib/evas/canvas/efl_canvas_surface_x11.eo | 1 -
4 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/lib/evas/canvas/efl_canvas_surface.eo
b/src/lib/evas/canvas/efl_canvas_surface.eo
index 722f54f..3a78d2b 100644
--- a/src/lib/evas/canvas/efl_canvas_surface.eo
+++ b/src/lib/evas/canvas/efl_canvas_surface.eo
@@ -29,5 +29,6 @@ mixin Efl.Canvas.Surface (Evas.Image)
}
implements {
Eo.Base.constructor;
+ @virtual .native_buffer.set;
}
}
diff --git a/src/lib/evas/canvas/efl_canvas_surface_tbm.eo
b/src/lib/evas/canvas/efl_canvas_surface_tbm.eo
index 58d5086..9d16dc8 100644
--- a/src/lib/evas/canvas/efl_canvas_surface_tbm.eo
+++ b/src/lib/evas/canvas/efl_canvas_surface_tbm.eo
@@ -5,6 +5,5 @@ class Efl.Canvas.Surface_Tbm (Efl.Canvas.Surface)
Eo.Base.constructor;
Eo.Base.destructor;
Efl.Canvas.Surface.native_buffer.set;
- Efl.Canvas.Surface.native_buffer.get;
}
}
diff --git a/src/lib/evas/canvas/efl_canvas_surface_wayland.eo
b/src/lib/evas/canvas/efl_canvas_surface_wayland.eo
index 1e92818..9cf9114 100644
--- a/src/lib/evas/canvas/efl_canvas_surface_wayland.eo
+++ b/src/lib/evas/canvas/efl_canvas_surface_wayland.eo
@@ -4,7 +4,6 @@ class Efl.Canvas.Surface_Wayland (Efl.Canvas.Surface)
implements {
Eo.Base.constructor;
Eo.Base.destructor;
- Efl.Canvas.Surface.native_buffer.get;
Efl.Canvas.Surface.native_buffer.set;
}
}
diff --git a/src/lib/evas/canvas/efl_canvas_surface_x11.eo
b/src/lib/evas/canvas/efl_canvas_surface_x11.eo
index d94a246..3b1c979 100644
--- a/src/lib/evas/canvas/efl_canvas_surface_x11.eo
+++ b/src/lib/evas/canvas/efl_canvas_surface_x11.eo
@@ -22,7 +22,6 @@ class Efl.Canvas.Surface_X11 (Efl.Canvas.Surface)
implements {
Eo.Base.constructor;
Eo.Base.destructor;
- Efl.Canvas.Surface.native_buffer.get;
Efl.Canvas.Surface.native_buffer.set;
}
}
--
[EGIT] [core/efl] master 01/03: evas: remove check for wayland-egl version.
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=652895ad4ab33be714152adee85eeb7883c06593
commit 652895ad4ab33be714152adee85eeb7883c06593
Author: Clément Bénier
Date: Fri Dec 11 16:27:24 2015 +0100
evas: remove check for wayland-egl version.
wayland-egl minimal version currently checked is 9.2.0 which is the
Mesa version of wayland-egl. If wayland-egl is shipped with closed
source drivers or in case of libhybris, the wayland-egl.pc pontetially
contains a different value. This commit remove the check for the
version.
Signed-off-by: Nicolas Aguirre
Signed-off-by: Cedric Bail
---
m4/evas_check_engine.m4 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/m4/evas_check_engine.m4 b/m4/evas_check_engine.m4
index 8f54f2d..42ecc89 100644
--- a/m4/evas_check_engine.m4
+++ b/m4/evas_check_engine.m4
@@ -560,7 +560,7 @@ else
gl_library="gl"
fi
-PKG_CHECK_EXISTS([egl ${gl_library} wayland-client >= 1.3.0 wayland-egl >=
9.2.0],
+PKG_CHECK_EXISTS([egl ${gl_library} wayland-client >= 1.3.0 wayland-egl],
[
have_dep="yes"
requirement="egl ${gl_library} wayland-client wayland-egl"
--
[EGIT] [tools/eflete] master 02/34: UTC: delete unit tests for container and highlight
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=2bed283fd1bd0aaba03d40d39776226764450b26
commit 2bed283fd1bd0aaba03d40d39776226764450b26
Author: Vyacheslav Reutskiy
Date: Wed Mar 16 09:32:17 2016 +0200
UTC: delete unit tests for container and highlight
This module are submodules of workspace, so they must to tested by
workspace functional tests.
Change-Id: I840ca9ed343c98da6f9efa63cddf56be641e049a
---
tests/Makefile.am | 36 ---
tests/test_container/container_add.c | 74 --
tests/test_container/container_border_hide.c | 77 --
tests/test_container/container_border_show.c | 77 --
.../test_container/container_container_size_get.c | 84 ---
.../test_container/container_container_size_set.c | 169 --
tests/test_container/container_content_set.c | 78 ---
tests/test_container/container_content_unset.c | 118 --
tests/test_container/container_handler_size_get.c | 80 ---
tests/test_container/container_handler_size_set.c | 257
tests/test_container/container_max_size_set.c | 77 --
tests/test_container/container_min_size_set.c | 77 --
tests/test_container/container_padding_size_get.c | 141 ---
tests/test_container/container_padding_size_set.c | 259 -
tests/test_container/container_style_get.c | 79 ---
tests/test_container/container_style_set.c | 78 ---
tests/test_container/test_container.c | 67 --
tests/test_container/test_container.h | 53 -
tests/test_highlight/highlight_add.c | 72 --
.../test_highlight/highlight_handler_align_hide.c | 113 -
.../test_highlight/highlight_handler_align_show.c | 115 -
.../highlight_handler_align_visible_get.c | 116 -
.../highlight_handler_disabled_set.c | 114 -
tests/test_highlight/highlight_handler_mode_set.c | 76 --
tests/test_highlight/highlight_object_follow.c | 160 -
tests/test_highlight/highlight_object_unfollow.c | 123 --
tests/test_highlight/test_highlight.c | 59 -
tests/test_highlight/test_highlight.h | 48
28 files changed, 2877 deletions(-)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index e8d3507..4adb226 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -12,12 +12,10 @@ diff_test \
change_test \
new_history_test \
logger_test \
-container_test \
modal_window_test \
project_manager_test \
config_test \
cursor_test \
-highlight_test \
ui_main_window_test \
ui_workspace_test \
about_window_test \
@@ -40,7 +38,6 @@ FLAGS = \
-I${top_srcdir}/src/bin/config \
-I${top_srcdir}/src/bin/history \
-I${top_srcdir}/src/bin/ui \
--I${top_srcdir}/src/bin/ui/container \
-I${top_srcdir}/src/bin/ui/blocks \
-I${top_srcdir}/src/bin/ui/dialogs \
-I${top_srcdir}/src/bin/ui/editors \
@@ -217,39 +214,6 @@ cursor_test_SOURCES = \
cursor_test_CFLAGS = ${FLAGS}
cursor_test_LDADD = ${LD}
-container_test_SOURCES = \
-../tests/test_container/test_container.c \
-../tests/test_container/container_add.c \
-../tests/test_container/container_container_size_set.c \
-../tests/test_container/container_container_size_get.c \
-../tests/test_container/container_min_size_set.c \
-../tests/test_container/container_max_size_set.c \
-../tests/test_container/container_handler_size_set.c \
-../tests/test_container/container_handler_size_get.c \
-../tests/test_container/container_style_get.c \
-../tests/test_container/container_style_set.c \
-../tests/test_container/container_border_hide.c \
-../tests/test_container/container_border_show.c \
-../tests/test_container/container_padding_size_set.c \
-../tests/test_container/container_padding_size_get.c \
-../tests/test_container/container_content_set.c \
-../tests/test_container/container_content_unset.c
-container_test_CFLAGS = ${FLAGS}
-container_test_LDADD = ${LD}
-
-highlight_test_SOURCES = \
-../tests/test_highlight/test_highlight.c \
-../tests/test_highlight/highlight_add.c \
-../tests/test_highlight/highlight_handler_disabled_set.c \
-../tests/test_highlight/highlight_handler_align_hide.c \
-../tests/test_highlight/highlight_handler_align_show.c \
-../tests/test_highlight/highlight_handler_align_visible_get.c \
-../tests/test_highlight/highlight_handler_mode_set.c \
-../tests/test_highlight/highlight_object_follow.c \
-../tests/test_highlight/highlight_object_unfollow.c
-highlight_test_CFLAGS = ${FLAGS}
-highlight_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 \
diff --git a/tests/test_container/container_add.c
b/tests/test_container/container_add.c
deleted file mode 100644
index 55afb57..000
--- a/tests/test_container
[EGIT] [core/efl] master 01/01: Revert "edje: remove unnecessary repetition during copying code"
jaehyun pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=4e0cff107ebaba8cfcac18efca7dbaa8d82ce888
commit 4e0cff107ebaba8cfcac18efca7dbaa8d82ce888
Author: Jaehyun Cho
Date: Fri Mar 18 11:31:45 2016 +0900
Revert "edje: remove unnecessary repetition during copying code"
This reverts commit 37408aef95ee5794f9030ece34be9d6b097d064e.
This commit is reverted temporarily to prevent build fail.
This commit reveals the hidden bug when elementary theme is built.
This commit will be applied after the hidden bug is resolved.
---
src/bin/edje/edje_cc_handlers.c | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c
index 5c6f14d..8fb43cf 100644
--- a/src/bin/edje/edje_cc_handlers.c
+++ b/src/bin/edje/edje_cc_handlers.c
@@ -4438,10 +4438,6 @@ 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));
@@ -4450,6 +4446,9 @@ 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] [core/elementary] master 02/02: Examples: Fix usage of evas image apis
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=bd860627db6dcb93e92c04f774b7661b84f3acbd commit bd860627db6dcb93e92c04f774b7661b84f3acbd Author: Jean-Philippe Andre Date: Wed Mar 16 20:26:34 2016 +0900 Examples: Fix usage of evas image apis --- src/examples/evas3d_map_example.c | 4 ++-- src/examples/evas3d_object_on_button_example.c | 4 ++-- src/examples/evas3d_scene_on_button_example.c | 4 ++-- src/examples/performance/graphical.c | 2 +- src/examples/performance/performance.c | 3 +-- src/examples/sphere_hunter/evas_3d_sphere_hunter.c | 4 ++-- 6 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/examples/evas3d_map_example.c b/src/examples/evas3d_map_example.c index eefa029..5cfb010 100644 --- a/src/examples/evas3d_map_example.c +++ b/src/examples/evas3d_map_example.c @@ -1156,7 +1156,7 @@ elm_main(int argc, char **argv) evas_object_show(bg); /* Add an image which shows a scene. */ - image = evas_object_image_filled_add(evas); + image = eo_add(EFL_CANVAS_SCENE3D_CLASS, evas); evas_object_resize(image, WIDTH, HEIGHT); evas_object_show(image); @@ -1181,7 +1181,7 @@ elm_main(int argc, char **argv) evas_canvas3d_scene_root_node_set(scene, root_node); evas_canvas3d_scene_camera_node_set(scene, camera_node); evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT); - evas_obj_image_scene_set(image, scene); + efl_canvas_scene3d_set(image, scene); /* Add a layout for controlers. */ control_layout = elm_layout_add(win); diff --git a/src/examples/evas3d_object_on_button_example.c b/src/examples/evas3d_object_on_button_example.c index 4aff42e..842cdfd 100644 --- a/src/examples/evas3d_object_on_button_example.c +++ b/src/examples/evas3d_object_on_button_example.c @@ -257,7 +257,7 @@ elm_main(int argc, char **argv) evas = evas_object_evas_get(win); /* Add an image object for 3D scene rendering. */ - image = evas_object_image_filled_add(evas); + image = eo_add(EFL_CANVAS_SCENE3D_CLASS, evas); efl_gfx_size_set(image, WIDTH, HEIGHT); efl_gfx_visible_set(image, EINA_TRUE); @@ -270,7 +270,7 @@ elm_main(int argc, char **argv) /* Set the image object as render target for 3D scene. */ _scene_setup(&data); evas_object_focus_set(image, EINA_TRUE); - evas_obj_image_scene_set(image, data.scene); + efl_canvas_scene3d_set(image, data.scene); evas_object_event_callback_add(image, EVAS_CALLBACK_MOUSE_DOWN, _stop_scene, &data); evas_object_event_callback_add(image, EVAS_CALLBACK_MOUSE_UP, _play_scene, &data); diff --git a/src/examples/evas3d_scene_on_button_example.c b/src/examples/evas3d_scene_on_button_example.c index 2e1aa5c..2aa8a2f 100644 --- a/src/examples/evas3d_scene_on_button_example.c +++ b/src/examples/evas3d_scene_on_button_example.c @@ -250,11 +250,11 @@ elm_main(int argc, char **argv) _scene_setup(&data); - image = evas_object_image_filled_add(evas); + image = eo_add(EFL_CANVAS_SCENE3D_CLASS, evas); efl_gfx_visible_set(image, EINA_TRUE); /* Set the image object as render target for 3D scene. */ - evas_obj_image_scene_set(image, data.scene); + efl_canvas_scene3d_set(image, data.scene); /* Setup scene to the widget button. */ btn = elm_button_add(win); diff --git a/src/examples/performance/graphical.c b/src/examples/performance/graphical.c index f5aafcf..7ca4d4c 100644 --- a/src/examples/performance/graphical.c +++ b/src/examples/performance/graphical.c @@ -609,7 +609,7 @@ init_graphical_window(Evas_Object *img) _init_graphical(); globalGraphical.evas = evas_object_evas_get(img); _init_scene(img); - evas_obj_image_scene_set(img, globalGraphical.scene); + efl_canvas_scene3d_set(img, globalGraphical.scene); return img; } diff --git a/src/examples/performance/performance.c b/src/examples/performance/performance.c index c1d0ef8..cdfe6be 100644 --- a/src/examples/performance/performance.c +++ b/src/examples/performance/performance.c @@ -622,7 +622,7 @@ EAPI_MAIN evas_object_show(startexitbox); evas = evas_object_evas_get(win); - image = evas_object_image_add(evas); + image = eo_add(EFL_CANVAS_SCENE3D_CLASS, evas); btnstart = elm_button_add(win); elm_object_text_set(btnstart, "Apply"); @@ -906,7 +906,6 @@ EAPI_MAIN evas_object_show(fs_bt); evas_object_smart_callback_add(fs_bt, "file,chosen", _load_mesh, NULL); - evas_object_image_filled_set(image, EINA_TRUE); elm_object_part_content_set(layout, "swallow.content", image); evas_object_size_hint_weight_set(image, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(image, EVAS_HINT_FILL, EVAS_HINT_FILL); diff --git a/src/examples/sphere_hunter/evas_3d_sphere_hunter.c b/src/examples/sphere_hunter/evas_3d_sphere_hunter.c index da6c73c..44b5dee 100644 --- a/src/examples/sphere_hunter/evas_3d_sphere_hunter.c +++ b/src/examples/spher
[EGIT] [enlightenment/modules/penguins] master 01/01: stupid fix to support E > 20
davemds pushed a commit to branch master.
http://git.enlightenment.org/enlightenment/modules/penguins.git/commit/?id=fcdc7e60a7333ec5bf932e0cce92f5e2d724139e
commit fcdc7e60a7333ec5bf932e0cce92f5e2d724139e
Author: Dave Andreoli
Date: Fri Mar 18 21:19:27 2016 +0100
stupid fix to support E > 20
---
.gitignore | 1 +
src/e_mod_penguins.c | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/.gitignore b/.gitignore
index c061086..674a169 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@ config.rpath
config.status
config.sub
configure
+compile
depcomp
e-module-penguins.edj
e_modules-penguins.spec
diff --git a/src/e_mod_penguins.c b/src/e_mod_penguins.c
index 7bc5cd7..1e17971 100644
--- a/src/e_mod_penguins.c
+++ b/src/e_mod_penguins.c
@@ -287,7 +287,7 @@ _population_load(void)
// Build a temporary flat list of E_Zone*
printf("PENGUINS: Hooking zones...\n");
- #if E_VERSION_MAJOR == 20
+ #if E_VERSION_MAJOR >= 20
EINA_LIST_FOREACH(e_comp->zones, l2, zone)
{
zones = eina_list_append(zones, zone);
@@ -316,7 +316,7 @@ _population_load(void)
if (!tux) return;
tux->zone = eina_list_nth(zones, i % eina_list_count(zones));
-#if E_VERSION_MAJOR == 20
+#if E_VERSION_MAJOR >= 20
tux->obj = edje_object_add(e_comp->evas);
#else
tux->obj = edje_object_add(tux->zone->comp->evas);
@@ -590,7 +590,7 @@ static int
_is_inside_any_win(Penguins_Actor *tux, int x, int y, int ret_value)
{
Evas_Object *o;
-#if E_VERSION_MAJOR == 20
+#if E_VERSION_MAJOR >= 20
o = evas_object_top_get(e_comp->evas);
#else
o = evas_object_top_get(tux->zone->comp->evas);
--
[EGIT] [core/elementary] master 01/01: Elm_Glveiw: add legacy API to .h file
jypark pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=95245da5a2df237d8ff5890e9f5d30aecda0dbe9 commit 95245da5a2df237d8ff5890e9f5d30aecda0dbe9 Author: Ji-Youn Park Date: Thu Mar 17 17:38:52 2016 +0830 Elm_Glveiw: add legacy API to .h file --- src/lib/elm_glview_legacy.h | 62 - 1 file changed, 61 insertions(+), 1 deletion(-) diff --git a/src/lib/elm_glview_legacy.h b/src/lib/elm_glview_legacy.h index fe2d57b..586b77c 100644 --- a/src/lib/elm_glview_legacy.h +++ b/src/lib/elm_glview_legacy.h @@ -25,8 +25,68 @@ EAPI Evas_Object *elm_glview_version_add(Evas_Object *parent, Evas_GL_Context_Ve * * @param obj The GLView object * - * @ingroup GLView + * @ingroup Elm_GLView */ EAPI void elm_glview_changed_set(Evas_Object *obj); +/** + * Gets the size of the GLView. + * + * @param obj The GLView object + * @param w pointer of int width + * @param h pointer of int height + * + * @ingroup Elm_GLView + */ +EAPI void elm_glview_size_get(const Elm_Glview *obj, int *w, int *h); + +/** + * Sets the size of the GLView. + * + * @param obj The GLView object + * @param w width of GLView + * @param h height of GLView + * + * @ingroup Elm_GLView + */ +EAPI void elm_glview_size_set(Elm_Glview *obj, int w, int h); + +/** + * Set the init function that runs once in the main loop. + * @param obj The GLView object + * @param func The callback function + * + * @ingroup GLView + */ +EAPI void elm_glview_init_func_set(Elm_Glview *obj, Elm_GLView_Func_Cb func); + +/** + * Set the delete function that runs in the main loop. + * + * @param obj The GLView object + * @param func The callback function + * + * @ingroup Elm_GLView + */ +EAPI void elm_glview_del_func_set(Elm_Glview *obj, Elm_GLView_Func_Cb func); + +/** + * Set the resize function that gets called when resize happens. + * + * @param obj The GLView object + * @param func The callback function + * + * @ingroup Elm_GLView + */ +EAPI void elm_glview_resize_func_set(Elm_Glview *obj, Elm_GLView_Func_Cb func); + +/** + * Set the render function that runs in the main loop. + * + * @param obj The GLView object + * @param func The callback function + * + * @ingroup Elm_GLView + */ +EAPI void elm_glview_render_func_set(Elm_Glview *obj, Elm_GLView_Func_Cb func); #include "elm_glview.eo.legacy.h" --
[EGIT] [website/www-content] master 05/10: Wiki page newsdata changed with summary [] by Mike Blumenkrantz
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=7bd5efe6eb3b7a7830d2dae6ef764be96040c013 commit 7bd5efe6eb3b7a7830d2dae6ef764be96040c013 Author: Mike Blumenkrantz Date: Wed Mar 9 09:43:20 2016 -0800 Wiki page newsdata changed with summary [] by Mike Blumenkrantz --- pages/news/newsdata.txt | 125 1 file changed, 125 insertions(+) diff --git a/pages/news/newsdata.txt b/pages/news/newsdata.txt index ff9fa6c..f34b82a 100644 --- a/pages/news/newsdata.txt +++ b/pages/news/newsdata.txt @@ -125,6 +125,131 @@ Below are links to the project pages for each of the dependencies: == Enlightenment DR 0.20.6 Release == + * anchor: #20160309094239 + * head: Enlightenment DR 0.20.6 Release + * subtitle: is this thing on? + * link: /news/allnewsdata#20160309094239 + * start: 2016-03-09 + * stop: + * text: +This bugfix release improves on the 0.20.5 release and resolves a number of issues. +**Note:** Wayland >= 1.10 is now required. + +=Changes= +Carsten @raster Haitzler (2): + e - efm: fix op registry listener add and dont use eina_error + e xkbswitch: don't free layouts that are just pointed to in instances + +Chris @devilhorns Michael (6): + update mailmap addresses + update mailmap addresses + add prototype functions for missing wl_data_offer interface + add prototype function for missing wl_seat interface + add prototype functions for missing wl_data_source interface + don't have to hook the ecore_evas resize callback here as that should be handled by elm now + +Derek @ManMower Foreman (20): + Ensure wayland clients haven't been deleted when processing callbacks + Remove wayland frame callbacks from subsurface cache on destruction + Fix xdg-shell destructors + Protect the wayland frame callback list from corruption + Use eina_list_merge instead of eina_list_move for wayland lists + Move pixmap free to client free from client destroy + Bump wayland version requirement + Remove wayland focus timer in delete callback + Add a NULL check in native_surface_init under wayland + Render deleted objects as long as they still have a pixmap + Track whether objects are on the post_updates list or not + Take an extra reference on wayland clients + Don't allow deleted wayland clients to set the cursor + Track whether a render is in progress or not + Rework wayland buffer handling + Remove wayland buffer reference + Re-enable window close animations for wayland + Stop copying all wayland buffers + Don't use e_pixmap_image_data_argb_convert for wayland images + Remove argb_convert for wayland buffers + +Mike @zmike Blumenkrantz (42): + clamp minimum shelf size to 20px in shelf config + do not perform special case position adjustment for re_manage clients + do not clamp comp object input regions to 0,0 + improve enforcement of shelf autohide-related window adjustment + reshuffle x11 comp init to cleanup on failure cases + pre-remove pixmap from x11 clients during del hook + enable comp object image data refresh if a dirty call is made with no damages + redo wayland pixmap ids to use monotonic decreasing ints with no collisions + remove some unused variables + make bgpreview create vdesk config dialog on mouse up instead of mouse down + do not decrement e_comp->new_clients for non-new clients during _e_client_eval + update winlist ui when using directional window selection + force changed when adding or removing keyboard layouts in config + disable emotion_shutdown during shutdown procedure + use strbufs instead of strcat in fwin navbars + do not set XCURSOR_PATH variable if re-setting existing value + remove security hole in e_start_main + remove DISPLAY usage from E_IPC_SOCKET value + remove multihead env var setting in e_exec + strcpy -> strncpy in evry files plugin + use strbuf instead of strcat in keybinding string synthesis + use strbuf instead of strcat in edgebinding string synthesis + use dblequal for double comparisons in edgebindings config + replace static buffer usage with binbuf in e_fm_ipc + prevent potential null deref during pager (plain) window drag + remove unused value in config profile saving + remove useless client_add handler in e_ipc + use uint instead of int for eina_list_count() return in cpufreq (trivial) + simplify static grab case statements + remove ipc command allowing arbitrary command execution by the compositor + simplify ipc socket creation + remove impossible null check in color dialog + do not add render updates during damage of deleted clients + don't directly use image data when creating a comp object mirror + Revert "send m
[EGIT] [core/efl] master 04/05: edje_cc: fix inheriting script from other group
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=4a63c917aa6a2da459a6a5da494227f18dfc46c7
commit 4a63c917aa6a2da459a6a5da494227f18dfc46c7
Author: Jee-Yong Um
Date: Fri Mar 18 13:30:55 2016 +0900
edje_cc: fix inheriting script from other group
Summary:
If a group inherits from the other, group script block is copied
only when there are program script blocks in parent group.
This patch makes edje_cc always copies group script block,
but allows to override group script block in child group.
The content of reverted D3799 is included. That reveals this inconsistency.
Reviewers: cedric
Subscribers: Jaehyun_Cho, woohyun, jpeg
Differential Revision: https://phab.enlightenment.org/D3802
---
src/bin/edje/edje_cc_handlers.c | 26 +++---
1 file changed, 19 insertions(+), 7 deletions(-)
diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c
index 8fb43cf..edc3542 100644
--- a/src/bin/edje/edje_cc_handlers.c
+++ b/src/bin/edje/edje_cc_handlers.c
@@ -163,6 +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;
static Edje_Program *sequencing = NULL;
static Eina_List *sequencing_lookups = NULL;
@@ -3874,8 +3875,8 @@ ob_collections_group(void)
current_part = NULL;
current_desc = NULL;
-
current_group_inherit = EINA_FALSE;
+ script_override = EINA_FALSE;
current_de = mem_alloc(SZ(Edje_Part_Collection_Directory_Entry));
current_de->id = eina_list_count(edje_collections);
@@ -4438,6 +4439,11 @@ 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);
+ script_override = EINA_TRUE;
+
EINA_LIST_FOREACH(cd2->programs, l, cp2)
{
cp = mem_alloc(SZ(Code_Program));
@@ -4446,9 +4452,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));
}
@@ -4785,9 +4788,18 @@ ob_collections_group_script(void)
cd->l2 = get_verbatim_line2();
if (cd->shared)
{
- ERR("parse error %s:%i. There is already an existing script
section for the group",
- file_in, line - 1);
- exit(-1);
+ if (script_override)
+{
+ free(cd->shared);
+ free(cd->original);
+ script_override = EINA_FALSE;
+}
+ else
+{
+ ERR("parse error %s:%i. There is already an existing
script section for the group",
+ file_in, line - 1);
+ exit(-1);
+}
}
cd->shared = s;
cd->original = strdup(s);
--
[EGIT] [tools/eflete] master 14/34: property_group: show and update program's action as label only
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=4e899e2009dd0d4ba05a20750b08b078ca4660e5
commit 4e899e2009dd0d4ba05a20750b08b078ca4660e5
Author: Vitalii Vorobiov
Date: Tue Mar 15 19:21:57 2016 +0200
property_group: show and update program's action as label only
Fixes T3224
---
src/bin/ui/property_group.c | 123
1 file changed, 22 insertions(+), 101 deletions(-)
diff --git a/src/bin/ui/property_group.c b/src/bin/ui/property_group.c
index 39e639f..daef912 100644
--- a/src/bin/ui/property_group.c
+++ b/src/bin/ui/property_group.c
@@ -310,15 +310,15 @@ static const char *edje_box_layouts[] = {
N_("horizontal"),
// N_("Custom Layout"), not
implemented yet
NULL};
static const char *
-edje_program_actions[] = { N_("None"),
- N_("state set"),
- N_("signal emit"),
- N_("drag value"),
- N_("drag value step"),
- N_("drag value page"),
- N_("play sample"),
- N_("play tone"),
- N_("action stop"),
+edje_program_actions[] = { N_("NONE"),
+ N_("STATE SET"),
+ N_("SIGNAL EMIT"),
+ N_("DRAG VALUE SET"),
+ N_("DRAG VALUE STEP"),
+ N_("DRAG VALUE PAGE"),
+ N_("PLAY SAMPLE"),
+ N_("PLAY TONE"),
+ N_("ACTION STOP"),
NULL};
static const char *
@@ -569,6 +569,7 @@ prop_item_label_add(Evas_Object *parent,
return item;
}
+#define prop_program_action_add(PARENT, NAME, TEXT)
prop_item_label_add(PARENT, &pd->attributes.program.action, NAME, TEXT)
#define prop_part_type_add(PARENT, NAME, TEXT) prop_item_label_add(PARENT,
&pd->attributes.part.type, NAME, TEXT)
#define prop_state_state_add(PARENT, NAME, TEXT) prop_item_label_add(PARENT,
&pd->attributes.state.state, NAME, TEXT)
#define prop_part_item_name_add(PARENT, NAME, TEXT)
prop_item_label_add(PARENT, &pd->attributes.part_item.name, NAME, TEXT)
@@ -577,7 +578,6 @@ prop_item_label_add(Evas_Object *parent,
#define prop_state_state_update(TEXT)
elm_object_text_set(pd->attributes.state.state, TEXT)
#define prop_part_item_name_update(TEXT)
elm_object_text_set(pd->attributes.part_item.name, TEXT)
-
static void
_on_part_selected(void *data,
Evas_Object *obj __UNUSED__,
@@ -1860,117 +1860,38 @@ prop_program_action_update(Group_Prop_Data *pd)
switch (type)
{
case EDJE_ACTION_TYPE_NONE:
- ewe_combobox_select_item_set(pd->attributes.program.action, 0);
- _program_action_param_set(pd, EDJE_ACTION_TYPE_NONE);
+ elm_object_text_set(pd->attributes.program.action,
edje_program_actions[0]);
break;
case EDJE_ACTION_TYPE_STATE_SET:
- ewe_combobox_select_item_set(pd->attributes.program.action, 1);
- _program_action_param_set(pd, EDJE_ACTION_TYPE_STATE_SET);
+ elm_object_text_set(pd->attributes.program.action,
edje_program_actions[1]);
break;
case EDJE_ACTION_TYPE_SIGNAL_EMIT:
- ewe_combobox_select_item_set(pd->attributes.program.action, 2);
- _program_action_param_set(pd, EDJE_ACTION_TYPE_SIGNAL_EMIT);
+ elm_object_text_set(pd->attributes.program.action,
edje_program_actions[2]);
break;
case EDJE_ACTION_TYPE_DRAG_VAL_SET:
- ewe_combobox_select_item_set(pd->attributes.program.action, 3);
- _program_action_param_set(pd, EDJE_ACTION_TYPE_DRAG_VAL_SET);
+ elm_object_text_set(pd->attributes.program.action,
edje_program_actions[3]);
break;
case EDJE_ACTION_TYPE_DRAG_VAL_STEP:
- ewe_combobox_select_item_set(pd->attributes.program.action, 4);
- _program_action_param_set(pd, EDJE_ACTION_TYPE_DRAG_VAL_STEP);
+ elm_object_text_set(pd->attributes.program.action,
edje_program_actions[4]);
break;
case EDJE_ACTION_TYPE_DRAG_VAL_PAGE:
- ewe_combobox_select_item_set(pd->attributes.program.action, 5);
- _program_action_param_set(pd, EDJE_ACTION_TYPE_DRAG_VAL_PAGE);
+ elm_object_text_set(pd->attributes.program.action,
edje_program_actions[5]);
break;
case EDJE_ACTION_TYPE_SOUND_SAMPLE:
- ewe_combobox_select_item_set(pd->attributes.program.action, 6);
- _program_action_param_set(pd, EDJE_ACTION_TYPE_SOUND_SAMPLE);
+ elm_object_text_set(pd->attributes.program.action,
edje_program_actions[6]);
break;
case EDJE_ACTION_TYPE_SOUND_TONE:
- ewe_combobox_select_item_set(pd->attributes.program.action, 7);
- _program_action_param_set
[EGIT] [tools/eflete] master 34/34: demo_group: program deletion should be repeated for demo's list of signals
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=6a92cafbec67eb077226122f844a146bee8b21ab
commit 6a92cafbec67eb077226122f844a146bee8b21ab
Author: Vitalii Vorobiov
Date: Thu Mar 17 13:47:06 2016 +0200
demo_group: program deletion should be repeated for demo's list of signals
---
src/bin/ui/workspace/demo_group.c | 55 +++
src/bin/ui/workspace/demo_group.h | 6 +
src/bin/ui/workspace/workspace.c | 1 +
3 files changed, 62 insertions(+)
diff --git a/src/bin/ui/workspace/demo_group.c
b/src/bin/ui/workspace/demo_group.c
index 6e0b47d..7b7f543 100644
--- a/src/bin/ui/workspace/demo_group.c
+++ b/src/bin/ui/workspace/demo_group.c
@@ -521,6 +521,36 @@ demo_group_part_add(Evas_Object *demo, Part *part)
}
static void
+_program_item_del(Elm_Object_Item *pl, Demo_Signal *part)
+{
+ Elm_Object_Item *part_item;
+ const Eina_List *part_items;
+ Demo_Signal *pr;
+
+ assert(pl != NULL);
+ assert(part != NULL);
+
+ if (!elm_genlist_item_expanded_get(pl)) return;
+
+ part_items = elm_genlist_item_subitems_get(pl);
+
+ part_item = eina_list_data_get(part_items);
+ pr = elm_object_item_data_get(part_item);
+ while (pr->prog_name != part->prog_name)
+ {
+part_items = eina_list_next(part_items);
+part_item = eina_list_data_get(part_items);
+pr = elm_object_item_data_get(part_item);
+
+assert(pr != NULL);
+ }
+ assert(part_item != NULL);
+
+ elm_object_item_del(part_item);
+ elm_genlist_item_update(pl);
+ return;
+}
+static void
_part_item_del(Elm_Object_Item *pl, Demo_Part *part)
{
Elm_Object_Item *part_item;
@@ -594,6 +624,31 @@ demo_group_part_del(Evas_Object *demo, Part *part)
}
void
+demo_group_program_del(Evas_Object *demo, Eina_Stringshare *program_name)
+{
+ Part_Demo_List *pl = evas_object_data_get(demo, DEMO_GROUP_DATA);
+ Demo_Signal *demo_sig;
+ Eina_List *l;
+
+ assert(pl);
+ assert(program_name != NULL);
+
+ EINA_LIST_FOREACH(pl->signal_list, l, demo_sig)
+ {
+if (demo_sig->prog_name == program_name)
+ {
+ pl->signal_list = eina_list_remove(pl->signal_list, demo_sig);
+ _program_item_del(pl->it_signal, demo_sig);
+ eina_stringshare_del(demo_sig->prog_name);
+ eina_stringshare_del(demo_sig->sig_name);
+ eina_stringshare_del(demo_sig->source_name);
+ free(demo_sig);
+ return;
+ }
+ }
+}
+
+void
demo_group_demo_update(Evas_Object *demo)
{
Part_Demo_List *pl = evas_object_data_get(demo, DEMO_GROUP_DATA);
diff --git a/src/bin/ui/workspace/demo_group.h
b/src/bin/ui/workspace/demo_group.h
index 84720d4..d9a120f 100644
--- a/src/bin/ui/workspace/demo_group.h
+++ b/src/bin/ui/workspace/demo_group.h
@@ -117,6 +117,12 @@ demo_group_part_del(Evas_Object *demo, Part *part);
* @ingroup DemoGroup
*/
void
+demo_group_program_del(Evas_Object *demo, Eina_Stringshare *program_name);
+
+/**
+ * @ingroup DemoGroup
+ */
+void
demo_group_demo_update(Evas_Object *demo);
#endif /* DEMO_GROUP_H */
diff --git a/src/bin/ui/workspace/workspace.c b/src/bin/ui/workspace/workspace.c
index 1398b3a..2b41953 100644
--- a/src/bin/ui/workspace/workspace.c
+++ b/src/bin/ui/workspace/workspace.c
@@ -1070,4 +1070,5 @@ workspace_program_del(Evas_Object *obj, Eina_Stringshare
*program_name)
gm_program_del(ap.project, wd->group, program_name);
group_navigator_program_del(wd->group_navi, program_name);
+ demo_group_program_del(wd->demo_navi, program_name);
}
--
[EGIT] [core/elementary] master 01/01: docs: bring back docs from eo files by switching to the new group name
stefan pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=2111b676fc0f3399e4cf81e53b69799c24771469
commit 2111b676fc0f3399e4cf81e53b69799c24771469
Author: Stefan Schmidt
Date: Wed Mar 16 21:52:09 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.
This did not only affect the widget but also our container. Infrastructure
is
up next. Hopefully that will be the last change.
@fix
Ref T3109
---
doc/index.doxy | 20 ++---
src/lib/elc_naviframe.h| 4 +--
src/lib/elc_naviframe_common.h | 2 +-
src/lib/elc_naviframe_eo.h | 2 +-
src/lib/elm_box.h | 2 +-
src/lib/elm_box_common.h | 2 +-
src/lib/elm_box_legacy.h | 2 +-
src/lib/elm_conform.h | 4 +--
src/lib/elm_conform_eo.h | 2 +-
src/lib/elm_conform_legacy.h | 2 +-
src/lib/elm_deprecated.h | 14 -
src/lib/elm_gengrid.h | 4 +--
src/lib/elm_gengrid_common.h | 38 -
src/lib/elm_gengrid_eo.h | 2 +-
src/lib/elm_gengrid_legacy.h | 10 +++
src/lib/elm_genlist.h | 4 +--
src/lib/elm_genlist_common.h | 32 ++---
src/lib/elm_genlist_eo.h | 2 +-
src/lib/elm_genlist_legacy.h | 2 +-
src/lib/elm_grid.h | 2 +-
src/lib/elm_grid_eo.h | 2 +-
src/lib/elm_grid_legacy.h | 6 ++--
src/lib/elm_layout.h | 2 +-
src/lib/elm_layout_common.h| 2 +-
src/lib/elm_layout_eo.h| 2 +-
src/lib/elm_layout_legacy.h| 14 -
src/lib/elm_panes.h| 4 +--
src/lib/elm_panes_legacy.h | 2 +-
src/lib/elm_removed.h | 28 +-
src/lib/elm_scroller.h | 2 +-
src/lib/elm_scroller_eo.h | 2 +-
src/lib/elm_scroller_legacy.h | 64 +-
src/lib/elm_table.h| 2 +-
src/lib/elm_table_legacy.h | 6 ++--
34 files changed, 145 insertions(+), 145 deletions(-)
diff --git a/doc/index.doxy b/doc/index.doxy
index 41fa963..eb197a3 100644
--- a/doc/index.doxy
+++ b/doc/index.doxy
@@ -254,49 +254,49 @@
* it provides a number of containers. It's important to note that as
containers
* widgets don't have their own visual identity, so here we show one use for
* them and a diagram showing their component parts:
- * @li @ref Gengrid
+ * @li @ref Elm_Gengrid
*
* @image html img/widget/gengrid/preview-00.png
* @image latex img/widget/gengrid/preview-00.eps
- * @li @ref Genlist
+ * @li @ref Elm_Genlist
*
* @image html img/widget/genlist/preview-00.png
* @image latex img/widget/genlist/preview-00.eps
* @image html img/genlist.png
* @image latex img/genlist.eps
- * @li @ref Box
+ * @li @ref Elm_Box
*
* @image html img/widget/box/preview-00.png
* @image latex img/widget/box/preview-00.eps
* @image html img/box.png
* @image latex img/box.eps
- * @li @ref Conformant
+ * @li @ref Elm_Conformant
*
* @image html img/widget/conformant/preview-00.png
* @image latex img/widget/conformant/preview-00.eps
* @image html img/conformant.png
* @image latex img/conformant.eps
- * @li @ref Grid
- * @li @ref Layout
+ * @li @ref Elm_Grid
+ * @li @ref Elm_Layout
*
* @image html img/widget/layout/preview-00.png
* @image latex img/widget/layout/preview-00.eps
* @image html img/layout-predefined.png
* @image latex img/layout-predefined.eps
*
- * @li @ref Naviframe
+ * @li @ref Elm_Naviframe
*
- * @li @ref Panes
+ * @li @ref Elm_Panes
*
* @image html img/widget/panes/preview-00.png
* @image latex img/widget/panes/preview-00.eps
* @image html img/panes.png
* @image latex img/panes.eps
- * @li @ref Scroller
+ * @li @ref Elm_Scroller
*
* @image html img/widget/scroller/preview-00.png
* @image latex img/widget/scroller/preview-00.eps
- * @li @ref Table
+ * @li @ref Elm_Table
*
* @image html img/widget/table/preview-00.png
* @image latex img/widget/table/preview-00.eps
diff --git a/src/lib/elc_naviframe.h b/src/lib/elc_naviframe.h
index f4c4a27..d99c842 100644
--- a/src/lib/elc_naviframe.h
+++ b/src/lib/elc_naviframe.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Naviframe Naviframe
+ * @defgroup Elm_Naviframe Naviframe
* @ingroup Elementary
*
* @image html naviframe_inheritance_tree.png
@@ -85,7 +85,7 @@
*/
/**
- * @addtogroup Naviframe
+ * @addtogroup Elm_Naviframe
* @{
*/
diff --git a/src/lib/elc_naviframe_common.h b/src/lib/elc_naviframe_common.h
index 01b87c5..525f995 100644
--- a/src/lib/elc_naviframe_common.h
+++ b/src/lib/elc_naviframe_common.h
@@ -17,7 +17,7 @@ typedef Ein
[EGIT] [tools/eflete] master 33/34: UTC: remove the workspace tests
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=cea7fbac4879faf4e9e9ea8522c498309440f590
commit cea7fbac4879faf4e9e9ea8522c498309440f590
Author: Vyacheslav Reutskiy
Date: Thu Mar 17 16:03:48 2016 +0200
UTC: remove the workspace tests
Change-Id: Ifc0cbc50c8704b411b696d2fe1dc5f9b9c9dea9e
---
tests/Makefile.am | 26 --
tests/test_ui_workspace/test_ui_workspace.c| 58
tests/test_ui_workspace/test_ui_workspace.h| 46
tests/test_ui_workspace/workspace_add.c| 73 -
.../workspace_edit_object_part_item_add.c | 300 -
.../workspace_edit_object_part_item_del.c | 224 ---
.../workspace_edit_object_part_state_set.c | 110
.../workspace_edit_object_recalc.c | 96 ---
.../workspace_highlight_align_visible_get.c| 156 ---
.../workspace_highlight_align_visible_set.c| 154 ---
.../workspace_object_area_visible_get.c| 156 ---
.../workspace_object_area_visible_set.c| 154 ---
.../workspace_separate_mode_get.c | 154 ---
.../workspace_separate_mode_set.c | 153 ---
.../test_ui_workspace/workspace_zoom_factor_get.c | 95 ---
.../test_ui_workspace/workspace_zoom_factor_set.c | 84 --
16 files changed, 2039 deletions(-)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 007d0d5..5cfaece 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -15,7 +15,6 @@ logger_test \
project_manager_test \
config_test \
cursor_test \
-ui_workspace_test \
colorselector_test \
shortcuts_test
@@ -39,7 +38,6 @@ FLAGS = \
-I${top_srcdir}/src/bin/ui/editors \
-I${top_srcdir}/src/bin/ui/notification \
-I${top_srcdir}/src/bin/ui/preference \
--I${top_srcdir}/src/bin/ui/workspace \
-I${top_srcdir}/src/bin/ui/live_view \
-I${top_srcdir}/src/bin/ui/live_view/elementary \
-I${top_srcdir}/src/bin/ui/shortcuts \
@@ -72,7 +70,6 @@ include_HEADERS = \
../tests/test_project_manager/test_project_manager.h \
../tests/test_config/test_config.h \
../tests/test_cursor/test_cursor.h \
- ../tests/test_ui_workspace/test_ui_workspace.h \
../tests/test_live_widget/test_live_widget.h \
../tests/test_shortcuts/test_shortcuts.h \
../tests/test_colorselector/test_colorselector.h
@@ -219,29 +216,6 @@ cursor_test_SOURCES = \
cursor_test_CFLAGS = ${FLAGS}
cursor_test_LDADD = ${LD}
-#preference_test_SOURCES = \
-#../tests/test_preference/test_preference.c \
-#../tests/test_preference/preference_add.c \
-#../tests/test_preference/preferences_project_autosave_update.c
-#preference_test_CFLAGS = ${FLAGS}
-#preference_test_LDADD = ${LD}
-
-ui_workspace_test_SOURCES = \
-../tests/test_ui_workspace/test_ui_workspace.c \
-../tests/test_ui_workspace/workspace_add.c \
-../tests/test_ui_workspace/workspace_edit_object_part_state_set.c \
-../tests/test_ui_workspace/workspace_edit_object_recalc.c \
-../tests/test_ui_workspace/workspace_zoom_factor_get.c \
-../tests/test_ui_workspace/workspace_zoom_factor_set.c \
-../tests/test_ui_workspace/workspace_separate_mode_set.c \
-../tests/test_ui_workspace/workspace_separate_mode_get.c \
-../tests/test_ui_workspace/workspace_highlight_align_visible_get.c \
-../tests/test_ui_workspace/workspace_highlight_align_visible_set.c \
-../tests/test_ui_workspace/workspace_object_area_visible_get.c \
-../tests/test_ui_workspace/workspace_object_area_visible_set.c
-ui_workspace_test_CFLAGS = ${FLAGS}
-ui_workspace_test_LDADD = ${LD}
-
live_widget_test_SOURCES = \
../tests/test_live_widget/test_live_widget.c \
../tests/test_live_widget/live_widget_create.c \
diff --git a/tests/test_ui_workspace/test_ui_workspace.c
b/tests/test_ui_workspace/test_ui_workspace.c
deleted file mode 100644
index a6b4bd4..000
--- a/tests/test_ui_workspace/test_ui_workspace.c
+++ /dev/null
@@ -1,58 +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_ui_workspace.h"
-
-Suite* test_suite (void) {
- Suite *suite = suite_create("ui_workspace_test");
- TCase *tcase = tcase_create("TCase");
-
- tcase_add_test(tcase, workspace_add_test_p);
[EGIT] [tools/eflete] master 01/34: sound_property: changing according to the renaming of the eo_add() current
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=6289348fd8b26e90e9e316c6fdc4737a617dec28 commit 6289348fd8b26e90e9e316c6fdc4737a617dec28 Author: Vyacheslav Reutskiy Date: Wed Mar 16 08:05:36 2016 +0200 sound_property: changing according to the renaming of the eo_add() current Follow the white rabbit. Change-Id: I497f66c627176814dda937ae9bbfefc116b9aae1 --- src/bin/ui/property_sound.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/ui/property_sound.c b/src/bin/ui/property_sound.c index 5255d5f..f8c0324 100644 --- a/src/bin/ui/property_sound.c +++ b/src/bin/ui/property_sound.c @@ -305,7 +305,7 @@ _tone_play(Sound_Prop_Data *edit) if (!edit->io.out) edit->io.out = eo_add(ECORE_AUDIO_OUT_PULSE_CLASS, NULL, - eo_event_callback_add(eoid, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, + eo_event_callback_add(eo_self, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, _out_fail, NULL)); ret = ecore_audio_obj_out_input_attach(edit->io.out, edit->io.in); --
[EGIT] [core/enlightenment] master 02/02: disable wizard mouse binding page's next button if all modifiers are disabled
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=7c054f272bc4a193bf241ffa0cd593e08ee94922 commit 7c054f272bc4a193bf241ffa0cd593e08ee94922 Author: Mike Blumenkrantz Date: Wed Mar 16 14:33:06 2016 -0400 disable wizard mouse binding page's next button if all modifiers are disabled this breaks the user experience! --- src/modules/wizard/page_065.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/modules/wizard/page_065.c b/src/modules/wizard/page_065.c index 88bf7ad..c279a3c 100644 --- a/src/modules/wizard/page_065.c +++ b/src/modules/wizard/page_065.c @@ -38,6 +38,8 @@ modifiers_changed(void *data, Evas_Object *obj, void *event_info EINA_UNUSED) binding |= (1 << i); if (binding == current) return; current = binding; + e_wizard_button_next_enable_set(!!current); + if (!current) return; EINA_LIST_FOREACH(e_bindings->mouse_bindings, l, ebm) if (eina_streq(ebm->action, "window_move") || eina_streq(ebm->action, "window_resize") || --
[EGIT] [tools/eflete] master 20/34: string_common: fix font regex
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=0087912627bb692d73591f53c3a321dc931a6170
commit 0087912627bb692d73591f53c3a321dc931a6170
Author: Andrii Kroitor
Date: Wed Mar 16 15:50:37 2016 +0200
string_common: fix font regex
Fixes T3249
---
src/bin/common/string_common.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bin/common/string_common.h b/src/bin/common/string_common.h
index cf36f70..882867f 100644
--- a/src/bin/common/string_common.h
+++ b/src/bin/common/string_common.h
@@ -35,7 +35,7 @@
#define NAME_REGEX "^[a-zA-Z0-9_]+$"
#define STATE_VALUE_REGEX "^((0?(\\.[0-9]+)?|1(\\.0+)?))?$"
#define PART_NAME_REGEX "^[a-zA-Z0-9_\\.]+$"
-#define FONT_STYLE_REGEX "^(\\w|
)+(:(style|slant|weight|width|spacing|lang)=\\w+)?$"
+#define FONT_STYLE_REGEX "^((\\w|[-
])+(:(style|slant|weight|width|spacing|lang)=\\w+)?)?$"
#define IMAGE_BORDER_REGEX "^([0-9]+( [0-9]+){3}){0,1}?$"
#define FREQUENCY_REGEX "^\\b([2-9][0-9]|[1-9][0-9]{2,3}|1[0-9]{4}|2)\\b$"
--
[EGIT] [core/enlightenment] master 01/02: use zone geometry when clamping evry gadget popup to gadget's screen
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=1c3b45e9843f1a405225658c2ecfd694a00851d0 commit 1c3b45e9843f1a405225658c2ecfd694a00851d0 Author: Mike Blumenkrantz Date: Fri Mar 18 13:47:00 2016 -0400 use zone geometry when clamping evry gadget popup to gadget's screen fix T3238 --- src/modules/everything/evry_gadget.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/everything/evry_gadget.c b/src/modules/everything/evry_gadget.c index 7c00f83..a59e5b3 100644 --- a/src/modules/everything/evry_gadget.c +++ b/src/modules/everything/evry_gadget.c @@ -336,10 +336,10 @@ _gadget_popup_show(Instance *inst) break; } - if (px + pw > inst->win->zone->w) + if (px + pw > inst->win->zone->x + inst->win->zone->w) x = inst->win->zone->w - pw; - if (py + ph > inst->win->zone->h) + if (py + ph > inst->win->zone->y + inst->win->zone->h) y = inst->win->zone->h - ph; evas_object_move(ewin, x, y); --
[EGIT] [tools/eflete] master 17/34: image_manager: remove unnecessary thumb reload
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=5aeb2dc46b8db652b9295ba6176ea6c01c040d63 commit 5aeb2dc46b8db652b9295ba6176ea6c01c040d63 Author: Andrii Kroitor Date: Wed Mar 16 14:36:47 2016 +0200 image_manager: remove unnecessary thumb reload --- src/bin/ui/image_manager.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/bin/ui/image_manager.c b/src/bin/ui/image_manager.c index 8460049..2d2f583 100644 --- a/src/bin/ui/image_manager.c +++ b/src/bin/ui/image_manager.c @@ -155,7 +155,6 @@ _grid_content_get(void *data, image_obj = elm_thumb_add(grid); elm_object_style_set(image_obj, "noframe"); _image_manager_image_setup(image_obj, it); -elm_thumb_reload(image_obj); evas_object_show(image_obj); /* functions for deferred creation of gengrid icons */ //ecore_job_add(_image_content_setup, image_init_data); --
[EGIT] [tools/eflete] master 01/02: demo_group: change icon for "start program" button
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=68bac7ed30fafc5b0932eb51850d92407fafdb10
commit 68bac7ed30fafc5b0932eb51850d92407fafdb10
Author: Vitalii Vorobiov
Date: Fri Mar 18 13:17:55 2016 +0200
demo_group: change icon for "start program" button
---
src/bin/ui/workspace/demo_group.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bin/ui/workspace/demo_group.c
b/src/bin/ui/workspace/demo_group.c
index 4edbae6..cbb6529 100644
--- a/src/bin/ui/workspace/demo_group.c
+++ b/src/bin/ui/workspace/demo_group.c
@@ -216,7 +216,7 @@ _content_get(void *data __UNUSED__,
if (!strcmp(part, "elm.swallow.end"))
{
BUTTON_ADD(obj, button, NULL);
-ICON_STANDARD_ADD(button, ic, false, "impuls_in");
+ICON_STANDARD_ADD(button, ic, false, "media_player/play");
elm_object_part_content_set(button, NULL, ic);
evas_object_smart_callback_add(button, "clicked", _clicked_cb, data);
}
--
[EGIT] [core/enlightenment] master 02/05: always update saved coords for maximized/fullscreen clients on csd geom update
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=959366076c965854de7aab38d6234a9addc27d70
commit 959366076c965854de7aab38d6234a9addc27d70
Author: Mike Blumenkrantz
Date: Thu Mar 17 13:34:24 2016 -0400
always update saved coords for maximized/fullscreen clients on csd geom
update
this was causing clients to position themselves wrongly in some cases after
removing the related states
---
src/bin/e_comp_object.c | 9 +++--
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index d252e6f..dd88bf2 100644
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -3041,12 +3041,9 @@ e_comp_object_frame_geometry_set(Evas_Object *obj, int
l, int r, int t, int b)
}
else if (cw->ec->maximized || cw->ec->fullscreen)
{
-if (e_client_has_xwindow(cw->ec))
- {
- cw->ec->saved.x += l - cw->client_inset.l;
- cw->ec->saved.y += t - cw->client_inset.t;
- }
-else
+cw->ec->saved.x += l - cw->client_inset.l;
+cw->ec->saved.y += t - cw->client_inset.t;
+if (!e_client_has_xwindow(cw->ec))
{
cw->ec->saved.w -= ((l + r) - (cw->client_inset.l +
cw->client_inset.r));
cw->ec->saved.h -= ((t + b) - (cw->client_inset.t +
cw->client_inset.b));
--
[EGIT] [core/enlightenment] master 01/05: unify maximize animation checks+code
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=39ce6e2d492bbf50e29ffaf5e2c3ec90f5a6f416
commit 39ce6e2d492bbf50e29ffaf5e2c3ec90f5a6f416
Author: Mike Blumenkrantz
Date: Wed Mar 16 17:28:45 2016 -0400
unify maximize animation checks+code
---
src/bin/e_client.c | 34 ++
1 file changed, 14 insertions(+), 20 deletions(-)
diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index bd98bdf..c7e270d 100644
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -1552,6 +1552,16 @@ _e_client_maximize_done(void *data, E_Efx_Map_Data *emd
EINA_UNUSED, Evas_Object
}
static void
+_e_client_maximize_run(E_Client *ec, int x, int y, int w, int h)
+{
+ if (e_config->window_maximize_animate && (!starting) &&
(!ec->changes.need_maximize))
+ e_efx_resize(ec->frame, e_config->window_maximize_transition,
E_EFX_POINT(x, y),
+ w, h, e_config->window_maximize_time, _e_client_maximize_done, ec);
+ else
+ evas_object_geometry_set(ec->frame, x, y, w, h);
+}
+
+static void
_e_client_maximize(E_Client *ec, E_Maximize max)
{
int x1, yy1, x2, y2;
@@ -1603,11 +1613,7 @@ _e_client_maximize(E_Client *ec, E_Maximize max)
x = x1, y = ec->zone->y, w /= 2;
break;
}
-if (e_config->window_maximize_animate && (!starting) &&
(!ec->changes.need_maximize))
- e_efx_resize(ec->frame, e_config->window_maximize_transition,
E_EFX_POINT(x, y),
-w, h, e_config->window_maximize_time, _e_client_maximize_done, ec);
-else
- evas_object_geometry_set(ec->frame, x, y, w, h);
+_e_client_maximize_run(ec, x, y, w, h);
break;
case E_MAXIMIZE_SMART:
@@ -1673,11 +1679,7 @@ _e_client_maximize(E_Client *ec, E_Maximize max)
x = zx + zw / 2, y = zy, w = zw / 2, h = zh;
break;
}
-if (e_config->window_maximize_animate && (!starting) &&
(!ec->changes.need_maximize))
- e_efx_resize(ec->frame, e_config->window_maximize_transition,
E_EFX_POINT(x, y),
-w, h, e_config->window_maximize_time, _e_client_maximize_done, ec);
-else
- evas_object_geometry_set(ec->frame, x, y, w, h);
+_e_client_maximize_run(ec, x, y, w, h);
break;
case E_MAXIMIZE_FILL:
@@ -1724,11 +1726,7 @@ _e_client_maximize(E_Client *ec, E_Maximize max)
x = x1, y = ec->zone->y, w /= 2;
break;
}
-if (e_config->window_maximize_animate && (!starting) &&
(!ec->changes.need_maximize))
- e_efx_resize(ec->frame, e_config->window_maximize_transition,
E_EFX_POINT(x, y),
-w, h, e_config->window_maximize_time, _e_client_maximize_done, ec);
-else
- evas_object_geometry_set(ec->frame, x, y, w, h);
+_e_client_maximize_run(ec, x, y, w, h);
break;
}
if (ec->maximize_override && (starting || ec->changes.need_maximize ||
(!e_config->window_maximize_animate)))
@@ -3899,11 +3897,7 @@ e_client_unmaximize(E_Client *ec, E_Maximize max)
e_client_resize_limit(ec, &w, &h);
e_comp_object_frame_xy_adjust(ec->frame, x, y, &x, &y);
e_comp_object_frame_wh_adjust(ec->frame, w, h, &w, &h);
- if (e_config->window_maximize_animate && (!starting))
- e_efx_resize(ec->frame, e_config->window_maximize_transition,
E_EFX_POINT(x, y),
- w, h, e_config->window_maximize_time,
_e_client_maximize_done, ec);
- else
- evas_object_geometry_set(ec->frame, x, y, w, h);
+ _e_client_maximize_run(ec, x, y, w, h);
if (vert)
ec->saved.h = ec->saved.y = 0;
if (horiz)
--
[EGIT] [core/efl] master 01/03: evas: Fix incorrect expression in efl_canvas_surface_wayland
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=114d010fc122a9cb1ca6a2d5f87691f13950903d
commit 114d010fc122a9cb1ca6a2d5f87691f13950903d
Author: Chris Michael
Date: Wed Mar 16 09:21:08 2016 -0400
evas: Fix incorrect expression in efl_canvas_surface_wayland
This patch fixes an issue detected by Coverity where 'obj' is written
twice with the same value
CID1353365
@fix
Signed-off-by: Chris Michael
---
src/lib/evas/canvas/efl_canvas_surface_wayland.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/lib/evas/canvas/efl_canvas_surface_wayland.c
b/src/lib/evas/canvas/efl_canvas_surface_wayland.c
index 1798107..3b1b358 100644
--- a/src/lib/evas/canvas/efl_canvas_surface_wayland.c
+++ b/src/lib/evas/canvas/efl_canvas_surface_wayland.c
@@ -30,7 +30,9 @@ _efl_canvas_surface_wayland_eo_base_constructor(Eo *eo,
Efl_Canvas_Surface_Wayla
EOLIAN static void
_efl_canvas_surface_wayland_eo_base_destructor(Eo *eo,
Efl_Canvas_Surface_Wayland_Data *pd)
{
- Evas_Object_Protected_Data *obj = obj = eo_data_scope_get(eo,
EVAS_OBJECT_CLASS);
+ Evas_Object_Protected_Data *obj;
+
+ obj = eo_data_scope_get(eo, EVAS_OBJECT_CLASS);
ENFN->image_native_shutdown(ENDT, EVAS_NATIVE_SURFACE_WL);
eo_data_unref(eo, pd->base);
--
[EGIT] [tools/expedite] master 02/02: Remove efl_gfx_filled_set() as eo-created images are filled
jpeg pushed a commit to branch master.
http://git.enlightenment.org/tools/expedite.git/commit/?id=185fe20e881f8f460f8468d939a8cb6a3171283c
commit 185fe20e881f8f460f8468d939a8cb6a3171283c
Author: Jean-Philippe Andre
Date: Fri Mar 18 15:02:37 2016 +0900
Remove efl_gfx_filled_set() as eo-created images are filled
This is a behaviour change between legacy and eo apis.
To be discussed, of course, if someone disagrees.
---
src/bin/widgets_list_1.c | 1 -
src/bin/widgets_list_1_grouped.c | 1 -
src/bin/widgets_list_2.c | 1 -
src/bin/widgets_list_2_grouped.c | 1 -
src/bin/widgets_list_3.c | 2 --
src/bin/widgets_list_3_grouped.c | 2 --
src/bin/widgets_list_4.c | 2 --
src/bin/widgets_list_4_grouped.c | 2 --
8 files changed, 12 deletions(-)
diff --git a/src/bin/widgets_list_1.c b/src/bin/widgets_list_1.c
index 526d888..44351b1 100644
--- a/src/bin/widgets_list_1.c
+++ b/src/bin/widgets_list_1.c
@@ -64,7 +64,6 @@ static void _setup(void)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
-efl_gfx_fill_filled_set(o, 1);
efl_image_border_set(o, 2, 2, 2, 2);
efl_file_set(o, build_path("pan.png"), NULL);
efl_gfx_size_set(o, win_w, ICON_SIZE);
diff --git a/src/bin/widgets_list_1_grouped.c b/src/bin/widgets_list_1_grouped.c
index 1c8ab3c..3aa8296 100644
--- a/src/bin/widgets_list_1_grouped.c
+++ b/src/bin/widgets_list_1_grouped.c
@@ -64,7 +64,6 @@ static void _setup(void)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
-efl_gfx_fill_filled_set(o, 1);
efl_image_border_set(o, 2, 2, 2, 2);
efl_file_set(o, build_path("pan.png"), NULL);
efl_gfx_size_set(o, win_w, ICON_SIZE);
diff --git a/src/bin/widgets_list_2.c b/src/bin/widgets_list_2.c
index 6785d27..f59cbe1 100644
--- a/src/bin/widgets_list_2.c
+++ b/src/bin/widgets_list_2.c
@@ -64,7 +64,6 @@ static void _setup(void)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
-efl_gfx_fill_filled_set(o, 1);
efl_image_border_set(o, 2, 2, 2, 2);
efl_file_set(o, build_path("pan.png"), NULL);
efl_gfx_size_set(o, win_w, ICON_SIZE);
diff --git a/src/bin/widgets_list_2_grouped.c b/src/bin/widgets_list_2_grouped.c
index 1568c3e..ad3d866 100644
--- a/src/bin/widgets_list_2_grouped.c
+++ b/src/bin/widgets_list_2_grouped.c
@@ -64,7 +64,6 @@ static void _setup(void)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
-efl_gfx_fill_filled_set(o, 1);
efl_image_border_set(o, 2, 2, 2, 2);
efl_file_set(o, build_path("pan.png"), NULL);
efl_gfx_size_set(o, win_w, ICON_SIZE);
diff --git a/src/bin/widgets_list_3.c b/src/bin/widgets_list_3.c
index cd388a1..52b6e01 100644
--- a/src/bin/widgets_list_3.c
+++ b/src/bin/widgets_list_3.c
@@ -85,7 +85,6 @@ static void _setup(void)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
-efl_gfx_fill_filled_set(o, 1);
efl_image_border_set(o, 2, 2, 2, 2);
efl_file_set(o, build_path("pan.png"), NULL);
efl_gfx_size_set(o, win_w, ICON_SIZE);
@@ -93,7 +92,6 @@ static void _setup(void)
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_icons[i] = o;
-efl_gfx_fill_filled_set(o, 1);
efl_image_border_set(o, 2, 2, 2, 2);
efl_file_set(o, build_path(icons[i % 13]), NULL);
efl_gfx_size_set(o, ICON_SIZE - 8, ICON_SIZE - 8);
diff --git a/src/bin/widgets_list_3_grouped.c b/src/bin/widgets_list_3_grouped.c
index 7d6eb8b..30bb97f 100644
--- a/src/bin/widgets_list_3_grouped.c
+++ b/src/bin/widgets_list_3_grouped.c
@@ -85,7 +85,6 @@ static void _setup(void)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
-efl_gfx_fill_filled_set(o, 1);
efl_image_border_set(o, 2, 2, 2, 2);
efl_file_set(o, build_path("pan.png"), NULL);
efl_gfx_size_set(o, win_w, ICON_SIZE);
@@ -93,7 +92,6 @@ static void _setup(void)
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_icons[i] = o;
-efl_gfx_fill_filled_set(o, 1);
efl_image_border_set(o, 2, 2, 2, 2);
efl_file_set(o, build_path(icons[i % 13]), NULL);
efl_gfx_size_set(o, ICON_SIZE - 8, ICON_SIZE - 8);
diff --git a/src/bin/widgets_list_4.c b/src/bin/widgets_list_4.c
index 52f2eb4..7eb4672 100644
--- a/src/bin/widgets_list_4.c
+++ b/src/bin/widgets_list_4.c
@@ -85,7 +85,6 @@ static void _setup(void)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
-efl_gfx_fill_filled_set(o, 1);
efl_image_border_set(o, 2, 2, 2, 2);
efl_file_set(o, build_path("pan.png"), NULL);
efl_gfx_size_set(o, win_w, ICON_SIZE);
@@ -93,7 +92,6 @@ static void _setup(void)
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_icons[i] = o;
-efl_gfx_fill_filled_set(o, 1);
efl_image_border_set
[EGIT] [tools/eflete] master 03/04: demo_group: update program list on program changes
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=0277ffe3353be8dcf0bf7de2315b42b814fa003f
commit 0277ffe3353be8dcf0bf7de2315b42b814fa003f
Author: Vitalii Vorobiov
Date: Fri Mar 18 09:27:38 2016 +0200
demo_group: update program list on program changes
add program when source name and signal name is not NULL
on any changes of them, poke demo_group to check if program should be added
into
group
Fixes T3223
---
src/bin/common/signals.h | 8
src/bin/ui/property_group.c | 4 ++
src/bin/ui/workspace/demo_group.c | 79 +++
src/bin/ui/workspace/demo_group.h | 6 +++
4 files changed, 97 insertions(+)
diff --git a/src/bin/common/signals.h b/src/bin/common/signals.h
index a632461..c741554 100644
--- a/src/bin/common/signals.h
+++ b/src/bin/common/signals.h
@@ -217,6 +217,14 @@ typedef struct {
#define SIGNAL_EDITOR_PROGRAM_ADDED "SIGNAL_EDITOR_PROGRAM_ADDED"
/**
+ * emited when program is being changed from property.
+ * eventinfo - stringshare with programs name
+ *
+ * @ingroup Window
+ */
+#define SIGNAL_EDITOR_PROGRAM_UPDATE "SIGNAL_EDITOR_PROGRAM_UPDATE"
+
+/**
* emited *before* program will be deleted in editor.
* eventinfo - stringshare with programs name
*
diff --git a/src/bin/ui/property_group.c b/src/bin/ui/property_group.c
index 99cb1c9..d8897be 100644
--- a/src/bin/ui/property_group.c
+++ b/src/bin/ui/property_group.c
@@ -1013,9 +1013,13 @@ _on_editor_attribute_changed(void *data,
break;
case ATTRIBUTE_PROGRAM_SIGNAL:
prop_program_signal_update(pd);
+ evas_object_smart_callback_call(ap.win, SIGNAL_EDITOR_PROGRAM_UPDATE,
(void *)eina_stringshare_add(pd->attributes.program.program));
+ eina_stringshare_del(pd->attributes.program.program);
break;
case ATTRIBUTE_PROGRAM_SOURCE:
prop_program_source_update(pd);
+ evas_object_smart_callback_call(ap.win, SIGNAL_EDITOR_PROGRAM_UPDATE,
(void *)eina_stringshare_add(pd->attributes.program.program));
+ eina_stringshare_del(pd->attributes.program.program);
break;
case ATTRIBUTE_PROGRAM_ACTION:
prop_program_action_update(pd);
diff --git a/src/bin/ui/workspace/demo_group.c
b/src/bin/ui/workspace/demo_group.c
index 7b7f543..4edbae6 100644
--- a/src/bin/ui/workspace/demo_group.c
+++ b/src/bin/ui/workspace/demo_group.c
@@ -43,6 +43,9 @@ static Elm_Genlist_Item_Class *itc_part;
static Elm_Genlist_Item_Class *itc_part_selected;
static Elm_Genlist_Item_Class *itc_signals;
+static void
+_program_item_del(Elm_Object_Item *pl, Demo_Signal *part);
+
#define CAPTION_GENLIST_ITEM_TEXT_GET(TYPE, TITLE) \
static char * \
_##TYPE##_label_cb(void *data, \
@@ -220,6 +223,79 @@ _content_get(void *data __UNUSED__,
return button;
}
+void
+_program_add(void *data,
+ Evas_Object *obj __UNUSED__,
+ void *ei)
+{
+ Part_Demo_List *pl = data;
+ Demo_Signal *demo_sig, *pr;
+ Eina_Stringshare *sig_name, *source_name;
+ Eina_Stringshare *program_name = ei;
+ Eina_Bool correct = false;
+ Elm_Object_Item *part_item;
+ const Eina_List *part_items;
+
+ assert(pl);
+
+ part_items = elm_genlist_item_subitems_get(pl->it_signal);
+ part_item = eina_list_data_get(part_items);
+ pr = elm_object_item_data_get(part_item);
+
+ /* find program */
+ while ((pr) && (pr->prog_name != program_name))
+ {
+part_items = eina_list_next(part_items);
+part_item = eina_list_data_get(part_items);
+pr = elm_object_item_data_get(part_item);
+ }
+
+ sig_name = edje_edit_program_signal_get(pl->group->edit_object,
program_name);
+ source_name = edje_edit_program_source_get(pl->group->edit_object,
program_name);
+ if (!source_name) source_name = eina_stringshare_add("");
+ if ((sig_name) && (strcmp(sig_name, "drag") != 0) &&
+ (strncmp(sig_name, "mouse", strlen("mouse")) != 0))
+ correct = true;
+
+ /* if program is not exist */
+ if ((!part_item) && (correct))
+ {
+demo_sig = mem_calloc(1, sizeof(Demo_Part));
+demo_sig->prog_name = eina_stringshare_add(program_name);
+demo_sig->sig_name = eina_stringshare_add(sig_name);
+demo_sig->source_name = eina_stringshare_add(source_name);
+pl->signal_list = eina_list_append(pl->signal_list, demo_sig);
+elm_genlist_item_append(pl->genlist,
+itc_signals,
+demo_sig,
+pl->it_signal,
+ELM_GENLIST_ITEM_NONE,
+NULL,
+NULL);
+ }
+ else if ((part_item) && (correct)) /* if program exist and data is correct
*/
+ {
+eina_stringshare_del(pr->prog_name);
+eina_stringshare_del(pr->sig_name);
+eina_stringshare_del(pr->source_name);
+pr->pr
[EGIT] [tools/eflete] master 25/34: ewe_ruler: use Evas_Coord for object geometry
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=3eb88371203d8756afe844434a21190349e91b8b
commit 3eb88371203d8756afe844434a21190349e91b8b
Author: Vyacheslav Reutskiy
Date: Wed Mar 16 15:53:09 2016 +0200
ewe_ruler: use Evas_Coord for object geometry
Change-Id: I2378aa14c6872144bb0639c6fad2d1a27f35e602
---
src/lib/ewe_widget_ruler.h | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/lib/ewe_widget_ruler.h b/src/lib/ewe_widget_ruler.h
index c07bcb9..8b7fd16 100644
--- a/src/lib/ewe_widget_ruler.h
+++ b/src/lib/ewe_widget_ruler.h
@@ -12,10 +12,10 @@ struct _Ewe_Ruler_Smart_Data
Eina_List *scales;
Eina_List *markers;
struct {
- unsigned int width;
- unsigned int height;
- intx;
- inty;
+ Evas_Coord width;
+ Evas_Coord height;
+ Evas_Coord x;
+ Evas_Coord y;
} geometry;
Eina_Bool size_changed : 1;
Eina_Bool position_changed : 1;
--
[EGIT] [tools/eflete] master 08/34: theme: fix description apply warnings
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=49f3f9e96a9be792dcd4dcfa1b87db012dc0361a
commit 49f3f9e96a9be792dcd4dcfa1b87db012dc0361a
Author: Andrii Kroitor
Date: Wed Mar 16 10:11:37 2016 +0200
theme: fix description apply warnings
---
data/themes/default/widgets/entry.edc| 4 ++--
data/themes/default/widgets/popup.edc| 2 +-
data/themes/default/widgets/scroller.edc | 8
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/data/themes/default/widgets/entry.edc
b/data/themes/default/widgets/entry.edc
index b5060b6..22addaa 100644
--- a/data/themes/default/widgets/entry.edc
+++ b/data/themes/default/widgets/entry.edc
@@ -733,7 +733,7 @@ group { name: "elm/scroller/entry/default";
action: STATE_SET "disabled" 0.00;
target: "bg";
target: "shadow";
- target: "focus";
+ //target: "focus";
}
program { name: "validation_pass";
signal: "validation,default,pass";
@@ -1132,7 +1132,7 @@ group { name: "elm/scroller/entry_single/default";
action: STATE_SET "disabled" 0.00;
target: "bg";
target: "shadow";
- target: "focus";
+ //target: "focus";
}
program { name: "validation_pass";
signal: "validation,default,pass";
diff --git a/data/themes/default/widgets/popup.edc
b/data/themes/default/widgets/popup.edc
index a353706..42b7634 100644
--- a/data/themes/default/widgets/popup.edc
+++ b/data/themes/default/widgets/popup.edc
@@ -186,6 +186,7 @@ group { name: "elm/popup/base/default";
}
}
programs {
+ /*
program { name: show_title_text;
signal: "elm,state,title,text,visible";
source: "elm";
@@ -198,7 +199,6 @@ group { name: "elm/popup/base/default";
action: STATE_SET "default" 0.0;
target: "elm.text.title";
}
- /*
program { name: show_title_area;
signal: "elm,state,title_area,visible";
source: "elm";
diff --git a/data/themes/default/widgets/scroller.edc
b/data/themes/default/widgets/scroller.edc
index 35de403..e8991ff 100644
--- a/data/themes/default/widgets/scroller.edc
+++ b/data/themes/default/widgets/scroller.edc
@@ -452,15 +452,15 @@ group { name: "elm/scroller/base/default";
program { name: "v_mouse_down";
signal: "mouse,down,1*";
source: "elm.dragable.vbar";
- action: STATE_SET "clicked" 0.00;
- target: "elm.dragable.vbar";
+ /*action: STATE_SET "clicked" 0.00;
+ target: "elm.dragable.vbar";*/
after: "v_bar_selected";
}
program { name: "h_mouse_down";
signal: "mouse,down,1*";
source: "elm.dragable.hbar";
- action: STATE_SET "clicked" 0.00;
- target: "elm.dragable.hbar";
+ /*action: STATE_SET "clicked" 0.00;
+ target: "elm.dragable.hbar";*/
after: "h_bar_selected";
}
program { name: "horizontal_scroll_down";
--
[EGIT] [core/elementary] master 03/04: Elm_glview: remove elm_glview_size_set.
jypark pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=1f5331c99e6bf9b9c13666be873f91fc7d3445cc
commit 1f5331c99e6bf9b9c13666be873f91fc7d3445cc
Author: Ji-Youn Park
Date: Fri Mar 11 22:52:23 2016 +0830
Elm_glview: remove elm_glview_size_set.
move elm_glview_size_set to legacy wrapper
---
src/lib/elm_glview.c | 33 +++--
src/lib/elm_glview.eo | 22 +++---
2 files changed, 26 insertions(+), 29 deletions(-)
diff --git a/src/lib/elm_glview.c b/src/lib/elm_glview.c
index f3f7c12..87571d4 100644
--- a/src/lib/elm_glview.c
+++ b/src/lib/elm_glview.c
@@ -308,14 +308,6 @@ elm_glview_version_add(Evas_Object *parent,
Evas_GL_Context_Version version)
return obj;
}
-EAPI void
-elm_glview_changed_set(Evas_Object *obj)
-{
- ELM_GLVIEW_CHECK(obj);
-
- elm_glview_draw_request(obj);
-}
-
EOLIAN static void
_elm_glview_version_constructor(Eo *obj, Elm_Glview_Data *sd,
Evas_GL_Context_Version version)
@@ -470,7 +462,7 @@ _elm_glview_render_policy_set(Eo *obj, Elm_Glview_Data *sd,
Elm_GLView_Render_Po
}
EOLIAN static void
-_elm_glview_size_set(Eo *obj, Elm_Glview_Data *sd, int w, int h)
+_elm_glview_efl_gfx_view_view_size_set(Eo *obj, Elm_Glview_Data *sd, int w,
int h)
{
if ((w == sd->w) && (h == sd->h)) return;
@@ -482,7 +474,7 @@ _elm_glview_size_set(Eo *obj, Elm_Glview_Data *sd, int w,
int h)
}
EOLIAN static void
-_elm_glview_size_get(Eo *obj EINA_UNUSED, Elm_Glview_Data *sd, int *w, int *h)
+_elm_glview_efl_gfx_view_view_size_get(Eo *obj EINA_UNUSED, Elm_Glview_Data
*sd, int *w, int *h)
{
if (w) *w = sd->w;
if (h) *h = sd->h;
@@ -545,4 +537,25 @@ _elm_glview_class_constructor(Eo_Class *klass)
evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
}
+/* Legacy wrappers */
+
+EAPI void
+elm_glview_changed_set(Evas_Object *obj)
+{
+ ELM_GLVIEW_CHECK(obj);
+
+ elm_glview_draw_request(obj);
+}
+
+EAPI void
+elm_glview_size_get(const Elm_Glview *obj, int *w, int *h)
+{
+ efl_gfx_view_size_get(obj, w, h);
+}
+
+EAPI void
+elm_glview_size_set(Elm_Glview *obj, int w, int h)
+{
+ efl_gfx_view_size_set(obj, w, h);
+}
#include "elm_glview.eo.c"
diff --git a/src/lib/elm_glview.eo b/src/lib/elm_glview.eo
index 4250dfe..7548a82 100644
--- a/src/lib/elm_glview.eo
+++ b/src/lib/elm_glview.eo
@@ -76,7 +76,7 @@ enum Elm.GLView.Render.Policy
always= 2 [[Render always even when it is not visible]]
}
-class Elm.Glview (Elm.Widget)
+class Elm.Glview (Elm.Widget, Efl.Gfx.View)
{
eo_prefix: elm_obj_glview;
methods {
@@ -87,24 +87,6 @@ class Elm.Glview (Elm.Widget)
@in version: Evas_GL_Context_Version;
}
}
- @property size {
- set {
-[[Sets the size of the glview.]]
- }
- get {
-[[Get the size of the glview.
-
- Note: This function returns the actual image size of the
- glview. This means that when the scale policy is set to
- #ELM_GLVIEW_RESIZE_POLICY_SCALE, it'll return the non-scaled
- size.
-]]
- }
- values {
-w: int; [[Width of the glview object.]]
-h: int; [[Height of the glview object.]]
- }
- }
@property resize_policy {
set {
[[Set the resize policy for the glview object.
@@ -255,6 +237,8 @@ class Elm.Glview (Elm.Widget)
Evas.Object_Smart.del;
Evas.Object_Smart.resize;
Elm.Widget.on_focus;
+ Efl.Gfx.View.view_size.get;
+ Efl.Gfx.View.view_size.set;
}
events {
}
--
[EGIT] [tools/eflete] master 24/34: ewe_ruler: fix the dashes size calculation
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=224ccc7c8436758564a9dcd645b6966071a05a25
commit 224ccc7c8436758564a9dcd645b6966071a05a25
Author: Vyacheslav Reutskiy
Date: Wed Mar 16 15:43:10 2016 +0200
ewe_ruler: fix the dashes size calculation
Change-Id: If73844f415a933e5caba2aa4ee0fc158c87fd618
---
src/lib/ewe_ruler.c | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/lib/ewe_ruler.c b/src/lib/ewe_ruler.c
index 1385abd..25a6229 100644
--- a/src/lib/ewe_ruler.c
+++ b/src/lib/ewe_ruler.c
@@ -878,7 +878,13 @@ _ewe_ruler_evas_object_smart_calculate(Eo *obj EINA_UNUSED,
int offset;
if (sd->size_changed)
- _add_dashes(sd);
+ {
+_add_dashes(sd);
+EINA_LIST_FOREACH(sd->scales, ls, scale)
+ {
+ _dashes_size_set(sd, scale);
+ }
+ }
if (sd->position_changed)
{
EINA_LIST_FOREACH(sd->scales, ls, scale)
--
[EGIT] [tools/eflete] master 28/34: import_edc: fix typo
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=6f9d40263dbe8b04dc32e4a9a35712776836671a
commit 6f9d40263dbe8b04dc32e4a9a35712776836671a
Author: Andrii Kroitor
Date: Wed Mar 16 16:20:07 2016 +0200
import_edc: fix typo
---
src/bin/ui/tab_home_import_edc.c | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/bin/ui/tab_home_import_edc.c b/src/bin/ui/tab_home_import_edc.c
index 1fe6fc8..b08a3af 100644
--- a/src/bin/ui/tab_home_import_edc.c
+++ b/src/bin/ui/tab_home_import_edc.c
@@ -177,7 +177,7 @@ _img_dir_del(void *data,
Evas_Object *obj __UNUSED__,
void *event_info __UNUSED__)
{
- _dir_del(&tab_edc.img_dirs, (Dir_Data *)data, _("Images directoies:"),
_img_dir_add);
+ _dir_del(&tab_edc.img_dirs, (Dir_Data *)data, _("Images directories:"),
_img_dir_add);
}
static void
@@ -185,7 +185,7 @@ _fnt_dir_del(void *data,
Evas_Object *obj __UNUSED__,
void *event_info __UNUSED__)
{
- _dir_del(&tab_edc.fnt_dirs, (Dir_Data *)data, _("Fonts directoies:"),
_fnt_dir_add);
+ _dir_del(&tab_edc.fnt_dirs, (Dir_Data *)data, _("Fonts directories:"),
_fnt_dir_add);
}
static void
@@ -193,7 +193,7 @@ _snd_dir_del(void *data,
Evas_Object *obj __UNUSED__,
void *event_info __UNUSED__)
{
- _dir_del(&tab_edc.snd_dirs, (Dir_Data *)data, _("Sounds directoies:"),
_snd_dir_add);
+ _dir_del(&tab_edc.snd_dirs, (Dir_Data *)data, _("Sounds directories:"),
_snd_dir_add);
}
/*
@@ -202,7 +202,7 @@ _vbr_dir_del(void *data,
Evas_Object *obj __UNUSED__,
void *event_info __UNUSED__)
{
- _dir_del(&tab_edc.vbr_dirs, (Dir_Data *)data, _("Vibrations directoies:"),
_vbr_dir_add);
+ _dir_del(&tab_edc.vbr_dirs, (Dir_Data *)data, _("Vibrations directories:"),
_vbr_dir_add);
}
*/
@@ -211,7 +211,7 @@ _data_dir_del(void *data,
Evas_Object *obj __UNUSED__,
void *event_info __UNUSED__)
{
- _dir_del(&tab_edc.data_dirs, (Dir_Data *)data, _("Data directoies:"),
_data_dir_add);
+ _dir_del(&tab_edc.data_dirs, (Dir_Data *)data, _("Data directories:"),
_data_dir_add);
}
static Dir_Data *
@@ -497,7 +497,7 @@ _tab_import_edc_add(void)
/* first item for image dirs list */
dir_data = _dir_item_add(_img_dir_del);
- elm_layout_text_set(dir_data->item, NULL, _("Images directoies:"));
+ elm_layout_text_set(dir_data->item, NULL, _("Images directories:"));
tab_edc.img_dirs = eina_list_append(tab_edc.img_dirs, dir_data);
elm_object_disabled_set(dir_data->btn_del, true);
_btn_add_add(dir_data->item, _img_dir_add);
@@ -511,7 +511,7 @@ _tab_import_edc_add(void)
/* first item for font dirs list */
dir_data = _dir_item_add(_fnt_dir_del);
- elm_layout_text_set(dir_data->item, NULL, _("Font directoies:"));
+ elm_layout_text_set(dir_data->item, NULL, _("Font directories:"));
tab_edc.fnt_dirs = eina_list_append(tab_edc.fnt_dirs, dir_data);
elm_object_disabled_set(dir_data->btn_del, true);
_btn_add_add(dir_data->item, _fnt_dir_add);
@@ -525,7 +525,7 @@ _tab_import_edc_add(void)
/* first item for sound dirs list */
dir_data = _dir_item_add(_snd_dir_del);
- elm_layout_text_set(dir_data->item, NULL, _("Sound directoies:"));
+ elm_layout_text_set(dir_data->item, NULL, _("Sound directories:"));
tab_edc.snd_dirs = eina_list_append(tab_edc.snd_dirs, dir_data);
elm_object_disabled_set(dir_data->btn_del, true);
_btn_add_add(dir_data->item, _snd_dir_add);
@@ -540,7 +540,7 @@ _tab_import_edc_add(void)
/* first item for vibration dirs list */
/* UNCOMMENT it when vibration will be supported
dir_data = _dir_item_add(_vbr_dir_del);
- elm_layout_text_set(dir_data->item, NULL, _("Virbration directoies:"));
+ elm_layout_text_set(dir_data->item, NULL, _("Virbration directories:"));
tab_edc.vbr_dirs = eina_list_append(tab_edc.vbr_dirs, dir_data);
elm_object_disabled_set(dir_data->btn_del, true);
_btn_add_add(dir_data->item, _vbr_dir_add);
@@ -557,7 +557,7 @@ _tab_import_edc_add(void)
/* first item for data dirs list */
dir_data = _dir_item_add(_data_dir_del);
- elm_layout_text_set(dir_data->item, NULL, _("Data directoies:"));
+ elm_layout_text_set(dir_data->item, NULL, _("Data directories:"));
tab_edc.data_dirs = eina_list_append(tab_edc.data_dirs, dir_data);
elm_object_disabled_set(dir_data->btn_del, true);
_btn_add_add(dir_data->item, _data_dir_add);
--
[EGIT] [tools/eflete] master 22/34: property_group: remove transition controls when program action is not STATE SET
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=db0321da085a468c82b3bdcaed4e7f1c9f213435
commit db0321da085a468c82b3bdcaed4e7f1c9f213435
Author: Vitalii Vorobiov
Date: Wed Mar 16 14:33:18 2016 +0200
property_group: remove transition controls when program action is not STATE
SET
Fixes T3234
---
src/bin/ui/property_group.c | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/bin/ui/property_group.c b/src/bin/ui/property_group.c
index 10a7daf..99cb1c9 100644
--- a/src/bin/ui/property_group.c
+++ b/src/bin/ui/property_group.c
@@ -1993,13 +1993,12 @@ prop_program_transition_update(Group_Prop_Data *pd)
/* disable the transition controls, and enable it if action is STATE_SET */
if (EDJE_ACTION_TYPE_STATE_SET !=
edje_edit_program_action_get(pd->group->edit_object,
pd->attributes.program.program))
{
-elm_object_disabled_set(pd->attributes.program.transition, true);
-elm_object_disabled_set(pd->attributes.program.transition_params,
true);
-ewe_combobox_select_item_set(pd->attributes.program.transition, 0);
+ elm_object_disabled_set(pd->attributes.program.transition, true);
+ ewe_combobox_select_item_set(pd->attributes.program.transition, 0);
+ _program_transition_param_set(pd, EDJE_TWEEN_MODE_NONE);
return;
}
elm_object_disabled_set(pd->attributes.program.transition, false);
- elm_object_disabled_set(pd->attributes.program.transition_params, false);
type = editor_program_transition_type_get(pd->group->edit_object,
pd->attributes.program.program);
switch (type)
--
[EGIT] [editors/vim-configs] master 03/03: syntax/eo: add support for @empty
jayji pushed a commit to branch master.
http://git.enlightenment.org/editors/vim-configs.git/commit/?id=28ba64678446032ac5634786a048f0ad56f36fdf
commit 28ba64678446032ac5634786a048f0ad56f36fdf
Author: Jean Guyomarc'h
Date: Thu Mar 17 00:00:57 2016 +0100
syntax/eo: add support for @empty
---
syntax/eo.vim | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/syntax/eo.vim b/syntax/eo.vim
index 88a9e91..1a99416 100644
--- a/syntax/eo.vim
+++ b/syntax/eo.vim
@@ -24,7 +24,7 @@ syn keywordeoStatements return
" syn match className "\(\w\+\.\)\+\w\+"
-syn match attributes
"@\(inout\|out\|in\|property\|class\|free\|constructor\|virtual\|auto\|extern\|beta\|protected\|const\|optional\|nullable\|warn_unused\|private\|hot\)"
+syn match attributes
"@\(inout\|out\|in\|property\|class\|free\|constructor\|virtual\|auto\|empty\|extern\|beta\|protected\|const\|optional\|nullable\|warn_unused\|private\|hot\)"
syn match eoLabelMatch "\w\+:" contains=eoClassBodyLabels
syn match eoBlockOpener "\w\+\s*{"
contains=eoClassBodyBlockOpener,eoInnerBlockOpener
--
[EGIT] [tools/exactness] master 01/01: Recording: stop recording consecutive duplicates events
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/tools/exactness.git/commit/?id=06811238a1d809eab17b65be1ecdb7a114d5aee7
commit 06811238a1d809eab17b65be1ecdb7a114d5aee7
Author: Daniel Zaoui
Date: Thu Mar 17 11:44:56 2016 +0200
Recording: stop recording consecutive duplicates events
A lot of events caught by Exactness preload are repeated with the same
information, such as mouse move on the same coordinates and with the
same timestamp. This adds a lot of noise into the recording file.
This patch checks if the current caught event is the same as the last
stored and skips it if they are the same.
---
src/lib/tsuite_evas_hook.c | 29 +
1 file changed, 21 insertions(+), 8 deletions(-)
diff --git a/src/lib/tsuite_evas_hook.c b/src/lib/tsuite_evas_hook.c
index 288cea1..a53d44c 100644
--- a/src/lib/tsuite_evas_hook.c
+++ b/src/lib/tsuite_evas_hook.c
@@ -588,7 +588,7 @@ tsuite_feed_event(void *data)
current_event_time = td->recent_event_time;
#ifdef DEBUG_TSUITE
- printf("%s td->recent_event_time=<%u> current_event_time=<%u>\n", __func__,
td->recent_event_time, current_event_time);
+ printf(" %s td->recent_event_time=<%u> current_event_time=<%u>\n",
__func__, td->recent_event_time, current_event_time);
#endif
timer_time = (current_event_time - td->recent_event_time) / 1000.0;
@@ -596,7 +596,7 @@ tsuite_feed_event(void *data)
timer_time = 0.0;
#ifdef DEBUG_TSUITE
- printf("%s timer_time=<%f>\n", __func__, timer_time);
+ printf(" %s timer_time=<%f>\n", __func__, timer_time);
#endif
ecore_timer_add(timer_time, tsuite_feed_event, td);
@@ -626,17 +626,30 @@ ecore_main_loop_begin(void)
return _ecore_main_loop_begin();
}
+static Eina_Bool
+_is_hook_duplicate(const Variant_st *v, Tsuite_Event_Type ev_type, const void
*info, int len)
+{
+ if (v->t.type == tsuite_event_mapping_type_str_get(ev_type) &&
+ !memcmp(v->data, info, len)) return EINA_TRUE;
+ return EINA_FALSE;
+}
+
/* Adding variant to list, this list is later written to EET file */
#define ADD_TO_LIST(EVT_TYPE, EVT_STRUCT_NAME, INFO) \
do { /* This macro will add event to EET data list */ \
if (vr_list && _hook_setting->recording) \
{ \
- Variant_st *v = malloc(sizeof(Variant_st)); \
- v->data = malloc(sizeof(EVT_STRUCT_NAME)); \
- _variant_type_set(tsuite_event_mapping_type_str_get(EVT_TYPE), \
- &v->t, EINA_FALSE); \
- memcpy(v->data, &INFO, sizeof(EVT_STRUCT_NAME)); \
- vr_list->variant_list = eina_list_append(vr_list->variant_list,
v); \
+ const Variant_st *prev_v =
eina_list_last_data_get(vr_list->variant_list); \
+ if (!prev_v || !_is_hook_duplicate(prev_v, EVT_TYPE, &INFO,
sizeof(EVT_STRUCT_NAME))) \
+ { \
+ printf("Recording %s\n",
tsuite_event_mapping_type_str_get(EVT_TYPE)); \
+ Variant_st *v = malloc(sizeof(Variant_st)); \
+ v->data = malloc(sizeof(EVT_STRUCT_NAME)); \
+
_variant_type_set(tsuite_event_mapping_type_str_get(EVT_TYPE), \
+&v->t, EINA_FALSE); \
+ memcpy(v->data, &INFO, sizeof(EVT_STRUCT_NAME)); \
+ vr_list->variant_list =
eina_list_append(vr_list->variant_list, v); \
+ } \
} \
} while (0)
--
[EGIT] [tools/expedite] master 01/02: ui: add more keyboard controls (home/end/pageup/pagedown)
jpeg pushed a commit to branch master.
http://git.enlightenment.org/tools/expedite.git/commit/?id=f7fa84bf93dd19342df3a29a3be613ad9785b8a1
commit f7fa84bf93dd19342df3a29a3be613ad9785b8a1
Author: Jean-Philippe Andre
Date: Fri Mar 18 15:00:29 2016 +0900
ui: add more keyboard controls (home/end/pageup/pagedown)
Add support for: up/down/pageup/pagedown/home/end
There behaviour kinda makes sense visually, not logically (ie.
up goes to the left, pageup also, home also).
I didn't add any hint on the ui, just press the keys and test :)
---
src/bin/ui.c | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/bin/ui.c b/src/bin/ui.c
index 94a9bdc..f63c9fe 100644
--- a/src/bin/ui.c
+++ b/src/bin/ui.c
@@ -275,7 +275,13 @@ _ui_key(void *data EINA_UNUSED, const Eo_Event *event)
if (menu_active)
{
if (!strcmp(ev->keyname, "Left")) menu_sel++;
-if (!strcmp(ev->keyname, "Right")) menu_sel--;
+else if (!strcmp(ev->keyname, "Right")) menu_sel--;
+else if (!strcmp(ev->keyname, "Up")) menu_sel++;
+else if (!strcmp(ev->keyname, "Down")) menu_sel--;
+else if (!strcmp(ev->keyname, "Home")) menu_sel =
eina_list_count(menu) - 1;
+else if (!strcmp(ev->keyname, "End")) menu_sel = 0;
+else if (!strcmp(ev->keyname, "Next")) menu_sel -= 10;
+else if (!strcmp(ev->keyname, "Prior")) menu_sel += 10;
if (menu_sel < 0) menu_sel = 0;
else if ((unsigned int)menu_sel >= eina_list_count(menu)) menu_sel =
eina_list_count(menu) - 1;
menu_anim_sel = menu_sel;
--
[EGIT] [website/www-content] master 01/01: Wiki page download-latest changed with summary [] by Andrew Williams
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=fea4c1cd229c87fd7566d0a210a694fd4ffb27f3 commit fea4c1cd229c87fd7566d0a210a694fd4ffb27f3 Author: Andrew Williams Date: Fri Mar 18 14:07:27 2016 -0700 Wiki page download-latest changed with summary [] by Andrew Williams --- pages/download-latest.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/download-latest.txt b/pages/download-latest.txt index 24648cd..e6bf714 100644 --- a/pages/download-latest.txt +++ b/pages/download-latest.txt @@ -36,6 +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%%| +|[[%%dlbase%%apps/edi/edi-%%edi_vextn%%|Enlightenment IDE]]|%%edi_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] [core/efl] master 02/05: Evas.Image: (eo) fill_set now unsets the filled flag
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=9d4ca6f352a465cc6e0bcc70aeb3ac3108917e67
commit 9d4ca6f352a465cc6e0bcc70aeb3ac3108917e67
Author: Jean-Philippe Andre
Date: Fri Mar 18 11:29:55 2016 +0900
Evas.Image: (eo) fill_set now unsets the filled flag
There's no point in calling fill_set AND fillet_set(false).
If a users wants to specify the fill, that should be enough
to switch to non-filled mode.
Maybe the "filled" mode should even be called auto or something?
---
src/lib/evas/canvas/evas_image_legacy.c | 2 +-
src/lib/evas/canvas/evas_image_private.h | 3 +++
src/lib/evas/canvas/evas_object_image.c | 15 ---
3 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/lib/evas/canvas/evas_image_legacy.c
b/src/lib/evas/canvas/evas_image_legacy.c
index 9b510dd..cd92e6f 100644
--- a/src/lib/evas/canvas/evas_image_legacy.c
+++ b/src/lib/evas/canvas/evas_image_legacy.c
@@ -47,7 +47,7 @@ evas_object_image_fill_set(Evas_Object *obj,
Evas_Coord w, Evas_Coord h)
{
EVAS_IMAGE_API(obj);
- efl_gfx_fill_set(obj, x, y, w, h);
+ _evas_image_fill_set(obj, eo_data_scope_get(obj, EVAS_IMAGE_CLASS), x, y,
w, h);
}
EAPI void
diff --git a/src/lib/evas/canvas/evas_image_private.h
b/src/lib/evas/canvas/evas_image_private.h
index ff7ffcd..7274c41 100644
--- a/src/lib/evas/canvas/evas_image_private.h
+++ b/src/lib/evas/canvas/evas_image_private.h
@@ -142,6 +142,9 @@ void _evas_image_init_set(const Eina_File *f, const char
*file, const char *key,
void _evas_image_done_set(Eo *eo_obj, Evas_Object_Protected_Data *obj,
Evas_Image_Data *o);
void _evas_image_cleanup(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj,
Evas_Image_Data *o);
+/* Efl.Gfx.Fill */
+void _evas_image_fill_set(Eo *eo_obj, Evas_Image_Data *o, int x, int y, int w,
int h);
+
/* Efl.File */
Eina_Bool _evas_image_mmap_set(Eo *eo_obj, const Eina_File *f, const char
*key);
void _evas_image_mmap_get(const Eo *eo_obj, const Eina_File **f, const char
**key);
diff --git a/src/lib/evas/canvas/evas_object_image.c
b/src/lib/evas/canvas/evas_object_image.c
index 097c04f..5b4114f 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -542,9 +542,8 @@ _evas_image_efl_image_border_scale_get(Eo *eo_obj
EINA_UNUSED, Evas_Image_Data *
return o->cur->border.scale;
}
-EOLIAN static void
-_evas_image_efl_gfx_fill_fill_set(Eo *eo_obj, Evas_Image_Data *o,
- int x, int y, int w, int h)
+void
+_evas_image_fill_set(Eo *eo_obj, Evas_Image_Data *o, int x, int y, int w, int
h)
{
Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj,
EVAS_OBJECT_CLASS);
@@ -574,6 +573,16 @@ _evas_image_efl_gfx_fill_fill_set(Eo *eo_obj,
Evas_Image_Data *o,
}
EOLIAN static void
+_evas_image_efl_gfx_fill_fill_set(Eo *eo_obj, Evas_Image_Data *o,
+ int x, int y, int w, int h)
+{
+ // Should (0,0,0,0) reset the filled flag to true?
+ o->filled = EINA_FALSE;
+ o->filled_set = EINA_TRUE;
+ _evas_image_fill_set(eo_obj, o, x, y, w, h);
+}
+
+EOLIAN static void
_evas_image_efl_gfx_fill_fill_get(Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o,
int *x, int *y, int *w, int *h)
{
--
[EGIT] [tools/enventor] master 01/01: indent: Check '\r' when indented code line is created on Windows.
jaehyun pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=e940639079c9d73ce03be6333c917a8d1a73a8fa
commit e940639079c9d73ce03be6333c917a8d1a73a8fa
Author: Jaehyun Cho
Date: Thu Mar 17 14:52:35 2016 +0900
indent: Check '\r' when indented code line is created on Windows.
On Windows, new line is represented as "\r\n".
Therefore, '\r' is checked when indented code line is created.
Otherwise, unnecessary newlines are inserted after indentation on
Windows.
---
src/lib/indent.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/lib/indent.c b/src/lib/indent.c
index 3c3648d..1f62bc4 100644
--- a/src/lib/indent.c
+++ b/src/lib/indent.c
@@ -263,7 +263,8 @@ indent_code_lines_create(indent_data *id EINA_UNUSED, const
char *utf8)
*/
while (utf8_ptr < utf8_end)
{
-if (*utf8_ptr != ' ' && *utf8_ptr != '\t' && *utf8_ptr != '\n' )
+if (*utf8_ptr != ' ' && *utf8_ptr != '\t' && *utf8_ptr != '\n' &&
+*utf8_ptr != '\r')
{
//Renew the start position of lexeme.
if (!keep_lexem_start_pos) utf8_lexem = utf8_ptr;
--
[EGIT] [tools/eflete] master 01/01: UTC: remove extra edj files generation
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=63056c61a424a28939167ef57dee8b33bffd07c7 commit 63056c61a424a28939167ef57dee8b33bffd07c7 Author: Vyacheslav Reutskiy Date: Thu Mar 17 16:35:31 2016 +0200 UTC: remove extra edj files generation Change-Id: If6c033bc1320e478e675861352e051698eb389dc --- tests/edj_build/Makefile.am | 74 + 1 file changed, 1 insertion(+), 73 deletions(-) diff --git a/tests/edj_build/Makefile.am b/tests/edj_build/Makefile.am index 1b1b721..5b9dffd 100644 --- a/tests/edj_build/Makefile.am +++ b/tests/edj_build/Makefile.am @@ -12,81 +12,9 @@ check: Makefile $(builddir)/radio.edc \ $(builddir)/radio.edj for i in \ - $(builddir)/ui_workspace.edj \ - $(builddir)/workspace_edit_object_part_state_del.edj \ - $(builddir)/workspace_background_image_set.edj \ - $(builddir)/workspace_highlight_unset.edj \ - $(builddir)/workspace_edit_object_part_state_add.edj \ - $(builddir)/workspace_edit_object_recalc.edj \ - $(builddir)/workspace_edit_object_get.edj \ - $(builddir)/workspace_highlight_set.edj \ - $(builddir)/workspace_separate_mode_set.edj \ - $(builddir)/workspace_separate_mode_get.edj \ - $(builddir)/workspace_edit_object_part_rename.edj \ - $(builddir)/workspace_edit_object_part_above.edj \ - $(builddir)/workspace_edit_object_part_restack.edj \ - $(builddir)/workspace_edit_object_set.edj \ - $(builddir)/workspace_edit_object_part_below.edj \ - $(builddir)/workspace_edit_object_unset.edj \ - $(builddir)/workspace_edit_object_part_add.edj \ - $(builddir)/workspace_edit_object_part_del.edj \ - $(builddir)/workspace_edit_object_part_state_set.edj \ - $(builddir)/workspace_edit_object_visible_set.edj \ - $(builddir)/workspace_edit_object_part_item_selected_set.edj \ - $(builddir)/workspace_edit_object_part_item_add.edj \ - $(builddir)/workspace_edit_object_part_item_del.edj \ - $(builddir)/workspace_highlight_align_visible_get.edj \ - $(builddir)/workspace_highlight_align_visible_set.edj \ - $(builddir)/workspace_object_area_visible_get.edj \ - $(builddir)/workspace_object_area_visible_set.edj \ - $(builddir)/workspace_zoom_factor_get.edj \ - $(builddir)/groupedit_edit_object_unset.edj \ - $(builddir)/groupedit_edit_object_set.edj \ - $(builddir)/mw_icon_set.edj \ - $(builddir)/program_editor_window_add_test.edj \ - $(builddir)/style_manager.edj \ - $(builddir)/test_project_manager.edj \ - $(builddir)/image_manager.edj \ - $(builddir)/ui_states_list_data_set.edj \ - $(builddir)/ui_states_list_data_unset.edj \ - $(builddir)/ui_states_list_part_get.edj \ - $(builddir)/ui_states_list_selected_state_get.edj \ - $(builddir)/ui_states_list_selected_states_del.edj \ - $(builddir)/ui_states_list_state_add.edj \ - $(builddir)/ui_signal_list_data_set.edj \ - $(builddir)/ui_signal_list_data_unset.edj \ - $(builddir)/wm_style_object_find.edj \ - $(builddir)/wm_styles_build_alias.edj \ - $(builddir)/wm_widget_list_objects_load.edj \ - $(builddir)/wm_widget_list_new.edj \ - $(builddir)/wm_style_copy.edj \ - $(builddir)/wm_program_signals_list_free.edj \ - $(builddir)/wm_layouts_list_new.edj \ - $(builddir)/wm_widget_list_free.edj \ - $(builddir)/wm_program_signals_list_get.edj \ - $(builddir)/wm_part_current_state_set.edj \ - $(builddir)/wm_layouts_list_objects_load.edj \ - $(builddir)/wm_style_free.edj \ - $(builddir)/wm_style_data_reload.edj \ - $(builddir)/wm_part_del.edj \ - $(builddir)/wm_part_add.edj \ - $(builddir)/widget_list.edj \ - $(builddir)/wm_part_by_name_find.edj \ - $(builddir)/ui_widget_list_part_add.edj \ - $(builddir)/ui_widget_list_title_set.edj \ - $(builddir)/part_dialog.edj \ - $(builddir)/main_window.edj \ - $(builddir)/ui_edj_load.edj \ - $(builddir)/ui_style_clicked.edj \ - $(builddir)/style_dialog.edj \ - $(builddir)/state_dialog.edj \ - $(builddir)/item_dialog.edj \ - $(builddir)/colorclass_manager.edj \ - $(builddir)/sound_editor.edj \ - $(builddir)/animator.edj \ $(builddir)/history.edj \ $(builddir)/history_diff_add.edj \ - $(builddir)/preference.edj \ + $(builddir)/test_project_manager.edj \ $(builddir)/project_manager.edj \ $(builddir)/project_thread_cancel.edj \ ;do cp $(builddir)/radio.edj $$i; done --
[EGIT] [apps/eruler] master 01/01: Fix warnings: shadow, unused-variable
jpeg pushed a commit to branch master.
http://git.enlightenment.org/apps/eruler.git/commit/?id=7620f760baeea60cccb6b92573ca90201c978eca
commit 7620f760baeea60cccb6b92573ca90201c978eca
Author: Jean-Philippe Andre
Date: Fri Mar 18 14:10:39 2016 +0900
Fix warnings: shadow, unused-variable
---
src/bin/main.c | 4 +---
src/bin/platform-x.c | 1 -
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/bin/main.c b/src/bin/main.c
index de52be9..0552ee3 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -424,7 +424,6 @@ _event_mouse_tracker(void *data)
{
int fx, fy, fw, fh, zx, zy, zw, zh, stride, iw, ih;
unsigned int *pixels, color;
-char buf[32];
zw = zone->zoom.ideal_size.w < zone->w / 4 ?
zone->zoom.ideal_size.w : zone->w / 4;
@@ -2492,7 +2491,6 @@ elm_main(int argc, char **argv)
else
{
Eina_List *l;
-Zone *zone;
EINA_LIST_FOREACH(zones, l, zone)
{
if (!platform_funcs->zone_setup(zone))
@@ -2566,7 +2564,7 @@ elm_main(int argc, char **argv)
{
while (zones)
{
- Zone *zone = zones->data;
+ zone = zones->data;
evas_object_del(zone->win);
}
}
diff --git a/src/bin/platform-x.c b/src/bin/platform-x.c
index f302f51..b7d34bf 100644
--- a/src/bin/platform-x.c
+++ b/src/bin/platform-x.c
@@ -246,7 +246,6 @@ x_post_setup(void)
{
const Eina_List *l;
const Zone *zone;
- void *ptr;
if (eina_list_count(zones) > 1)
{
--
[EGIT] [core/elementary] master 01/02: Elm.Image: Improve error message after load failure
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=d1796f9aa678bcb91eeca75096a16ccfb759ad5f
commit d1796f9aa678bcb91eeca75096a16ccfb759ad5f
Author: Jean-Philippe Andre
Date: Thu Mar 17 11:01:56 2016 +0900
Elm.Image: Improve error message after load failure
"Things are going bad for ()" was pretty
useless, and confusing to some people.
Also, simplify code wrt. returning a bool...
---
src/lib/elm_image.c | 83 ++---
1 file changed, 40 insertions(+), 43 deletions(-)
diff --git a/src/lib/elm_image.c b/src/lib/elm_image.c
index 91e373a..538c5b9 100644
--- a/src/lib/elm_image.c
+++ b/src/lib/elm_image.c
@@ -34,7 +34,7 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
};
static Eina_Bool _key_action_activate(Evas_Object *obj, const char *params);
-static void _elm_image_smart_internal_file_set(Eo *obj, Elm_Image_Data *sd,
const char *file, const Eina_File *f, const char *key, Eina_Bool *ret);
+static Eina_Bool _elm_image_smart_internal_file_set(Eo *obj, Elm_Image_Data
*sd, const char *file, const Eina_File *f, const char *key);
static const Elm_Action key_actions[] = {
{"activate", _key_action_activate},
@@ -375,23 +375,12 @@ _elm_image_async_open_done(void *data, Ecore_Thread
*thread EINA_UNUSED)
else
file = f ? eina_file_filename_get(f) : NULL;
- if (sd->edje)
- {
-if (ok) ok = edje_object_mmap_set(sd->img, f, key);
-if (!ok)
- {
- ERR("failed to open edje file '%s', group '%s': %s", file, key,
- edje_load_error_str(edje_object_load_error_get(sd->img)));
- }
- }
- else
+ if (ok)
{
-if (ok) _elm_image_smart_internal_file_set(obj, sd, file, f, key, &ok);
-if (!ok)
- {
- ERR("failed to open image file '%s', key '%s': %s", file, key,
-
evas_load_error_str(evas_object_image_load_error_get(sd->img)));
- }
+if (sd->edje)
+ ok = edje_object_mmap_set(sd->img, f, key);
+else
+ ok = _elm_image_smart_internal_file_set(obj, sd, file, f, key);
}
if (ok)
@@ -899,6 +888,8 @@ _elm_image_file_set_do(Evas_Object *obj)
EOLIAN static Eina_Bool
_elm_image_memfile_set(Eo *obj, Elm_Image_Data *sd, const void *img, size_t
size, const char *format, const char *key)
{
+ Evas_Load_Error err;
+
_elm_image_file_set_do(obj);
evas_object_image_memfile_set
@@ -907,11 +898,12 @@ _elm_image_memfile_set(Eo *obj, Elm_Image_Data *sd, const
void *img, size_t size
sd->preload_status = ELM_IMAGE_PRELOADING;
evas_object_image_preload(sd->img, EINA_FALSE);
- if (evas_object_image_load_error_get(sd->img) != EVAS_LOAD_ERROR_NONE)
+ err = evas_object_image_load_error_get(sd->img);
+ if (err != EVAS_LOAD_ERROR_NONE)
{
if (img)
- ERR("Things are going bad for some random " FMT_SIZE_T
- " byte chunk of memory (%p)", size, sd->img);
+ ERR("Failed to load image from memory block (" FMT_SIZE_T
+ " bytes): %s (%p)", size, evas_load_error_str(err), sd->img);
else
ERR("NULL image data passed (%p)", sd->img);
return EINA_FALSE;
@@ -998,16 +990,14 @@ _elm_image_efl_file_mmap_set(Eo *obj, Elm_Image_Data *pd
EINA_UNUSED,
return ret;
}
-static void
+static Eina_Bool
_elm_image_smart_internal_file_set(Eo *obj, Elm_Image_Data *sd,
- const char *file, const Eina_File *f, const
char *key, Eina_Bool *ret)
+ const char *file, const Eina_File *f, const
char *key)
{
+ Evas_Load_Error err;
+
if (eina_str_has_extension(file, ".edj"))
- {
-Eina_Bool int_ret = _elm_image_edje_file_set(obj, file, f, key);
-if (ret) *ret = int_ret;
-return;
- }
+ return _elm_image_edje_file_set(obj, file, f, key);
_elm_image_file_set_do(obj);
@@ -1016,14 +1006,25 @@ _elm_image_smart_internal_file_set(Eo *obj,
Elm_Image_Data *sd,
else
evas_object_image_file_set(sd->img, file, key);
- if (evas_object_image_load_error_get(sd->img) != EVAS_LOAD_ERROR_NONE)
+ err = evas_object_image_load_error_get(sd->img);
+ if (err != EVAS_LOAD_ERROR_NONE)
{
-if (file)
- ERR("Things are going bad for '%s' (%p)", file, sd->img);
+if (file || f)
+ {
+ if (key)
+ ERR("Failed to load image '%s' '%s': %s. (%p)",
+ file ? file : eina_file_filename_get(f), key,
+ evas_load_error_str(err), obj);
+ else
+ERR("Failed to load image '%s': %s. (%p)",
+file ? file : eina_file_filename_get(f),
+evas_load_error_str(err), obj);
+ }
else
- ERR("NULL image file passed (%p)", sd->img);
-if (ret) *ret = EINA_FALSE;
-
[EGIT] [tools/expedite] master 01/04: migrate to new efl api.
cedric pushed a commit to branch master.
http://git.enlightenment.org/tools/expedite.git/commit/?id=051a4ec0cf9245d086e8df9d426e57b1805a3d37
commit 051a4ec0cf9245d086e8df9d426e57b1805a3d37
Author: Cedric BAIL
Date: Thu Mar 17 16:53:27 2016 -0700
migrate to new efl api.
---
src/bin/image_blend_border.c| 2 +-
src/bin/image_blend_border_recolor.c| 2 +-
src/bin/image_blend_solid_border.c | 2 +-
src/bin/image_blend_solid_middle_border.c | 4 ++--
src/bin/image_blend_solid_middle_unscaled.c | 4 ++--
src/bin/ui.c| 2 +-
src/bin/widgets_list_1.c| 4 ++--
src/bin/widgets_list_1_grouped.c| 4 ++--
src/bin/widgets_list_2.c| 4 ++--
src/bin/widgets_list_2_grouped.c| 4 ++--
src/bin/widgets_list_3.c| 8
src/bin/widgets_list_3_grouped.c| 8
src/bin/widgets_list_4.c| 8
src/bin/widgets_list_4_grouped.c| 8
14 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/src/bin/image_blend_border.c b/src/bin/image_blend_border.c
index 9cff6df..9056755 100644
--- a/src/bin/image_blend_border.c
+++ b/src/bin/image_blend_border.c
@@ -26,7 +26,7 @@ static void _setup(void)
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
efl_file_set(o, build_path("bar.png"), NULL);
-evas_obj_image_border_set(o, 6, 6, 6, 6);
+efl_image_border_set(o, 6, 6, 6, 6);
efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
diff --git a/src/bin/image_blend_border_recolor.c
b/src/bin/image_blend_border_recolor.c
index 806cab7..37a8304 100644
--- a/src/bin/image_blend_border_recolor.c
+++ b/src/bin/image_blend_border_recolor.c
@@ -27,7 +27,7 @@ static void _setup(void)
o_images[i] = o;
efl_file_set(o, build_path("pan.png"), NULL);
efl_gfx_color_set(o, 64, 64, 64, 255);
-evas_obj_image_border_set(o, 3, 3, 3, 3);
+efl_image_border_set(o, 3, 3, 3, 3);
efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
diff --git a/src/bin/image_blend_solid_border.c
b/src/bin/image_blend_solid_border.c
index 15430dc..b58670f 100644
--- a/src/bin/image_blend_solid_border.c
+++ b/src/bin/image_blend_solid_border.c
@@ -26,7 +26,7 @@ static void _setup(void)
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
efl_file_set(o, build_path("frame.png"), NULL);
-evas_obj_image_border_set(o, 8, 8, 8, 8);
+efl_image_border_set(o, 8, 8, 8, 8);
efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
diff --git a/src/bin/image_blend_solid_middle_border.c
b/src/bin/image_blend_solid_middle_border.c
index bf5636f..b80e615 100644
--- a/src/bin/image_blend_solid_middle_border.c
+++ b/src/bin/image_blend_solid_middle_border.c
@@ -26,8 +26,8 @@ static void _setup(void)
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
efl_file_set(o, build_path("bar.png"), NULL);
-evas_obj_image_border_set(o, 6, 6, 6, 6);
-evas_obj_image_border_center_fill_set(o, EVAS_BORDER_FILL_SOLID);
+efl_image_border_set(o, 6, 6, 6, 6);
+efl_image_border_center_fill_set(o, EVAS_BORDER_FILL_SOLID);
efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
diff --git a/src/bin/image_blend_solid_middle_unscaled.c
b/src/bin/image_blend_solid_middle_unscaled.c
index d607b25..8a2aecd 100644
--- a/src/bin/image_blend_solid_middle_unscaled.c
+++ b/src/bin/image_blend_solid_middle_unscaled.c
@@ -28,8 +28,8 @@ static void _setup(void)
efl_file_set(o, build_path("logo.png"), NULL);
efl_gfx_fill_set(o, 0, 0, 120, 160);
efl_gfx_size_set(o, 120, 160);
-evas_obj_image_border_set(o, 43, 48, 48, 83);
-evas_obj_image_border_center_fill_set(o, EVAS_BORDER_FILL_SOLID);
+efl_image_border_set(o, 43, 48, 48, 83);
+efl_image_border_center_fill_set(o, EVAS_BORDER_FILL_SOLID);
efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
diff --git a/src/bin/ui.c b/src/bin/ui.c
index 75c6ec0..94a9bdc 100644
--- a/src/bin/ui.c
+++ b/src/bin/ui.c
@@ -458,7 +458,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
efl_file_set(o, build_path("text_sel.png"), NULL);
efl_gfx_size_set(o, 96, 32);
efl_gfx_fill_set(o, 0, 0, 96, 32);
- evas_obj_image_border_set(o, 7, 7, 7, 7);
+ efl_image_border_set(o, 7, 7, 7, 7);
o_menu_text_sel = o;
o = eo_add(EVAS_TEXT_CLASS, evas);
diff --git a/src/bin/widgets_list_1.c b/src/bin/widgets_list_1.c
index b0e9085..526d888 100644
--- a/src/bin/widgets_list_1.c
+++ b/src/bin/widgets_list_1.c
@@ -64,8 +64,8 @@ static void _setup(void)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
-evas_obj_image_filled_set(o, 1);
-evas_obj_image_border_set(o, 2, 2, 2, 2);
+efl_gfx_fill_filled_set(o, 1);
+efl_
[EGIT] [core/elementary] master 01/01: docs: properly ends doxygen groups
jayji pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=31fb6e3258da7c9a9e8b7fb5d497ad9ad5543b7b commit 31fb6e3258da7c9a9e8b7fb5d497ad9ad5543b7b Author: Jean Guyomarc'h Date: Wed Mar 16 23:25:04 2016 +0100 docs: properly ends doxygen groups --- src/lib/elm_widget_container.h| 4 src/lib/elm_widget_flipselector.h | 4 2 files changed, 8 insertions(+) diff --git a/src/lib/elm_widget_container.h b/src/lib/elm_widget_container.h index a8cde24..f62095a 100644 --- a/src/lib/elm_widget_container.h +++ b/src/lib/elm_widget_container.h @@ -38,4 +38,8 @@ #include "elm_container.eo.h" +/** + * @} + */ + #endif diff --git a/src/lib/elm_widget_flipselector.h b/src/lib/elm_widget_flipselector.h index ef2edef..d5ef440 100644 --- a/src/lib/elm_widget_flipselector.h +++ b/src/lib/elm_widget_flipselector.h @@ -86,4 +86,8 @@ struct _Elm_Flipselector_Item_Data if (EINA_UNLIKELY(!eo_isa((it->base->eo_obj), ELM_FLIPSELECTOR_ITEM_CLASS))) \ return __VA_ARGS__; +/** + * @} + */ + #endif --
[EGIT] [core/enlightenment] master 04/05: add e_comp_object_agent_add()
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=80595756b7e76377b33266ef4f28214902a6defb
commit 80595756b7e76377b33266ef4f28214902a6defb
Author: Mike Blumenkrantz
Date: Thu Mar 17 13:37:00 2016 -0400
add e_comp_object_agent_add()
an agent object can be used when a client should be represented on the
canvas solely by its window geometry and not including any csd
this creates and manages a mutable object which maintains the same geom
as ec->x/y/w/h and can be operated upon to modify those values
---
src/bin/e_comp_object.c | 89 +++--
src/bin/e_comp_object.h | 1 +
2 files changed, 80 insertions(+), 10 deletions(-)
diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index 18e09d3..af21057 100644
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -88,6 +88,7 @@ typedef struct _E_Comp_Object
Evas_Object *effect_obj; // effects object
unsigned int layer; //e_comp_canvas_layer_map(cw->ec->layer)
Eina_List *obj_mirror; // extra mirror objects
+ Eina_List *obj_agent; // extra agent objects
Eina_Tiler *updates; //render update regions
Eina_Tiler *pending_updates; //render update regions which are
about to render
@@ -126,6 +127,8 @@ typedef struct _E_Comp_Object
Eina_Boolforce_move : 1;
Eina_Boolframe_extends : 1; //frame may extend beyond object
size
Eina_Boolblanked : 1; //window is rendering blank content
(externally composited)
+
+ Eina_Boolagent_updating : 1; //updating agents
} E_Comp_Object;
@@ -185,6 +188,38 @@ _e_comp_object_event_add(Evas_Object *obj)
/
static void
+_e_comp_object_cb_agent_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj,
void *event_info EINA_UNUSED)
+{
+ E_Comp_Object *cw = data;
+
+ cw->obj_agent = eina_list_remove(cw->obj_agent, obj);
+}
+
+static void
+_e_comp_object_cb_agent_resize(void *data, Evas *e EINA_UNUSED, Evas_Object
*obj, void *event_info EINA_UNUSED)
+{
+ E_Comp_Object *cw = data;
+ int w, h;
+
+ if (cw->agent_updating) return;
+ evas_object_geometry_get(obj, NULL, NULL, &w, &h);
+ evas_object_resize(cw->smart_obj, w, h);
+}
+
+static void
+_e_comp_object_cb_agent_move(void *data, Evas *e EINA_UNUSED, Evas_Object
*obj, void *event_info EINA_UNUSED)
+{
+ E_Comp_Object *cw = data;
+ int x, y;
+
+ if (cw->agent_updating) return;
+ evas_object_geometry_get(obj, &x, &y, NULL, NULL);
+ evas_object_move(cw->smart_obj, x, y);
+}
+
+/
+
+static void
_e_comp_object_cb_mirror_del(void *data, Evas *e EINA_UNUSED, Evas_Object
*obj, void *event_info EINA_UNUSED)
{
E_Comp_Object *cw = data;
@@ -2265,6 +2300,7 @@ static void
_e_comp_smart_del(Evas_Object *obj)
{
Eina_List *l;
+ Evas_Object *o;
INTERNAL_ENTRY;
@@ -2273,17 +2309,18 @@ _e_comp_smart_del(Evas_Object *obj)
E_FREE_FUNC(cw->pending_updates, eina_tiler_free);
free(cw->ns);
- if (cw->obj_mirror)
+ EINA_LIST_FREE(cw->obj_mirror, o)
{
-Evas_Object *o;
-
-EINA_LIST_FREE(cw->obj_mirror, o)
- {
- evas_object_image_data_set(o, NULL);
- evas_object_freeze_events_set(o, 1);
- evas_object_event_callback_del_full(o, EVAS_CALLBACK_DEL,
_e_comp_object_cb_mirror_del, cw);
- evas_object_del(o);
- }
+evas_object_image_data_set(o, NULL);
+evas_object_freeze_events_set(o, 1);
+evas_object_event_callback_del_full(o, EVAS_CALLBACK_DEL,
_e_comp_object_cb_mirror_del, cw);
+evas_object_del(o);
+ }
+ EINA_LIST_FREE(cw->obj_agent, o)
+ {
+evas_object_freeze_events_set(o, 1);
+evas_object_event_callback_del_full(o, EVAS_CALLBACK_DEL,
_e_comp_object_cb_agent_del, cw);
+evas_object_del(o);
}
_e_comp_object_layers_remove(cw);
l = evas_object_data_get(obj, "comp_object-to_del");
@@ -2314,9 +2351,16 @@ _e_comp_smart_del(Evas_Object *obj)
static void
_e_comp_smart_move(Evas_Object *obj, int x, int y)
{
+ Eina_List *l;
+ Evas_Object *o;
+
INTERNAL_ENTRY;
cw->x = x, cw->y = y;
+ cw->agent_updating = 1;
+ EINA_LIST_FOREACH(cw->obj_agent, l, o)
+ evas_object_move(o, cw->ec->x, cw->ec->x);
+ cw->agent_updating = 0;
evas_object_move(cw->clip, 0, 0);
evas_object_move(cw->effect_obj, x, y);
if (cw->input_obj)
@@ -2333,6 +2377,8 @@ static void
_e_comp_smart_resize(Evas_Object *obj, int w, int h)
{
Eina_Bool first = EINA_FALSE;
+ Eina_List *l;
+ Evas_Object *o;
INTERNAL_ENTRY;
@@ -2384,6 +2430,10 @@ _e_comp_smart_resize(Evas_Object *obj, int w, int h)
{
evas_object_resize(cw->effect_obj, w, h);
}
+ cw->agent_updating = 1;
+ EINA_LIST_FOREACH(cw->obj_agent, l, o)
+ e
[EGIT] [tools/eflete] master 05/34: move about dialog to main window
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=9134e64d49e47e23ba184ec72c678a816aaf25e8
commit 9134e64d49e47e23ba184ec72c678a816aaf25e8
Author: Vyacheslav Reutskiy
Date: Wed Mar 16 10:44:55 2016 +0200
move about dialog to main window
Change-Id: I2d76bb67425853769e1681dd92004119be28d91d
---
data/themes/default/widgets/label.edc | 1 +
po/POTFILES.in| 1 -
src/bin/Makefile.am | 2 -
src/bin/ui/dialogs/about_window.c | 89 ---
src/bin/ui/dialogs/about_window.h | 45 --
src/bin/ui/main_window.c | 38 +++
src/bin/ui/main_window.h | 11 +
src/bin/ui/menu.c | 1 -
8 files changed, 50 insertions(+), 138 deletions(-)
diff --git a/data/themes/default/widgets/label.edc
b/data/themes/default/widgets/label.edc
index 10e3dc9..cd87c0d 100644
--- a/data/themes/default/widgets/label.edc
+++ b/data/themes/default/widgets/label.edc
@@ -53,6 +53,7 @@ group { name: "elm/label/base/slide_about";
part { name: "label.text.clip";
type: RECT;
description { state: "default" 0.0;
+min: 0 300;
}
}
part { name: "elm.text";
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5e8366b..330d177 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -8,7 +8,6 @@ src/bin/logger/logger.c
src/bin/project_manager/group_manager.c
src/bin/project_manager/project_manager.c
src/bin/ui/cursor.c
-src/bin/ui/dialogs/about_window.c
src/bin/ui/dialogs/colorsel.c
src/bin/ui/editors/animator.c
src/bin/ui/editors/animator_program_editor.c
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 1ca873f..9548764 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -36,7 +36,6 @@ includesub_HEADERS = \
ui/property_private.h \
ui/tabs.h \
ui/tabs_private.h \
- ui/dialogs/about_window.h \
ui/dialogs/colorsel.h \
ui/live_view/demo.h \
ui/live_view/live_widget.h \
@@ -87,7 +86,6 @@ libete_a_SOURCES = \
../../src/bin/ui/shortcuts/shortcuts.c \
../../src/bin/ui/style_manager.c \
../../src/bin/ui/sound_manager.c \
-../../src/bin/ui/dialogs/about_window.c \
../../src/bin/ui/dialogs/colorsel.c \
../../src/bin/ui/modal_window/modal_window.c \
../../src/bin/ui/project_navigator.c \
diff --git a/src/bin/ui/dialogs/about_window.c
b/src/bin/ui/dialogs/about_window.c
deleted file mode 100644
index 7995ccd..000
--- a/src/bin/ui/dialogs/about_window.c
+++ /dev/null
@@ -1,89 +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 "main_window.h"
-#include "modal_window.h"
-
-static void
-_on_mwin_del(void *data __UNUSED__,
- Evas *e __UNUSED__,
- Evas_Object *obj __UNUSED__,
- void *event_info __UNUSED__)
-{
- ui_menu_items_list_disable_set(ap.menu, MENU_ITEMS_LIST_MAIN, false);
-}
-
-static void
-_on_button_close_clicked_cb(void *data,
-Evas_Object *obj __UNUSED__,
-void *event_info __UNUSED__)
-{
- assert(data != NULL);
- evas_object_del(data);
-}
-
-Evas_Object *
-about_window_add()
-{
- Evas_Object *button;
- Evas_Object *mwin = mw_add("about_window", NULL, NULL);
-
- assert(mwin != NULL);
-
- mw_title_set(mwin, _("About"));
- Evas_Object *label;
-
- label = elm_label_add(mwin);
- elm_object_text_set(label,
- ""
- ""PACKAGE_NAME" v."VERSION""
- "This application was written for Enlightenment project."
- "It is designed to create and modify styles of Elementary widgets."
- ""
- "Copyright (C) 2013 - 2015 Samsung Electronics."
- ""
- "Authors:"
- "Vyacheslav \"rimmed\" Reutskiy (v.reuts...@samsung.com)"
- "Mykyta Biliavskyi (m.biliavs...@samsung.com)"
- "Vitalii Vorobiov (vi.vorob...@samsung.com)"
- "Andrii Kroitor (an.kroi...@samsung.com)"
- "Kateryna Fesyna (fesy...@gmail.com)"
- "Maksym Volodin (mac9...@gmail.com)"
- "Igor Gala (igor.gal...@gmail.com)"
- ""
- "Olga Kolesnik (o.koles...@samsung.com)"
- ""
- "Oleg Dotsenko (o.dotse...@samsung.com)"
- "Yurii Tsivun (y.tsi...@samsung.com)"
- "Dmitriy Samoylov (dm.samoy...@sam
[EGIT] [core/efl] master 01/05: evas/gl_x11 : Move engine data to native.
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=bc2b32cba7bb562e2a558ac971fc3b95a1150511
commit bc2b32cba7bb562e2a558ac971fc3b95a1150511
Author: Minkyoung Kim
Date: Thu Mar 17 18:20:49 2016 +0900
evas/gl_x11 : Move engine data to native.
Summary:
If 2 evases refer to same pixmap, use same EvasGL_Image.
But EvasGL_Image can have only one engine data.
When evas related to native is destroyed and another evas use that native,
crash occur.
So native callbacks need to be independent to engine data.
Test Plan: mobile, local test
Reviewers: cedric, spacegrapher, wonsik, jpeg
Reviewed By: jpeg
Differential Revision: https://phab.enlightenment.org/D3800
---
.../evas/engines/gl_common/evas_gl_common.h| 2 +
src/modules/evas/engines/gl_x11/evas_engine.c | 56 ++
2 files changed, 38 insertions(+), 20 deletions(-)
diff --git a/src/modules/evas/engines/gl_common/evas_gl_common.h
b/src/modules/evas/engines/gl_common/evas_gl_common.h
index e4b14f3..80e1eb1 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_common.h
+++ b/src/modules/evas/engines/gl_common/evas_gl_common.h
@@ -440,6 +440,8 @@ struct _Evas_GL_Image
int target;
int mipmap;
unsigned char loose : 1;
+ void *disp;
+ Evas_GL_Shared *shared;
} native;
struct {
diff --git a/src/modules/evas/engines/gl_x11/evas_engine.c
b/src/modules/evas/engines/gl_x11/evas_engine.c
index e48dea0..eacd924 100644
--- a/src/modules/evas/engines/gl_x11/evas_engine.c
+++ b/src/modules/evas/engines/gl_x11/evas_engine.c
@@ -2031,11 +2031,10 @@ _native_bind_cb(void *data EINA_UNUSED, void *image)
}
#else
# ifdef GLX_BIND_TO_TEXTURE_TARGETS_EXT
- Render_Engine *re = data;
if (glsym_glXBindTexImage)
{
-glsym_glXBindTexImage(eng_get_ob(re)->disp,
(XID)n->ns_data.x11.surface,
+glsym_glXBindTexImage(im->native.disp, (XID)n->ns_data.x11.surface,
GLX_FRONT_LEFT_EXT, NULL);
GLERRV("glsym_glXBindTexImage");
}
@@ -2121,11 +2120,10 @@ _native_unbind_cb(void *data EINA_UNUSED, void *image)
// nothing
#else
# ifdef GLX_BIND_TO_TEXTURE_TARGETS_EXT
-Render_Engine *re = data;
if (glsym_glXReleaseTexImage)
{
- glsym_glXReleaseTexImage(eng_get_ob(re)->disp,
(XID)(n->ns_data.x11.surface),
+ glsym_glXReleaseTexImage(im->native.disp,
(XID)(n->ns_data.x11.surface),
GLX_FRONT_LEFT_EXT);
}
else
@@ -2152,9 +2150,8 @@ _native_unbind_cb(void *data EINA_UNUSED, void *image)
}
static void
-_native_free_cb(void *data, void *image)
+_native_free_cb(void *data EINA_UNUSED, void *image)
{
- Render_Engine *re = data;
Evas_GL_Image *im = image;
Native *n = im->native.data;
uint32_t pmid, texid;
@@ -2167,14 +2164,14 @@ _native_free_cb(void *data, void *image)
if (n->ns.type == EVAS_NATIVE_SURFACE_X11)
{
pmid = n->ns_data.x11.pixmap;
- eina_hash_del(eng_get_ob(re)->gl_context->shared->native_pm_hash,
&pmid, im);
+ eina_hash_del(im->native.shared->native_pm_hash, &pmid, im);
#ifdef GL_GLES
if (n->ns_data.x11.surface)
{
int err;
if (glsym_eglDestroyImage)
{
- glsym_eglDestroyImage(eng_get_ob(re)->egl_disp,
+ glsym_eglDestroyImage(im->native.disp,
n->ns_data.x11.surface);
if ((err = eglGetError()) != EGL_SUCCESS)
{
@@ -2193,7 +2190,7 @@ _native_free_cb(void *data, void *image)
{
if (glsym_glXReleaseTexImage)
{
- glsym_glXReleaseTexImage(eng_get_ob(re)->disp,
(XID)n->ns_data.x11.surface,
+ glsym_glXReleaseTexImage(im->native.disp,
(XID)n->ns_data.x11.surface,
GLX_FRONT_LEFT_EXT);
}
else
@@ -2201,7 +2198,7 @@ _native_free_cb(void *data, void *image)
}
if (glsym_glXDestroyPixmap)
{
- glsym_glXDestroyPixmap(eng_get_ob(re)->disp,
(XID)n->ns_data.x11.surface);
+ glsym_glXDestroyPixmap(im->native.disp,
(XID)n->ns_data.x11.surface);
GLERRV("glsym_glXDestroyPixmap");
}
else
@@ -2214,18 +2211,18 @@ _native_free_cb(void *data, void *image)
else if (n->ns.type == EVAS_NATIVE_SURFACE_OPENGL)
{
texid = n->ns.data.opengl.texture_id;
- eina_hash_del(eng_get_ob(re)->gl_context->shared->native_tex_hash,
&texid, im);
+ eina_hash_del(im->native.shared->native_tex_hash, &texid, im);
}
else if (n->ns.type == EVAS_NATIVE_SURFACE_TBM)
[EGIT] [core/efl] master 01/03: edje: add fixed automatically for optimizing edje calc speed.
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=264ccb13ede2b90bf4f760a88c0eafc8b3ff954a
commit 264ccb13ede2b90bf4f760a88c0eafc8b3ff954a
Author: Hosang Kim
Date: Thu Mar 17 11:12:34 2016 -0700
edje: add fixed automatically for optimizing edje calc speed.
Summary:
Applications usually use edje syntax like as,
```
part { name :"bg";
type: SWALLOW;
description {
state: "default" 0.0;
rel1.relative: 0.0 0.0;
rel2.relative: 0.0 0.0;
align: 0.0 0.0;
min: 100 100;
}
}
```
But edje does not calculate it exactly without "fixed: 1 1".
So edje calculation is repeated until 4000 x 4000, it is waste of time.
Reviewers: woohyun, raster, Hermet, id213sin, cedric
Reviewed By: cedric
Subscribers: cedric, jpeg
Differential Revision: https://phab.enlightenment.org/D3801
Signed-off-by: Cedric BAIL
---
src/lib/edje/edje_calc.c | 21 +
1 file changed, 21 insertions(+)
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index d8c607f..57de6a4 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -2725,6 +2725,7 @@ _edje_part_recalc_single(Edje *ed,
Edje_Color_Class *cc = NULL;
Edje_Internal_Aspect apref;
int minw = 0, minh = 0, maxw = 0, maxh = 0;
+ Eina_Bool fixedw = EINA_FALSE, fixedh = EINA_FALSE;
FLOAT_T sc;
sc = DIV(ed->scale, ed->file->base_scale);
@@ -2742,6 +2743,26 @@ _edje_part_recalc_single(Edje *ed,
/* size step */
_edje_part_recalc_single_step(desc, params);
+ /* check whether this part has fixed value or not*/
+ if ((rel1_to_x == rel2_to_x) &&
+ (desc->rel1.relative_x == desc->rel2.relative_x) &&
+ (!chosen_desc->fixed.w))
+ {
+chosen_desc->fixed.w = 1;
+fixedw = EINA_TRUE;
+ }
+
+ if ((rel1_to_y == rel2_to_y) &&
+ (desc->rel1.relative_y == desc->rel2.relative_y) &&
+ (!chosen_desc->fixed.h))
+ {
+chosen_desc->fixed.h = 1;
+fixedh = EINA_TRUE;
+ }
+ if (fixedw || fixedh)
+ ERR("file %s, group %s has a non-fixed part '%s'. You should add 'fixed:
%d %d'. But in order to optimize the edje calc, we add it
automatically.",ed->path, ed->group, ep->part->name, fixedw, fixedh);
+
+
/* colors */
if (ep->part->type != EDJE_PART_TYPE_SPACER)
{
--
[EGIT] [tools/eflete] master 16/34: group_navigator: expand programs by default
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=031ba6bf71149c48985d77c56bb7ffed818b7b3c
commit 031ba6bf71149c48985d77c56bb7ffed818b7b3c
Author: Vitalii Vorobiov
Date: Wed Mar 16 12:22:11 2016 +0200
group_navigator: expand programs by default
---
src/bin/ui/workspace/group_navigator.c | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/bin/ui/workspace/group_navigator.c
b/src/bin/ui/workspace/group_navigator.c
index 25a6654..0bacd23 100644
--- a/src/bin/ui/workspace/group_navigator.c
+++ b/src/bin/ui/workspace/group_navigator.c
@@ -1897,7 +1897,10 @@ group_navigator_add(Evas_Object *parent, Group *group)
if (group->main_group)
elm_object_disabled_set(pl->layout, true);
else
- elm_genlist_item_expanded_set(pl->parts_caption_item, true);
+ {
+elm_genlist_item_expanded_set(pl->parts_caption_item, true);
+elm_genlist_item_expanded_set(pl->programs_caption_item, true);
+ }
TODO("Add deletion callback and free resources");
return pl->layout;
--
[EGIT] [tools/eflete] master 21/34: workspace: set the default container size
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=7240082faf5813dbb61608df1c322e934a6b8d64 commit 7240082faf5813dbb61608df1c322e934a6b8d64 Author: Vyacheslav Reutskiy Date: Wed Mar 16 13:43:25 2016 +0200 workspace: set the default container size Change-Id: Icd11dccd2811464162c4d68b2f56c87e98cb --- src/bin/ui/workspace/workspace.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/bin/ui/workspace/workspace.c b/src/bin/ui/workspace/workspace.c index d48c620..1ef182a 100644 --- a/src/bin/ui/workspace/workspace.c +++ b/src/bin/ui/workspace/workspace.c @@ -496,6 +496,7 @@ _scroll_area_add(Workspace_Data *wd, Scroll_Area *area, Eina_Bool scale_rel) container_handler_size_set(area->container, 8, 8); evas_object_smart_callback_add(area->container, "container,changed", _container_changed, wd); elm_object_content_set(area->scroller, area->container); + container_container_size_set(area->container, 350, 350); } static void @@ -807,6 +808,7 @@ workspace_add(Evas_Object *parent, Group *group) wd->normal.content = groupview_add(wd->normal.scroller, group); container_content_set(wd->normal.container, wd->normal.content); _container_hints_set(wd); + container_protrusion_func_set(wd->normal.container, groupview_protrusion_get); evas_object_smart_callback_add(wd->normal.content, SIGNAL_GROUPVIEW_CLICKED, _groupview_clicked, wd); evas_object_smart_callback_add(wd->normal.content, SIGNAL_GROUPVIEW_HL_PART_DRAG_START, _groupview_hl_part_drag_start, wd); --
[EGIT] [core/enlightenment] master 03/05: do not update client coords on csd geom update if it would change the zone
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=bd0f2595b3fb96f1672edf78196c943fcaec4729
commit bd0f2595b3fb96f1672edf78196c943fcaec4729
Author: Mike Blumenkrantz
Date: Thu Mar 17 13:35:50 2016 -0400
do not update client coords on csd geom update if it would change the zone
in the case where a client is at 0,0 relative to a zone, changing the coords
in this case will result in the client moving out of the zone by the size
of the
csd
---
src/bin/e_comp_object.c | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index dd88bf2..18e09d3 100644
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -3053,8 +3053,12 @@ e_comp_object_frame_geometry_set(Evas_Object *obj, int
l, int r, int t, int b)
{
if ((calc || (!e_client_has_xwindow(cw->ec))) && cw->client_inset.calc)
{
- cw->ec->x -= l - cw->client_inset.l;
- cw->ec->y -= t - cw->client_inset.t;
+ E_Zone *zone = e_comp_object_util_zone_get(obj);
+
+ if (cw->ec->x != zone->x)
+ cw->ec->x -= l - cw->client_inset.l;
+ if (cw->ec->y != zone->y)
+ cw->ec->y -= t - cw->client_inset.t;
}
cw->ec->changes.pos = cw->ec->changes.size = 1;
EC_CHANGED(cw->ec);
--
[EGIT] [core/enlightenment] master 05/05: use agent objects for maximize effects
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=b366d8bfb1b6fc77b7eb41dfe5e982b190d75de3
commit b366d8bfb1b6fc77b7eb41dfe5e982b190d75de3
Author: Mike Blumenkrantz
Date: Thu Mar 17 13:39:09 2016 -0400
use agent objects for maximize effects
this fixes maximize effects on csd windows by providing an object which
will return usable geometry with evas_object_geometry_get()
---
src/bin/e_client.c | 12 +---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index c7e270d..1e125b2 100644
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -1545,18 +1545,24 @@ _e_client_cb_evas_restack(void *data, Evas *e
EINA_UNUSED, Evas_Object *obj EINA
static void
-_e_client_maximize_done(void *data, E_Efx_Map_Data *emd EINA_UNUSED,
Evas_Object *obj EINA_UNUSED)
+_e_client_maximize_done(void *data, E_Efx_Map_Data *emd EINA_UNUSED,
Evas_Object *obj)
{
E_Client *ec = data;
ec->maximize_override = 0;
+ evas_object_del(obj);
}
static void
_e_client_maximize_run(E_Client *ec, int x, int y, int w, int h)
{
if (e_config->window_maximize_animate && (!starting) &&
(!ec->changes.need_maximize))
- e_efx_resize(ec->frame, e_config->window_maximize_transition,
E_EFX_POINT(x, y),
- w, h, e_config->window_maximize_time, _e_client_maximize_done, ec);
+ {
+Evas_Object *agent;
+
+agent = e_comp_object_agent_add(ec->frame);
+e_efx_resize(agent, e_config->window_maximize_transition,
E_EFX_POINT(x, y),
+ w, h, e_config->window_maximize_time, _e_client_maximize_done, ec);
+ }
else
evas_object_geometry_set(ec->frame, x, y, w, h);
}
--
[EGIT] [editors/vim-configs] master 02/03: syntax/eo: add support for @auto
jayji pushed a commit to branch master.
http://git.enlightenment.org/editors/vim-configs.git/commit/?id=5ca00174dc3801afa747bf94ba30178efe1843b9
commit 5ca00174dc3801afa747bf94ba30178efe1843b9
Author: Jean Guyomarc'h
Date: Thu Mar 17 00:00:38 2016 +0100
syntax/eo: add support for @auto
---
syntax/eo.vim | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/syntax/eo.vim b/syntax/eo.vim
index 032d6cc..88a9e91 100644
--- a/syntax/eo.vim
+++ b/syntax/eo.vim
@@ -24,7 +24,7 @@ syn keywordeoStatements return
" syn match className "\(\w\+\.\)\+\w\+"
-syn match attributes
"@\(inout\|out\|in\|property\|class\|free\|constructor\|virtual\|extern\|beta\|protected\|const\|optional\|nullable\|warn_unused\|private\|hot\)"
+syn match attributes
"@\(inout\|out\|in\|property\|class\|free\|constructor\|virtual\|auto\|extern\|beta\|protected\|const\|optional\|nullable\|warn_unused\|private\|hot\)"
syn match eoLabelMatch "\w\+:" contains=eoClassBodyLabels
syn match eoBlockOpener "\w\+\s*{"
contains=eoClassBodyBlockOpener,eoInnerBlockOpener
--
[EGIT] [website/www-content] master 02/10: Wiki page basic_concepts changed with summary [fix typo] by Jee-Yong Um
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=49d10f15bd4f1f720bb2ca521e51724d9e79c739 commit 49d10f15bd4f1f720bb2ca521e51724d9e79c739 Author: Jee-Yong Um Date: Wed Mar 9 01:09:47 2016 -0800 Wiki page basic_concepts changed with summary [fix typo] by Jee-Yong Um --- pages/program_guide/edje/basic_concepts.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pages/program_guide/edje/basic_concepts.txt b/pages/program_guide/edje/basic_concepts.txt index 4450422..c64d9e1 100644 --- a/pages/program_guide/edje/basic_concepts.txt +++ b/pages/program_guide/edje/basic_concepts.txt @@ -320,8 +320,8 @@ move. With this, the pixel addressed through ''relative: 0.75 0.75; offset: 0 This comes from a design choice in Evas and Edje which favor simplicity. In the examples shown in this guide, there are 4 pixels and therefore when the ''[0; 1)'' range is divided in 4, the result is ''[0; 0.25), [0.25; 0.50), -[0.50; 0.75), [0.75; 0.100)''. With Edje, the value used to refer to each -segment is the left bound and therefore, 0.75 refers to ''[0.75; 0.100)'', +[0.50; 0.75), [0.75; 1.00)''. With Edje, the value used to refer to each +segment is the left bound and therefore, 0.75 refers to ''[0.75; 1.00)'', i.e. the bottom-right pixel of the green rectangle and not the 3/4th one. The way to refer to the pixel right before is to set the ''rel2'' bound to --
[EGIT] [website/www-content] master 03/10: Wiki page newsdata changed with summary [] by Mike Blumenkrantz
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=1c110ac08ce401c810ab0b03fc6330ff998b2d93 commit 1c110ac08ce401c810ab0b03fc6330ff998b2d93 Author: Mike Blumenkrantz Date: Wed Mar 9 09:42:33 2016 -0800 Wiki page newsdata changed with summary [] by Mike Blumenkrantz --- pages/news/newsdata.txt | 125 1 file changed, 125 insertions(+) diff --git a/pages/news/newsdata.txt b/pages/news/newsdata.txt index 4d3a0c5..87e4ee1 100644 --- a/pages/news/newsdata.txt +++ b/pages/news/newsdata.txt @@ -1,3 +1,128 @@ +== Enlightenment DR 0.20.6 Release == + + * anchor: #20160309092513 + * head: Enlightenment DR 0.20.6 Release + * subtitle: is this thing on? + * link: /news/allnewsdata#20160309092513 + * start: 2016-03-09 + * stop: + * text: +This bugfix release improves on the 0.20.5 release and resolves a number of issues. +**Note:** Wayland >= 1.10 is now required. + +=Changes= +Carsten @raster Haitzler (2): + e - efm: fix op registry listener add and dont use eina_error + e xkbswitch: don't free layouts that are just pointed to in instances + +Chris @devilhorns Michael (6): + update mailmap addresses + update mailmap addresses + add prototype functions for missing wl_data_offer interface + add prototype function for missing wl_seat interface + add prototype functions for missing wl_data_source interface + don't have to hook the ecore_evas resize callback here as that should be handled by elm now + +Derek @ManMower Foreman (20): + Ensure wayland clients haven't been deleted when processing callbacks + Remove wayland frame callbacks from subsurface cache on destruction + Fix xdg-shell destructors + Protect the wayland frame callback list from corruption + Use eina_list_merge instead of eina_list_move for wayland lists + Move pixmap free to client free from client destroy + Bump wayland version requirement + Remove wayland focus timer in delete callback + Add a NULL check in native_surface_init under wayland + Render deleted objects as long as they still have a pixmap + Track whether objects are on the post_updates list or not + Take an extra reference on wayland clients + Don't allow deleted wayland clients to set the cursor + Track whether a render is in progress or not + Rework wayland buffer handling + Remove wayland buffer reference + Re-enable window close animations for wayland + Stop copying all wayland buffers + Don't use e_pixmap_image_data_argb_convert for wayland images + Remove argb_convert for wayland buffers + +Mike @zmike Blumenkrantz (42): + clamp minimum shelf size to 20px in shelf config + do not perform special case position adjustment for re_manage clients + do not clamp comp object input regions to 0,0 + improve enforcement of shelf autohide-related window adjustment + reshuffle x11 comp init to cleanup on failure cases + pre-remove pixmap from x11 clients during del hook + enable comp object image data refresh if a dirty call is made with no damages + redo wayland pixmap ids to use monotonic decreasing ints with no collisions + remove some unused variables + make bgpreview create vdesk config dialog on mouse up instead of mouse down + do not decrement e_comp->new_clients for non-new clients during _e_client_eval + update winlist ui when using directional window selection + force changed when adding or removing keyboard layouts in config + disable emotion_shutdown during shutdown procedure + use strbufs instead of strcat in fwin navbars + do not set XCURSOR_PATH variable if re-setting existing value + remove security hole in e_start_main + remove DISPLAY usage from E_IPC_SOCKET value + remove multihead env var setting in e_exec + strcpy -> strncpy in evry files plugin + use strbuf instead of strcat in keybinding string synthesis + use strbuf instead of strcat in edgebinding string synthesis + use dblequal for double comparisons in edgebindings config + replace static buffer usage with binbuf in e_fm_ipc + prevent potential null deref during pager (plain) window drag + remove unused value in config profile saving + remove useless client_add handler in e_ipc + use uint instead of int for eina_list_count() return in cpufreq (trivial) + simplify static grab case statements + remove ipc command allowing arbitrary command execution by the compositor + simplify ipc socket creation + remove impossible null check in color dialog + do not add render updates during damage of deleted clients + don't directly use image data when creating a comp object mirror + Revert "send mouse out+in on desk flip end" + reject x11 client mouse-in events on
[EGIT] [core/efl] master 05/05: tests: Remove unused variables (evas_image)
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=72363b4777e3a6e67b22e7dbffcb430ed1f04be7
commit 72363b4777e3a6e67b22e7dbffcb430ed1f04be7
Author: Jean-Philippe Andre
Date: Fri Mar 18 13:53:39 2016 +0900
tests: Remove unused variables (evas_image)
---
src/tests/evas/evas_test_image.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/tests/evas/evas_test_image.c b/src/tests/evas/evas_test_image.c
index ca7e9e9..3414fb2 100644
--- a/src/tests/evas/evas_test_image.c
+++ b/src/tests/evas/evas_test_image.c
@@ -631,8 +631,7 @@ START_TEST(evas_object_image_defaults)
{
Evas *e = _setup_evas();
Evas_Object *o;
- int x, y, w, h, iw, ih;
- Eina_Bool b;
+ int x, y, w, h;
/* test legacy defaults */
o = evas_object_image_add(e);
--
[EGIT] [core/efl] master 02/06: eina_cxx: Add specialized eina::iterator for Eo* wrappers
vitorsousa pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=fd0cf8b76459da70e2ef0116b19a322913cc92bb
commit fd0cf8b76459da70e2ef0116b19a322913cc92bb
Author: Vitor Sousa
Date: Tue Dec 1 17:25:11 2015 -0200
eina_cxx: Add specialized eina::iterator for Eo* wrappers
Add specialization of eina::iterator for Eo* C++ wrappers.
Specialize ibegin/iend methods in eina::list and eina::array of
Eo* wrappers to use the new eina::iterator.
Add unit test.
---
src/bindings/eina_cxx/eina_array.hh | 26 +
src/bindings/eina_cxx/eina_iterator.hh | 86 +++-
src/bindings/eina_cxx/eina_list.hh | 24
src/tests/eina_cxx/eina_cxx_test_iterator.cc | 31 ++
4 files changed, 165 insertions(+), 2 deletions(-)
diff --git a/src/bindings/eina_cxx/eina_array.hh
b/src/bindings/eina_cxx/eina_array.hh
index d352de5..7c8e798 100644
--- a/src/bindings/eina_cxx/eina_array.hh
+++ b/src/bindings/eina_cxx/eina_array.hh
@@ -415,6 +415,32 @@ public:
{
return rend();
}
+ eina::iterator ibegin()
+ {
+return _eo_array_access_traits::ibegin(this->_impl._array);
+ }
+ eina::iterator iend()
+ {
+return _eo_array_access_traits::iend(this->_impl._array);
+ }
+
+ eina::iterator ibegin() const
+ {
+return _eo_array_access_traits::ibegin(this->_impl._array);
+ }
+
+ eina::iterator iend() const
+ {
+return _eo_array_access_traits::iend(this->_impl._array);
+ }
+ eina::iterator cibegin() const
+ {
+return _eo_array_access_traits::cibegin(this->_impl._array);
+ }
+ eina::iterator ciend() const
+ {
+return _eo_array_access_traits::ciend(this->_impl._array);
+ }
using _base_type::swap;
using _base_type::max_size;
diff --git a/src/bindings/eina_cxx/eina_iterator.hh
b/src/bindings/eina_cxx/eina_iterator.hh
index 9518cf4..81eb2ee 100644
--- a/src/bindings/eina_cxx/eina_iterator.hh
+++ b/src/bindings/eina_cxx/eina_iterator.hh
@@ -3,6 +3,8 @@
#include
+#include
+
#include
#include
@@ -128,8 +130,9 @@ protected:
* automatically take care of allocating a deallocating resources using
* the RAII programming idiom.
*/
-template
-struct iterator : _common_iterator_base
+template
+struct iterator
+ : _common_iterator_base::value, T const>::type>
{
private:
typedef _common_iterator_base base_type; /**< Type for the base
class. */
@@ -204,6 +207,85 @@ public:
}
};
+template
+struct iterator::value, void>::type>
+ : _common_iterator_base
+{
+private:
+ typedef _common_iterator_base base_type; /**< Type for the base
class. */
+ typename base_type::pointer _value; /**< @internal */
+ typedef iterator self_type; /**< Type for the specialized iterator
itself. */
+public:
+ typedef typename base_type::value_type value_type; /**< Type for elements
returned by the iterator. */
+ typedef typename base_type::pointer pointer; /**< Type for a pointer to an
element. */
+ typedef typename base_type::reference reference; /**< Type for a reference
to an element. */
+ typedef typename base_type::difference_type difference_type; /**< Type to
represent the distance between two iterators. */
+ typedef typename base_type::iterator_category iterator_category; /**<
Defines the iterator category as the same of the base class. */
+
+ /**
+ * @brief Creates a iterator wrapping the given native @c Eina_Iterator
handle.
+ *
+ * This constructor creates an iterator that wraps the given native
+ * @c Eina_Iterator handle, providing an OOP interface to it.
+ */
+ explicit iterator(Eina_Iterator* iterator_ = 0)
+: base_type(iterator_)
+ {
+if(this->_iterator)
+ ++*this;
+ }
+
+
+ /**
+ * @brief Move the iterator to the next position.
+ * @return The iterator itself.
+ *
+ * This operator increments the iterator, making it point to the
+ * position right after the current one.
+ * At the end, it returns a reference to itself.
+ */
+ self_type& operator++()
+ {
+void* data;
+Eina_Bool r = ::eina_iterator_next(this->_iterator, &data);
+if(!r)
+ this->_iterator = 0;
+_value = static_cast(data);
+return *this;
+ }
+
+ /**
+ * @brief Move the iterator to the next position.
+ * @return The iterator itself.
+ *
+ * Works exactly like @ref operator++().
+ */
+ self_type& operator++(int)
+ {
+return ++**this;
+ }
+
+ /**
+ * @brief Get a reference to the element currently pointed by the iterator.
+ * @return Reference to the current element.
+ */
+ T const& operator*() const
+ {
+// relies on layout compatibility between eo::concrete and Eo*
+return *reinterpret_cast(&_value);
+ }
+
+ /**
+ * @brief Return a pointer to the current element, which member will be
accessed.
+ * @return Pointer to the element currently pointed by the iterator.
+ */
+ T const* operator->() const
+ {
+// relies on layout compatibility between eo::concrete and
[EGIT] [core/enlightenment] master 01/01: remove wl selection hacks from f0ba92d39e1f6631974d53100dcbb4cc040a8241
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=510d05d8d3bd0c8f43d88478b6c4c7085e108b5a
commit 510d05d8d3bd0c8f43d88478b6c4c7085e108b5a
Author: Mike Blumenkrantz
Date: Thu Mar 17 15:15:27 2016 -0400
remove wl selection hacks from f0ba92d39e1f6631974d53100dcbb4cc040a8241
https://gfycat.com/ChiefDeafeningGull
---
src/bin/e_comp_wl_data.c | 13 -
1 file changed, 13 deletions(-)
diff --git a/src/bin/e_comp_wl_data.c b/src/bin/e_comp_wl_data.c
index 7f2c967..d71d3aa 100644
--- a/src/bin/e_comp_wl_data.c
+++ b/src/bin/e_comp_wl_data.c
@@ -245,19 +245,6 @@ _e_comp_wl_data_device_selection_set(void *data
EINA_UNUSED, E_Comp_Wl_Data_Sour
sel_source = (E_Comp_Wl_Data_Source*)e_comp_wl->selection.data_source;
- if ((sel_source) &&
- (e_comp_wl->selection.serial - serial < UINT32_MAX / 2))
- {
-/* TODO: elm_entry is sending too many request on now,
- * for those requests, selection.signal is being emitted also a lot.
- * when it completes to optimize the entry, it should be checked more.
- */
-if (e_comp_wl->clipboard.source)
- wl_signal_emit(&e_comp_wl->selection.signal, e_comp->wl_comp_data);
-
-return;
- }
-
if (sel_source)
{
if (sel_source->cancelled)
--
[EGIT] [tools/eflete] master 10/34: UTC: update change tests
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=5cf38647a16d3537d25e0ec89335b9a9286f99c6
commit 5cf38647a16d3537d25e0ec89335b9a9286f99c6
Author: Andrii Kroitor
Date: Wed Mar 16 11:49:41 2016 +0200
UTC: update change tests
change function prototypes
functions shouldn't return false
---
tests/test_change/change_diff_add.c | 24
tests/test_change/change_diff_merge_add.c | 4 ++--
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/tests/test_change/change_diff_add.c
b/tests/test_change/change_diff_add.c
index 6241dad..eef4202 100644
--- a/tests/test_change/change_diff_add.c
+++ b/tests/test_change/change_diff_add.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 == 42);
@@ -52,14 +52,14 @@ _function_type_int_redo_return_true(Evas_Object *obj, int
val)
return true;
}
-static int _function_type_int_redo_return_false_called = 0;
+static int _function_type_int_redo_return_true2_called = 0;
static Eina_Bool
-_function_type_int_redo_return_false(Evas_Object *obj, int val)
+_function_type_int_redo_return_true2(Evas_Object *obj, Change *change
__UNUSED__, Eina_Bool merge __UNUSED__, int val)
{
ck_assert(obj == pseudo_object);
ck_assert(val == 24);
- _function_type_int_redo_return_false_called++;
- return false;
+ _function_type_int_redo_return_true2_called++;
+ return true;
}
/**
@@ -72,7 +72,7 @@ _function_type_int_redo_return_false(Evas_Object *obj, int
val)
* @precondition
* @step 1 init eina
* @step 2 add change
- * @step 3 create two diffs. second diff should have redo function returning
false
+ * @step 3 create two diffs.
*
* @procedure
* @step 1 add one diff with change_diff_add
@@ -83,9 +83,9 @@ _function_type_int_redo_return_false(Evas_Object *obj, int
val)
* @step 6 add second diff
* @step 7 change_undo should return true
* @step 8 check that undo func was called twice more
- * @step 9 change_redo should return false
+ * @step 9 change_redo should return true
* @step 10 check that redo_true func was called once
- * @step 11 check that redo_false func was called once
+ * @step 11 check that redo_true2 func was called once
*
* change
* All checks passed
@@ -115,7 +115,7 @@ EFLETE_TEST (change_diff_add_test_p)
d2->undo.function = _function_type_int_undo_return_true;
d2->undo.args.type_i.i1 = 42;
d2->redo.type = FUNCTION_TYPE_INT;
- d2->redo.function = _function_type_int_redo_return_false;
+ d2->redo.function = _function_type_int_redo_return_true2;
d2->redo.args.type_i.i1 = 24;
change_diff_add(change, d1);
@@ -126,9 +126,9 @@ EFLETE_TEST (change_diff_add_test_p)
change_diff_add(change, d2);
ck_assert(change_undo(pseudo_object, change) == true);
ck_assert(_function_type_int_undo_return_true_called == 3);
- ck_assert(change_redo(pseudo_object, change) == false);
+ ck_assert(change_redo(pseudo_object, change) == true);
ck_assert(_function_type_int_redo_return_true_called == 2);
- ck_assert(_function_type_int_redo_return_false_called == 1);
+ ck_assert(_function_type_int_redo_return_true2_called == 1);
eina_shutdown();
}
END_TEST
diff --git a/tests/test_change/change_diff_merge_add.c
b/tests/test_change/change_diff_merge_add.c
index 33ccf79..48dbb22 100644
--- a/tests/test_change/change_diff_merge_add.c
+++ b/tests/test_change/change_diff_merge_add.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_re
[EGIT] [tools/eflete] master 11/34: UTC: rename new_history into history
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=d7e22d42658707666f1499bf79b0d03e925faa9a
commit d7e22d42658707666f1499bf79b0d03e925faa9a
Author: Andrii Kroitor
Date: Wed Mar 16 11:56:50 2016 +0200
UTC: rename new_history into history
---
tests/Makefile.am| 20 ++--
.../{test_new_history => test_history}/history_add.c | 4 ++--
.../history_change_add.c | 4 ++--
.../{test_new_history => test_history}/history_del.c | 4 ++--
.../history_undo_redo.c | 4 ++--
.../test_history.c} | 6 +++---
.../test_history.h} | 0
7 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index e5cba97..f1abb35 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -10,7 +10,7 @@ eflete_test \
alloc_test \
diff_test \
change_test \
-new_history_test \
+history_test \
logger_test \
project_manager_test \
config_test \
@@ -67,7 +67,7 @@ include_HEADERS = \
../tests/test_alloc/test_alloc.h \
../tests/test_diff/test_diff.h \
../tests/test_change/test_change.h \
- ../tests/test_new_history/test_new_history.h \
+ ../tests/test_history/test_history.h \
../tests/test_logger/test_logger.h \
../tests/test_project_manager/test_project_manager.h \
../tests/test_config/test_config.h \
@@ -165,14 +165,14 @@ change_test_SOURCES = \
change_test_CFLAGS = ${FLAGS}
change_test_LDADD = ${LD}
-new_history_test_SOURCES = \
-../tests/test_new_history/test_new_history.c \
-../tests/test_new_history/history_add.c \
-../tests/test_new_history/history_del.c \
-../tests/test_new_history/history_change_add.c \
-../tests/test_new_history/history_undo_redo.c
-new_history_test_CFLAGS = ${FLAGS}
-new_history_test_LDADD = ${LD}
+history_test_SOURCES = \
+../tests/test_history/test_history.c \
+../tests/test_history/history_add.c \
+../tests/test_history/history_del.c \
+../tests/test_history/history_change_add.c \
+../tests/test_history/history_undo_redo.c
+history_test_CFLAGS = ${FLAGS}
+history_test_LDADD = ${LD}
logger_test_SOURCES = \
../tests/test_logger/test_logger.c \
diff --git a/tests/test_new_history/history_add.c
b/tests/test_history/history_add.c
similarity index 95%
rename from tests/test_new_history/history_add.c
rename to tests/test_history/history_add.c
index fb71995..8494afb 100644
--- a/tests/test_new_history/history_add.c
+++ b/tests/test_history/history_add.c
@@ -17,10 +17,10 @@
* along with this program; If not, see www.gnu.org/licenses/lgpl.html.
*/
-#include "test_new_history.h"
+#include "test_history.h"
/**
- * @addtogroup new_history_test
+ * @addtogroup history_test
* @{
* @addtogroup history_add
* @{
diff --git a/tests/test_new_history/history_change_add.c
b/tests/test_history/history_change_add.c
similarity index 96%
rename from tests/test_new_history/history_change_add.c
rename to tests/test_history/history_change_add.c
index c41ece3..be6cd8c 100644
--- a/tests/test_new_history/history_change_add.c
+++ b/tests/test_history/history_change_add.c
@@ -17,10 +17,10 @@
* along with this program; If not, see www.gnu.org/licenses/lgpl.html.
*/
-#include "test_new_history.h"
+#include "test_history.h"
/**
- * @addtogroup new_history_test
+ * @addtogroup history_test
* @{
* @addtogroup history_change_add
* @{
diff --git a/tests/test_new_history/history_del.c
b/tests/test_history/history_del.c
similarity index 97%
rename from tests/test_new_history/history_del.c
rename to tests/test_history/history_del.c
index 8e4e6a3..2676206 100644
--- a/tests/test_new_history/history_del.c
+++ b/tests/test_history/history_del.c
@@ -17,10 +17,10 @@
* along with this program; If not, see www.gnu.org/licenses/lgpl.html.
*/
-#include "test_new_history.h"
+#include "test_history.h"
/**
- * @addtogroup new_history_test
+ * @addtogroup history_test
* @{
* @addtogroup history_del
* @{
diff --git a/tests/test_new_history/history_undo_redo.c
b/tests/test_history/history_undo_redo.c
similarity index 98%
rename from tests/test_new_history/history_undo_redo.c
rename to tests/test_history/history_undo_redo.c
index 68ea885..42b7967 100644
--- a/tests/test_new_history/history_undo_redo.c
+++ b/tests/test_history/history_undo_redo.c
@@ -17,10 +17,10 @@
* along with this program; If not, see www.gnu.org/licenses/lgpl.html.
*/
-#include "test_new_history.h"
+#include "test_history.h"
/**
- * @addtogroup new_history_test
+ * @addtogroup history_test
* @{
* @addtogroup history_undo_redo
* @{
diff --git a/tests/test_new_history/test_new_history.c
b/tests/test_history/test_history.c
similarity index 90%
rename from tests/test_new_history/test_new_history.c
rename to tests/test_history/test_history.c
index 7674ec9..c99a5a7 100644
--- a/tests/test_new_histor
[EGIT] [website/www-content] master 06/10: Wiki page newsdata changed with summary [] by Mike Blumenkrantz
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=5a4117be82416eab8b4bb667d8d10549e881e086 commit 5a4117be82416eab8b4bb667d8d10549e881e086 Author: Mike Blumenkrantz Date: Wed Mar 9 09:43:53 2016 -0800 Wiki page newsdata changed with summary [] by Mike Blumenkrantz --- pages/news/newsdata.txt | 125 1 file changed, 125 insertions(+) diff --git a/pages/news/newsdata.txt b/pages/news/newsdata.txt index f34b82a..c731182 100644 --- a/pages/news/newsdata.txt +++ b/pages/news/newsdata.txt @@ -1,5 +1,130 @@ == Enlightenment DR 0.20.6 Release == + * anchor: #20160309094333 + * head: Enlightenment DR 0.20.6 Release + * subtitle: is this thing on? + * link: /news/allnewsdata#20160309094333 + * start: 2016-03-09 + * stop: + * text: +This bugfix release improves on the 0.20.5 release and resolves a number of issues. +**Note:** Wayland >= 1.10 is now required. + +=Changes= +Carsten @raster Haitzler (2): + e - efm: fix op registry listener add and dont use eina_error + e xkbswitch: don't free layouts that are just pointed to in instances + +Chris @devilhorns Michael (6): + update mailmap addresses + update mailmap addresses + add prototype functions for missing wl_data_offer interface + add prototype function for missing wl_seat interface + add prototype functions for missing wl_data_source interface + don't have to hook the ecore_evas resize callback here as that should be handled by elm now + +Derek @ManMower Foreman (20): + Ensure wayland clients haven't been deleted when processing callbacks + Remove wayland frame callbacks from subsurface cache on destruction + Fix xdg-shell destructors + Protect the wayland frame callback list from corruption + Use eina_list_merge instead of eina_list_move for wayland lists + Move pixmap free to client free from client destroy + Bump wayland version requirement + Remove wayland focus timer in delete callback + Add a NULL check in native_surface_init under wayland + Render deleted objects as long as they still have a pixmap + Track whether objects are on the post_updates list or not + Take an extra reference on wayland clients + Don't allow deleted wayland clients to set the cursor + Track whether a render is in progress or not + Rework wayland buffer handling + Remove wayland buffer reference + Re-enable window close animations for wayland + Stop copying all wayland buffers + Don't use e_pixmap_image_data_argb_convert for wayland images + Remove argb_convert for wayland buffers + +Mike @zmike Blumenkrantz (42): + clamp minimum shelf size to 20px in shelf config + do not perform special case position adjustment for re_manage clients + do not clamp comp object input regions to 0,0 + improve enforcement of shelf autohide-related window adjustment + reshuffle x11 comp init to cleanup on failure cases + pre-remove pixmap from x11 clients during del hook + enable comp object image data refresh if a dirty call is made with no damages + redo wayland pixmap ids to use monotonic decreasing ints with no collisions + remove some unused variables + make bgpreview create vdesk config dialog on mouse up instead of mouse down + do not decrement e_comp->new_clients for non-new clients during _e_client_eval + update winlist ui when using directional window selection + force changed when adding or removing keyboard layouts in config + disable emotion_shutdown during shutdown procedure + use strbufs instead of strcat in fwin navbars + do not set XCURSOR_PATH variable if re-setting existing value + remove security hole in e_start_main + remove DISPLAY usage from E_IPC_SOCKET value + remove multihead env var setting in e_exec + strcpy -> strncpy in evry files plugin + use strbuf instead of strcat in keybinding string synthesis + use strbuf instead of strcat in edgebinding string synthesis + use dblequal for double comparisons in edgebindings config + replace static buffer usage with binbuf in e_fm_ipc + prevent potential null deref during pager (plain) window drag + remove unused value in config profile saving + remove useless client_add handler in e_ipc + use uint instead of int for eina_list_count() return in cpufreq (trivial) + simplify static grab case statements + remove ipc command allowing arbitrary command execution by the compositor + simplify ipc socket creation + remove impossible null check in color dialog + do not add render updates during damage of deleted clients + don't directly use image data when creating a comp object mirror + Revert "send mouse out+in on desk flip end" + reject x11 client mouse-in events on
[EGIT] [tools/eflete] master 29/34: demo_group: update item and demo_part structure on part rename
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=dc303dca61c07f71295a7ef870f4cb429c06945e
commit dc303dca61c07f71295a7ef870f4cb429c06945e
Author: Vitalii Vorobiov
Date: Thu Mar 17 12:56:54 2016 +0200
demo_group: update item and demo_part structure on part rename
Fixes T3233
---
src/bin/ui/tabs.c | 1 -
src/bin/ui/workspace/demo_group.c | 56 +++
2 files changed, 56 insertions(+), 1 deletion(-)
diff --git a/src/bin/ui/tabs.c b/src/bin/ui/tabs.c
index c9e6620..ef49dc2 100644
--- a/src/bin/ui/tabs.c
+++ b/src/bin/ui/tabs.c
@@ -338,7 +338,6 @@ _part_renamed(void *data __UNUSED__,
part = pm_resource_unsorted_get(tabs.current_group->parts, ren->old_name);
gm_part_rename(part, ren->new_name);
workspace_group_navigator_update_part(tabs.current_workspace, part);
- TODO("update live_view here");
}
static void
diff --git a/src/bin/ui/workspace/demo_group.c
b/src/bin/ui/workspace/demo_group.c
index b9b640d..6e0b47d 100644
--- a/src/bin/ui/workspace/demo_group.c
+++ b/src/bin/ui/workspace/demo_group.c
@@ -220,6 +220,61 @@ _content_get(void *data __UNUSED__,
return button;
}
+static void
+_part_renamed(void *data,
+ Evas_Object *obj __UNUSED__,
+ void *ei)
+{
+ Rename *ren = ei;
+ Eina_List *l;
+ Demo_Part *demo_part;
+ Part_Demo_List *pl = data;
+
+ Elm_Object_Item *part_item, *list_item = NULL;
+ const Eina_List *part_items;
+ Demo_Part *pr;
+
+ assert(ren != NULL);
+
+ EINA_LIST_FOREACH(pl->text_list, l, demo_part)
+ {
+if (demo_part->name == ren->old_name)
+ {
+ eina_stringshare_del(demo_part->name);
+ demo_part->name = eina_stringshare_add(ren->new_name);
+
+ list_item = pl->it_text;
+ }
+ }
+
+ /* didn't found genlist item in text, search inside of swallow list */
+ if (!list_item)
+ {
+EINA_LIST_FOREACH(pl->swallow_list, l, demo_part)
+ {
+ if (demo_part->name == ren->old_name)
+ {
+ eina_stringshare_del(demo_part->name);
+ demo_part->name = eina_stringshare_add(ren->new_name);
+ list_item = pl->it_swallow;
+ }
+ }
+ }
+
+ elm_genlist_item_expanded_set(list_item, true);
+ part_items = elm_genlist_item_subitems_get(list_item);
+ part_item = eina_list_data_get(part_items);
+ pr = elm_object_item_data_get(part_item);
+ while (pr != demo_part)
+ {
+part_items = eina_list_next(part_items);
+part_item = eina_list_data_get(part_items);
+pr = elm_object_item_data_get(part_item);
+assert(pr != NULL);
+ }
+ elm_genlist_item_update(part_item);
+}
+
Evas_Object *
demo_group_add(Group *group)
{
@@ -285,6 +340,7 @@ demo_group_add(Group *group)
elm_scroller_policy_set(pl->genlist, ELM_SCROLLER_POLICY_OFF,
ELM_SCROLLER_POLICY_AUTO);
evas_object_show(pl->genlist);
elm_object_content_set(pl->layout, pl->genlist);
+ evas_object_smart_callback_add(ap.win, SIGNAL_PART_RENAMED, _part_renamed,
pl);
evas_object_smart_callback_add(pl->genlist, "clicked,double",
_on_clicked_double, pl);
evas_object_smart_callback_add(pl->genlist, "expand,request",
_expand_request_cb, pl);
evas_object_smart_callback_add(pl->genlist, "contract,request",
_contract_request_cb, pl);
--
[EGIT] [core/efl] master 03/06: Evas: Improve EVAS_OBJECT_LEGACY_API a bit more
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=edafd4ec34629d8200b04e4fda074ac0f5dadf92
commit edafd4ec34629d8200b04e4fda074ac0f5dadf92
Author: Jean-Philippe Andre
Date: Wed Mar 16 19:36:19 2016 +0900
Evas: Improve EVAS_OBJECT_LEGACY_API a bit more
This now calls EINA_SAFETY_ERROR which makes it easy to then
break inside _eina_legacy_error.
---
src/lib/evas/include/evas_private.h | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/lib/evas/include/evas_private.h
b/src/lib/evas/include/evas_private.h
index ceee4a7..48b0b0b 100644
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -579,7 +579,8 @@ MAGIC_CHECK_FAILED(o, t, m)
do { Evas_Object_Protected_Data *_o = eo_data_scope_get(_eo,
EVAS_OBJECT_CLASS); \
if (EINA_UNLIKELY(!_o)) return __VA_ARGS__; \
if (EINA_UNLIKELY(!_o->legacy)) { \
- ERR("Calling legacy function '%s' on EO object '%s' is not
permitted!", __FUNCTION__, eo_class_name_get(_o->object)); \
+ char buf[1024]; snprintf(buf, sizeof(buf), "Calling legacy API on EO
object '%s' is not permitted!", eo_class_name_get(_o->object)); \
+ EINA_SAFETY_ERROR(buf); \
return __VA_ARGS__; \
} } while (0)
#else
@@ -587,7 +588,8 @@ MAGIC_CHECK_FAILED(o, t, m)
do { Evas_Object_Protected_Data *_o = eo_data_scope_get(_eo,
EVAS_OBJECT_CLASS); \
if (EINA_UNLIKELY(!_o)) return __VA_ARGS__; \
if (EINA_UNLIKELY(!_o->legacy)) { \
- ERR("Calling legacy function '%s' on EO object '%s' is not
permitted!", __FUNCTION__, eo_class_name_get(_o->object)); \
+ char buf[1024]; snprintf(buf, sizeof(buf), "Calling legacy API on EO
object '%s' is not permitted!", eo_class_name_get(_o->object)); \
+ EINA_SAFETY_ERROR(buf); \
} } while (0)
#endif
--
[EGIT] [core/efl] master 03/06: eina_cxx: Add missing methods to Eina C++ wrappers
vitorsousa pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=c7550b2964e8f1c1cd9f51c7db573c5361f8cb10
commit c7550b2964e8f1c1cd9f51c7db573c5361f8cb10
Author: Vitor Sousa
Date: Wed Dec 9 15:32:04 2015 -0200
eina_cxx: Add missing methods to Eina C++ wrappers
Also fix release_native_handle type error on mutable ranges.
---
src/bindings/eina_cxx/eina_accessor.hh| 11 +++
src/bindings/eina_cxx/eina_iterator.hh| 16
src/bindings/eina_cxx/eina_list.hh| 2 ++
src/bindings/eina_cxx/eina_range_types.hh | 2 +-
4 files changed, 30 insertions(+), 1 deletion(-)
diff --git a/src/bindings/eina_cxx/eina_accessor.hh
b/src/bindings/eina_cxx/eina_accessor.hh
index d084918..800c3fa 100644
--- a/src/bindings/eina_cxx/eina_accessor.hh
+++ b/src/bindings/eina_cxx/eina_accessor.hh
@@ -120,6 +120,17 @@ struct accessor_common_base
}
/**
+ * @brief Release the handle of the wrapped @c Eina_Accessor.
+ * @return Handle for the native @c Eina_Accessor.
+ */
+ Eina_Accessor* release_native_handle()
+ {
+auto h = _impl;
+_impl = nullptr;
+return h;
+ }
+
+ /**
* @brief Swap content between both objects.
* @param other Other accessor object.
*
diff --git a/src/bindings/eina_cxx/eina_iterator.hh
b/src/bindings/eina_cxx/eina_iterator.hh
index 81eb2ee..de04fd7 100644
--- a/src/bindings/eina_cxx/eina_iterator.hh
+++ b/src/bindings/eina_cxx/eina_iterator.hh
@@ -95,6 +95,22 @@ public:
return *this;
}
+
+ /**
+ * @brief Get the handle for the wrapped @c Eina_Iterator.
+ * @return Internal handle for the native Eina iterator.
+ *
+ * This member function returns the native @c Eina_Iterator handle
+ * that is wrapped inside this object.
+ *
+ * @warning It is important to take care when using it, since the
+ * handle will be automatically release upon object destruction.
+ */
+ Eina_Iterator* native_handle() const
+ {
+return _iterator;
+ }
+
protected:
/**
* @internal
diff --git a/src/bindings/eina_cxx/eina_list.hh
b/src/bindings/eina_cxx/eina_list.hh
index ae140b2..a47a7d7 100644
--- a/src/bindings/eina_cxx/eina_list.hh
+++ b/src/bindings/eina_cxx/eina_list.hh
@@ -511,6 +511,7 @@ public:
using _base_type::crend;
using _base_type::swap;
using _base_type::native_handle;
+ using _base_type::release_native_handle;
};
template
@@ -613,6 +614,7 @@ public:
}
using _base_type::swap;
using _base_type::native_handle;
+ using _base_type::release_native_handle;
friend bool operator==(range_list const& rhs, range_list const& lhs)
{
diff --git a/src/bindings/eina_cxx/eina_range_types.hh
b/src/bindings/eina_cxx/eina_range_types.hh
index 313ca05..4f05d73 100644
--- a/src/bindings/eina_cxx/eina_range_types.hh
+++ b/src/bindings/eina_cxx/eina_range_types.hh
@@ -276,7 +276,7 @@ struct _mutable_range_template : _const_range_template
{
auto h = _handle;
_handle = nullptr;
-return h;
+return const_cast(h);
}
/**
--
[EGIT] [core/efl] master 01/01: eina_file: move doc block about eina_file_path_join from inline to file.h
billiob pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=214883f0994a0a5a93412b211ca40051c9b4d704
commit 214883f0994a0a5a93412b211ca40051c9b4d704
Author: Boris Faure
Date: Sat Mar 19 15:55:21 2016 +0100
eina_file: move doc block about eina_file_path_join from inline to file.h
---
src/lib/eina/eina_file.h| 36 +++
src/lib/eina/eina_inline_file.x | 42 -
2 files changed, 36 insertions(+), 42 deletions(-)
diff --git a/src/lib/eina/eina_file.h b/src/lib/eina/eina_file.h
index 3e20bd0..7581676 100644
--- a/src/lib/eina/eina_file.h
+++ b/src/lib/eina/eina_file.h
@@ -709,6 +709,25 @@ EAPI Eina_Iterator *eina_file_map_lines(Eina_File *file);
*/
EAPI Eina_Bool eina_file_map_faulted(Eina_File *file, void *map);
+/**
+ * @brief Join two paths of known length.
+ *
+ * @param dst The buffer to store the result.
+ * @param size Size (in byte) of the buffer.
+ * @param a First path to use.
+ * @param a_len length of @p a.
+ * @param b Second path to use.
+ * @param b_len length of @p b.
+ * @return The number of characters printed.
+ *
+ * This function is similar to eina_str_join_len(), but the separator
+ * is '\' on Windows and '/' otherwise.
+ *
+ * @see eina_str_join_len()
+ * @see eina_file_path_join()
+ *
+ * @since 1.16
+ */
static inline size_t eina_file_path_join_len(char *dst,
size_t size,
const char *a,
@@ -716,6 +735,23 @@ static inline size_t eina_file_path_join_len(char *dst,
const char *b,
size_t b_len);
+/**
+ * @brief Join two paths of known length.
+ *
+ * @param dst The buffer to store the result.
+ * @param size Size (in byte) of the buffer.
+ * @param a First string to use.
+ * @param b Second string to use.
+ * @return The number of characters printed.
+ *
+ * This function is similar to eina_file_path_join_len(), but will compute
+ * the length of @p a and @p b using strlen(). The path separator is
+ * '\' on Windows and '/' otherwise.
+ *
+ * @see eina_file_path_join_len()
+ *
+ * @since 1.16
+ */
static inline size_t eina_file_path_join(char *dst,
size_t size,
const char *a,
diff --git a/src/lib/eina/eina_inline_file.x b/src/lib/eina/eina_inline_file.x
index d9dffdd..9e68f60 100644
--- a/src/lib/eina/eina_inline_file.x
+++ b/src/lib/eina/eina_inline_file.x
@@ -19,31 +19,6 @@
#ifndef EINA_FILE_INLINE_H_
#define EINA_FILE_INLINE_H_
-/**
- * @addtogroup Eina_File_Group File
- *
- * @{
- */
-
-/**
- * @brief Join two paths of known length.
- *
- * @param dst The buffer to store the result.
- * @param size Size (in byte) of the buffer.
- * @param a First path to use.
- * @param a_len length of @p a.
- * @param b Second path to use.
- * @param b_len length of @p b.
- * @return The number of characters printed.
- *
- * This function is similar to eina_str_join_len(), but the separator
- * is '\' on Windows and '/' otherwise.
- *
- * @see eina_str_join_len()
- * @see eina_file_path_join()
- *
- * @since 1.16
- */
static inline size_t
eina_file_path_join_len(char *dst,
size_t size,
@@ -55,23 +30,6 @@ eina_file_path_join_len(char *dst,
return eina_str_join_len(dst, size, EINA_PATH_SEP_C, a, a_len, b, b_len);
}
-/**
- * @brief Join two paths of known length.
- *
- * @param dst The buffer to store the result.
- * @param size Size (in byte) of the buffer.
- * @param a First string to use.
- * @param b Second string to use.
- * @return The number of characters printed.
- *
- * This function is similar to eina_file_path_join_len(), but will compute
- * the length of @p a and @p b using strlen(). The path separator is
- * '\' on Windows and '/' otherwise.
- *
- * @see eina_file_path_join_len()
- *
- * @since 1.16
- */
static inline size_t
eina_file_path_join(char *dst, size_t size, const char *a, const char *b)
{
--
[EGIT] [tools/eflete] master 19/34: popup: fix gengrid thumb style
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=91e57948fcba80a5ce80e7fb85dc94b20ea2b703
commit 91e57948fcba80a5ce80e7fb85dc94b20ea2b703
Author: Andrii Kroitor
Date: Wed Mar 16 14:42:53 2016 +0200
popup: fix gengrid thumb style
---
src/bin/ui/popup.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bin/ui/popup.c b/src/bin/ui/popup.c
index 6224564..4cf846b 100644
--- a/src/bin/ui/popup.c
+++ b/src/bin/ui/popup.c
@@ -553,8 +553,8 @@ _grid_content_get(void *data,
if (!strcmp(part, "elm.swallow.icon"))
{
image_obj = elm_thumb_add(grid);
+elm_object_style_set(image_obj, "noframe");
elm_thumb_file_set(image_obj, it->source, NULL);
-elm_thumb_reload(image_obj);
evas_object_show(image_obj);
}
else if (!strcmp(part, "elm.swallow.end"))
--
[EGIT] [apps/terminology] master 01/01: make terminology still compile with efl-1.8
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=ce8eda85e12596aff41ea6f28ed8b01cce25550f
commit ce8eda85e12596aff41ea6f28ed8b01cce25550f
Author: Boris Faure
Date: Sat Mar 19 16:11:15 2016 +0100
make terminology still compile with efl-1.8
---
src/bin/keyin.c | 5 +
1 file changed, 5 insertions(+)
diff --git a/src/bin/keyin.c b/src/bin/keyin.c
index deabe81..d08ac5b 100644
--- a/src/bin/keyin.c
+++ b/src/bin/keyin.c
@@ -373,8 +373,13 @@ cb_term_new(Evas_Object *termio_obj)
const char *template = "%s -d %s";
int length;
+#if (EFL_VERSION_MAJOR > 1) || (EFL_VERSION_MINOR >= 16)
eina_file_path_join(path, sizeof(path), elm_app_bin_dir_get(),
"terminology");
+#else
+ snprintf(path, sizeof(path), "%s/%s", elm_app_bin_dir_get(),
+"terminology");
+#endif
if (termio_cwd_get(termio_obj, cwd, sizeof(cwd)))
{
length = (strlen(path) + strlen(cwd) + strlen(template) - 3);
--
[EGIT] [core/efl] master 01/01: edje: do not emit selection, start twice when running select all
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=08d72bf85fc11f9f92364e69a8d04391c17ba292 commit 08d72bf85fc11f9f92364e69a8d04391c17ba292 Author: Mike Blumenkrantz Date: Thu Mar 17 14:14:32 2016 -0400 edje: do not emit selection,start twice when running select all @fix --- src/lib/edje/edje_entry.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/edje/edje_entry.c b/src/lib/edje/edje_entry.c index c724d9d..249fd11 100644 --- a/src/lib/edje/edje_entry.c +++ b/src/lib/edje/edje_entry.c @@ -3023,7 +3023,7 @@ _edje_entry_select_all(Edje_Real_Part *rp) _sel_clear(en->ed, en->cursor, rp->object, en); _curs_start(en->cursor, rp->object, en); - _sel_enable(en->ed, en->cursor, rp->object, en); + _edje_entry_imf_context_reset(en->rp); _sel_start(en->cursor, rp->object, en); _curs_end(en->cursor, rp->object, en); _sel_extend(en->ed, en->cursor, rp->object, en); --
[EGIT] [core/efl] master 01/01: edje_edit: program's source and signal CAN be NULL
furrymyad pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=e64c30caab0e9efe8636e1bb3702ef3e75339564 commit e64c30caab0e9efe8636e1bb3702ef3e75339564 Author: Vitalii Vorobiov Date: Fri Mar 18 14:00:51 2016 +0200 edje_edit: program's source and signal CAN be NULL Or else user can't remove them, only by writing source/signal like "" or some gibberish which is still getting interprettered as source and signal --- src/lib/edje/edje_edit.c | 4 1 file changed, 4 deletions(-) diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c index 3934392..05ed301 100644 --- a/src/lib/edje/edje_edit.c +++ b/src/lib/edje/edje_edit.c @@ -9674,8 +9674,6 @@ edje_edit_program_source_set(Evas_Object *obj, const char *prog, const char *sou GET_ED_OR_RETURN(EINA_FALSE); GET_EPR_OR_RETURN(EINA_FALSE); - if (!source) return EINA_FALSE; - /* Remove from program array */ _edje_program_remove(ed->collection, epr); @@ -9848,8 +9846,6 @@ edje_edit_program_signal_set(Evas_Object *obj, const char *prog, const char *sig GET_ED_OR_RETURN(EINA_FALSE); GET_EPR_OR_RETURN(EINA_FALSE); - if (!sig) return EINA_FALSE; - /* Remove from program array */ _edje_program_remove(ed->collection, epr); --
[EGIT] [website/www-content] master 07/10: Wiki page start-release changed with summary [E20.6] by Mike Blumenkrantz
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=7152791759dd2b353128b0e8053d1f96b16713d2 commit 7152791759dd2b353128b0e8053d1f96b16713d2 Author: Mike Blumenkrantz Date: Wed Mar 9 11:21:05 2016 -0800 Wiki page start-release changed with summary [E20.6] by Mike Blumenkrantz --- pages/start-release.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/start-release.txt b/pages/start-release.txt index 8396811..d95d01c 100644 --- a/pages/start-release.txt +++ b/pages/start-release.txt @@ -1,3 +1,3 @@ -EFL 1.17.0 and Enlightenment 0.20.5 are out - go to our [[download]] page. +EFL 1.17.0 and Enlightenment 0.20.6 are out - go to our [[download]] page. \ No newline at end of file --
[EGIT] [core/enlightenment] master 02/05: attempt to use left-aligned label text in wizard
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=ffdc31a8c213882b1b5610ee90571e33b4f1a03e
commit ffdc31a8c213882b1b5610ee90571e33b4f1a03e
Author: Mike Blumenkrantz
Date: Wed Mar 16 12:21:26 2016 -0400
attempt to use left-aligned label text in wizard
---
src/modules/wizard/page_065.c | 1 +
src/modules/wizard/page_170.c | 1 +
src/modules/wizard/page_180.c | 1 +
3 files changed, 3 insertions(+)
diff --git a/src/modules/wizard/page_065.c b/src/modules/wizard/page_065.c
index 7c3456e..88bf7ad 100644
--- a/src/modules/wizard/page_065.c
+++ b/src/modules/wizard/page_065.c
@@ -104,6 +104,7 @@ wizard_page_show(E_Wizard_Page *pg EINA_UNUSED)
elm_object_content_set(of, o);
ob = elm_label_add(o);
+ elm_object_style_set(ob, "default/left");
snprintf(buf, sizeof(buf), _("Enlightenment sets default mouse bindings for
objects."
"These bindings provide three operations on
click:"
"* Move (left button)"
diff --git a/src/modules/wizard/page_170.c b/src/modules/wizard/page_170.c
index e0663fe..5f23a1b 100644
--- a/src/modules/wizard/page_170.c
+++ b/src/modules/wizard/page_170.c
@@ -29,6 +29,7 @@ wizard_page_show(E_Wizard_Page *pg EINA_UNUSED)
elm_object_content_set(of, o);
ob = elm_label_add(of);
+ elm_object_style_set(ob, "default/left");
E_ALIGN(ob, 0, 0.5);
evas_object_show(ob);
elm_box_pack_end(o, ob);
diff --git a/src/modules/wizard/page_180.c b/src/modules/wizard/page_180.c
index 92158b6..740db06 100644
--- a/src/modules/wizard/page_180.c
+++ b/src/modules/wizard/page_180.c
@@ -29,6 +29,7 @@ wizard_page_show(E_Wizard_Page *pg EINA_UNUSED)
elm_object_content_set(of, o);
ob = elm_label_add(o);
+ elm_object_style_set(ob, "default/left");
E_ALIGN(ob, 0, 0.5);
evas_object_show(ob);
elm_box_pack_end(o, ob);
--
[EGIT] [tools/eflete] master 18/34: property_group: use thumb for tween
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=1c026b3ad10ce2b432a250547e9a1efb59ecbc99
commit 1c026b3ad10ce2b432a250547e9a1efb59ecbc99
Author: Andrii Kroitor
Date: Wed Mar 16 14:37:43 2016 +0200
property_group: use thumb for tween
---
src/bin/ui/property_group.c | 13 +++--
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/src/bin/ui/property_group.c b/src/bin/ui/property_group.c
index daef912..10a7daf 100644
--- a/src/bin/ui/property_group.c
+++ b/src/bin/ui/property_group.c
@@ -4030,7 +4030,6 @@ _item_content_get(void *data, Evas_Object *obj, const
char *part)
{
const char* buf = NULL;
const char *file = NULL, *group = NULL;
- Evas_Load_Error err;
Evas_Object *image;
Group_Prop_Data *pd = NULL;
@@ -4041,17 +4040,11 @@ _item_content_get(void *data, Evas_Object *obj, const
char *part)
assert(pd != NULL);
edje_object_file_get((const Eo*)pd->group->edit_object, &file, &group);
-image = evas_object_image_add(evas_object_evas_get(obj));
+image = elm_thumb_add(obj);
+elm_object_style_set(image, "noframe");
buf = eina_stringshare_printf("edje/images/%i",
edje_edit_image_id_get(pd->group->edit_object, (const char*)data));
-evas_object_image_file_set(image, file, buf);
-err = evas_object_image_load_error_get(image);
-if (err != EVAS_LOAD_ERROR_NONE)
- {
- WARN("Image [%s] from file [%s] loaded with errors", buf, file);
- return NULL;
- }
-evas_object_image_filled_set(image, true);
+elm_thumb_file_set(image, file, buf);
return image;
}
return NULL;
--
[EGIT] [apps/terminology] master 01/01: add a reset button to reset the key bindings
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=a0b7fae2dd51480df0fd7c5213adf27b789c3141
commit a0b7fae2dd51480df0fd7c5213adf27b789c3141
Author: Boris Faure
Date: Fri Mar 18 19:08:58 2016 +0100
add a reset button to reset the key bindings
---
src/bin/config.c | 15 +++
src/bin/config.h | 1 +
src/bin/options.h | 30 ++
src/bin/options_keys.c | 18 +-
4 files changed, 63 insertions(+), 1 deletion(-)
diff --git a/src/bin/config.c b/src/bin/config.c
index 14982e9..581a6ea 100644
--- a/src/bin/config.c
+++ b/src/bin/config.c
@@ -361,6 +361,21 @@ _add_default_keys(Config *config)
ADD_KB("KP_Divide", 0, 0, 1, 0, "copy_clipboard");
}
+void
+config_reset_keys(Config *config)
+{
+ Config_Keys *key;
+
+ EINA_LIST_FREE(config->keys, key)
+ {
+eina_stringshare_del(key->keyname);
+eina_stringshare_del(key->cb);
+free(key);
+ }
+ _add_default_keys(config);
+}
+
+
static void
_add_key(Config *config, const char *name, int ctrl, int alt, int shift,
int win, const char *cb_name)
diff --git a/src/bin/config.h b/src/bin/config.h
index fb9e148..05e75f0 100644
--- a/src/bin/config.h
+++ b/src/bin/config.h
@@ -94,6 +94,7 @@ Config *config_fork(Config *config);
Config *config_new();
void config_del(Config *config);
void config_default_font_set(Config *config, Evas *evas);
+void config_reset_keys(Config *config);
const char *config_theme_path_get(const Config *config);
const char *config_theme_path_default_get(const Config *config);
diff --git a/src/bin/options.h b/src/bin/options.h
index 3f6e36f..3203be1 100644
--- a/src/bin/options.h
+++ b/src/bin/options.h
@@ -5,4 +5,34 @@ void options_toggle(Evas_Object *win, Evas_Object *bg,
Evas_Object *term,
void (*donecb) (void *data), void *donedata);
Eina_Bool options_active_get(void);
+#define OPTIONS_CB(_cfg_name, _inv) \
+static void \
+_cb_op_behavior_##_cfg_name(void *data, Evas_Object *obj, \
+void *event EINA_UNUSED)\
+{ \
+ Evas_Object *term = data;\
+ Config *config = termio_config_get(term);\
+ if (_inv)\
+ config->_cfg_name = !elm_check_state_get(obj); \
+ else \
+ config->_cfg_name = elm_check_state_get(obj); \
+ termio_config_update(term); \
+ windows_update();\
+ config_save(config, NULL); \
+}
+
+#define OPTIONS_CX(_bx, _lbl, _cfg_name, _inv)\
+ do { \
+ o = elm_check_add(_bx);\
+ evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);\
+ evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5); \
+ elm_object_text_set(o, _lbl); \
+ elm_check_state_set(o, _inv ? !config->_cfg_name : config->_cfg_name); \
+ elm_box_pack_end(_bx, o); \
+ evas_object_show(o); \
+ evas_object_smart_callback_add(o, "changed", \
+ _cb_op_behavior_##_cfg_name, term) \
+ } while (0)
+
+
#endif
diff --git a/src/bin/options_keys.c b/src/bin/options_keys.c
index 95ca85d..b70035f 100644
--- a/src/bin/options_keys.c
+++ b/src/bin/options_keys.c
@@ -337,6 +337,16 @@ char *gl_group_text_get(void *data, Evas_Object *obj
EINA_UNUSED,
return strdup(action->description);
}
+static void
+_cb_reset_keys(void *data, Evas_Object *obj EINA_UNUSED,
+ void *event EINA_UNUSED)
+{
+ Evas_Object *gl = data;
+
+ config_reset_keys(_config);
+ elm_genlist_realized_items_update(gl);
+}
+
void
options_keys(Evas_Object *opbox, Evas_Object *term)
{
@@ -409,5 +419,11 @@ options_keys(Evas_Object *opbox, Evas_Object *term)
action++;
}
- /* TODO: reset button ? */
+ o = elm_button_add(bx);
+ evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);
+ evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ elm_object_text_set(o, _("Reset bindings"));
+ elm_box_pack_end(bx, o);
+ evas_object_show(o);
+ evas_object_smart_callback_add(o, "clicked", _cb_reset_keys, gl);
}
--
[EGIT] [core/elementary] master 01/01: focus: add focus_move_policy_automatic_set/get function
woohyun pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=09e7ffe7f06f4612ea6e3740447bdbdc81a083e9
commit 09e7ffe7f06f4612ea6e3740447bdbdc81a083e9
Author: WooHyun Jung
Date: Fri Mar 18 16:38:26 2016 +0900
focus: add focus_move_policy_automatic_set/get function
Summary:
After setting specific focus move policy to one winset object,
if it should not follow the system focus move policy change,
this new api can be used.
@feature
---
src/bin/test_focus.c | 96 +++
src/lib/elm_config.c | 1 +
src/lib/elm_focus.h | 30
src/lib/elm_main.c| 14
src/lib/elm_priv.h| 1 +
src/lib/elm_widget.c | 78 +
src/lib/elm_widget.eo | 12 +++
src/lib/elm_widget.h | 4 +++
src/lib/elm_win.c | 10 ++
9 files changed, 232 insertions(+), 14 deletions(-)
diff --git a/src/bin/test_focus.c b/src/bin/test_focus.c
index 2782299..88e223f 100644
--- a/src/bin/test_focus.c
+++ b/src/bin/test_focus.c
@@ -77,10 +77,23 @@ _focus_anim_changed(void *data, Evas_Object *obj, void
*event_info EINA_UNUSED)
elm_win_focus_highlight_animate_set(data, EINA_FALSE);
}
+static void
+_rd_changed_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info
EINA_UNUSED)
+{
+ int value = elm_radio_state_value_get(obj);
+
+ if (value == 0)
+ elm_config_focus_move_policy_set(ELM_FOCUS_MOVE_POLICY_CLICK);
+ else if (value == 1)
+ elm_config_focus_move_policy_set(ELM_FOCUS_MOVE_POLICY_IN);
+ else
+ elm_config_focus_move_policy_set(ELM_FOCUS_MOVE_POLICY_KEY_ONLY);
+}
+
void
test_focus(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
*event_info EINA_UNUSED)
{
- Evas_Object *win, *tbx, *tbar, *menu;
+ Evas_Object *win, *tbx, *tbar, *mainbx, *menu, *ttb;
Elm_Object_Item *tb_it;
Elm_Object_Item *menu_it;
unsigned int i, j;
@@ -121,8 +134,8 @@ test_focus(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_inf
elm_toolbar_item_menu_set(tb_it, EINA_TRUE);
elm_toolbar_item_priority_set(tb_it, -);
elm_toolbar_menu_parent_set(tbar, win);
- menu = elm_toolbar_item_menu_get(tb_it);
+ menu = elm_toolbar_item_menu_get(tb_it);
elm_menu_item_add(menu, NULL, "edit-cut", "Shrink", _tb_sel, NULL);
menu_it = elm_menu_item_add(menu, NULL, "edit-copy", "Mode", _tb_sel, NULL);
elm_menu_item_add(menu, menu_it, "edit-paste", "is set to", _tb_sel, NULL);
@@ -131,7 +144,7 @@ test_focus(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_inf
elm_box_pack_end(tbx, tbar);
evas_object_show(tbar);
- Evas_Object *mainbx = elm_box_add(win);
+ mainbx = elm_box_add(win);
elm_box_horizontal_set(mainbx, EINA_TRUE);
evas_object_size_hint_weight_set(mainbx, EVAS_HINT_EXPAND,
EVAS_HINT_EXPAND);
elm_box_pack_end(tbx, mainbx);
@@ -304,8 +317,7 @@ test_focus(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_inf
Evas_Object *ly = elm_layout_add(win);
snprintf(buf, sizeof(buf), "%s/objects/test.edj",
elm_app_data_dir_get());
elm_layout_file_set(ly, buf, "twolines");
-evas_object_size_hint_weight_set(ly, EVAS_HINT_EXPAND,
- EVAS_HINT_EXPAND);
+evas_object_size_hint_weight_set(ly, EVAS_HINT_EXPAND, 0.0);
elm_box_pack_end(mainbx, ly);
my_show(ly);
@@ -362,6 +374,30 @@ test_focus(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_inf
evas_object_smart_callback_add(bt2, "clicked", my_enable,
bt);
my_show(bt2);
elm_object_focus_custom_chain_append(bx2, bt2, NULL);
+
+ Evas_Object *bt3;
+ bt3 = elm_button_add(win);
+ elm_object_text_set(bt3, "KeyOnly with Auto");
+ elm_object_focus_move_policy_set(bt3,
ELM_FOCUS_MOVE_POLICY_KEY_ONLY);
+ elm_object_focus_move_policy_automatic_set(bt, EINA_TRUE);
// EINA_TURE is default
+ evas_object_size_hint_align_set(bt3, EVAS_HINT_FILL,
+ EVAS_HINT_FILL);
+ evas_object_size_hint_weight_set(bt3, 0.0, 0.0);
+ elm_box_pack_end(bx2, bt3);
+ my_show(bt3);
+ elm_object_focus_custom_chain_append(bx2, bt3, NULL);
+
+ Evas_Object *bt4;
+ bt4 = elm_button_add(win);
+ elm_object_text_set(bt4, "KeyOnly without Auto");
+ elm_object_focus_move_policy_set(bt4,
ELM_FOCUS_MOVE_POLICY_KEY_ONLY);
+ elm_object_focus_move_policy_automatic_set(bt4, EINA_FALSE);
+ evas_object_size_hint_align_set(bt4, EVAS_HINT_FILL,
+ EVAS_HINT_FILL);
+ evas_object_size_h
[EGIT] [tools/eflete] master 23/34: group_navigator: wrong index usage on part add
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=fd2eb59114d63245f81b5a7c2584c654af4d2859
commit fd2eb59114d63245f81b5a7c2584c654af4d2859
Author: Vitalii Vorobiov
Date: Wed Mar 16 16:04:13 2016 +0200
group_navigator: wrong index usage on part add
---
src/bin/ui/workspace/group_navigator.c | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/bin/ui/workspace/group_navigator.c
b/src/bin/ui/workspace/group_navigator.c
index 0bacd23..14cc714 100644
--- a/src/bin/ui/workspace/group_navigator.c
+++ b/src/bin/ui/workspace/group_navigator.c
@@ -732,31 +732,31 @@ _popup_add_part_ok_clicked(void *data,
item = ewe_combobox_select_item_get(pl->popup.combobox);
switch (item->index)
{
- case 1:
+ case 0:
type = EDJE_PART_TYPE_RECTANGLE;
break;
- case 2:
+ case 1:
type = EDJE_PART_TYPE_IMAGE;
break;
- case 3:
+ case 2:
type = EDJE_PART_TYPE_SWALLOW;
break;
- case 4:
+ case 3:
type = EDJE_PART_TYPE_TEXTBLOCK;
break;
- case 5:
+ case 4:
type = EDJE_PART_TYPE_GROUP;
break;
- case 6:
+ case 5:
type = EDJE_PART_TYPE_BOX;
break;
- case 7:
+ case 6:
type = EDJE_PART_TYPE_TABLE;
break;
- case 8:
+ case 7:
type = EDJE_PART_TYPE_PROXY;
break;
- case 9:
+ case 8:
type = EDJE_PART_TYPE_SPACER;
break;
}
--
[EGIT] [core/elementary] master 01/01: entry: do not set selection on selection, start signal
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=406453d60c6cab718cfbe37bd57d1979bf8d8fce
commit 406453d60c6cab718cfbe37bd57d1979bf8d8fce
Author: Mike Blumenkrantz
Date: Thu Mar 17 15:08:12 2016 -0400
entry: do not set selection on selection,start signal
this is already handled by the selection,changed signal and creates
duplicated events
@fix
---
src/lib/elm_entry.c | 9 -
1 file changed, 9 deletions(-)
diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index 75042ab..42279fa 100644
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -2152,8 +2152,6 @@ _entry_selection_start_signal_cb(void *data,
{
const Eina_List *l;
Evas_Object *entry;
- const char *txt = elm_entry_selection_get(data);
- Evas_Object *top;
EINA_LIST_FOREACH(entries, l, entry)
{
@@ -2162,13 +2160,6 @@ _entry_selection_start_signal_cb(void *data,
eo_event_callback_call
(data, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_START, NULL);
- top = elm_widget_top_get(data);
- if (txt && top && (elm_win_window_id_get(top)))
- {
-elm_cnp_selection_set(data, ELM_SEL_TYPE_PRIMARY,
- ELM_SEL_FORMAT_MARKUP, txt, strlen(txt));
-elm_cnp_selection_loss_callback_set(data, ELM_SEL_TYPE_PRIMARY,
_selection_clear, data);
- }
elm_object_focus_set(data, EINA_TRUE);
}
--
[EGIT] [tools/eflete] master 04/34: makefile: include to tarballs tests header and specific files
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=59e1f9bc234661d1560e4b47bbc33f1bb94aca69
commit 59e1f9bc234661d1560e4b47bbc33f1bb94aca69
Author: Vyacheslav Reutskiy
Date: Mon Mar 14 16:13:42 2016 +0200
makefile: include to tarballs tests header and specific files
Change-Id: Ia237a3c4ef9a8306e6b3bd791f0fe8e964bfddb5
---
tests/Makefile.am | 25 -
tests/edj_build/Makefile.am | 11 +++
2 files changed, 35 insertions(+), 1 deletion(-)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index a223f56..de86005 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -20,7 +20,6 @@ ui_workspace_test \
colorselector_test \
shortcuts_test
-
check_PROGRAMS = ${TESTS}
FLAGS = \
@@ -60,6 +59,27 @@ LD = $(top_builddir)/src/bin/libete.a \
${top_builddir}/src/lib/libewe.la \
@ENVENTOR_LIBS@
+include_HEADERS = \
+ ../tests/test_common.h \
+ ../tests/utc_common.h \
+ ../tests/test_ewe_init/test_ewe_init.h \
+ ../tests/test_ewe_ruler/test_ewe_ruler.h \
+ ../tests/test_ewe_combobox/test_ewe_combobox.h \
+ ../tests/test_eflete/test_eflete.h \
+ ../tests/test_alloc/test_alloc.h \
+ ../tests/test_diff/test_diff.h \
+ ../tests/test_change/test_change.h \
+ ../tests/test_new_history/test_new_history.h \
+ ../tests/test_logger/test_logger.h \
+ ../tests/test_modal_window/test_modal_window.h \
+ ../tests/test_project_manager/test_project_manager.h \
+ ../tests/test_config/test_config.h \
+ ../tests/test_cursor/test_cursor.h \
+ ../tests/test_ui_workspace/test_ui_workspace.h \
+ ../tests/test_live_widget/test_live_widget.h \
+ ../tests/test_shortcuts/test_shortcuts.h \
+ ../tests/test_colorselector/test_colorselector.h
+
ewe_init_test_SOURCES = \
../tests/test_ewe_init/test_ewe_init.c \
../tests/test_ewe_init/ewe_init.c
@@ -278,3 +298,6 @@ coverage:
echo "" ; \
done;
echo "" >> ../coverage.html
+
+EXTRA_DIST = \
+ tests_report_generator.py
diff --git a/tests/edj_build/Makefile.am b/tests/edj_build/Makefile.am
index 2953e38..1b1b721 100644
--- a/tests/edj_build/Makefile.am
+++ b/tests/edj_build/Makefile.am
@@ -92,3 +92,14 @@ check: Makefile
;do cp $(builddir)/radio.edj $$i; done
clean-local:
rm -f *.edj
+
+EXTRA_DIST = \
+ radio_base.png \
+ radio2.png \
+ radio.png \
+ radio.edc.in \
+ PTS55F.ttf \
+ license.txt \
+ kbd-tap.wav
+
+
--
[EGIT] [core/efl] master 01/02: evas-wayland-egl: Override image_native init and shutdown functions
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=67db4d7c1a37a4f45c7020580d2c7c13b0457771
commit 67db4d7c1a37a4f45c7020580d2c7c13b0457771
Author: Chris Michael
Date: Fri Mar 18 08:50:54 2016 -0400
evas-wayland-egl: Override image_native init and shutdown functions
If we are going to define native_init & native_shutdown functions,
then we should probably be using them ;) Also, as this is a wayland
egl engine, we can return from native_init based on
eglQueryWaylandBufferWL
ref 20b4d9dd6adb88f9dd0cd51fa849f0c360432279
@fix
Signed-off-by: Chris Michael
---
src/modules/evas/engines/wayland_egl/evas_engine.c | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/modules/evas/engines/wayland_egl/evas_engine.c
b/src/modules/evas/engines/wayland_egl/evas_engine.c
index a33c9040..bbfe738 100644
--- a/src/modules/evas/engines/wayland_egl/evas_engine.c
+++ b/src/modules/evas/engines/wayland_egl/evas_engine.c
@@ -1003,8 +1003,11 @@ eng_image_native_init(void *data EINA_UNUSED,
Evas_Native_Surface_Type type)
#endif
case EVAS_NATIVE_SURFACE_EVASGL:
case EVAS_NATIVE_SURFACE_OPENGL:
- case EVAS_NATIVE_SURFACE_WL:
return 1;
+#if defined(GL_GLES) && defined(HAVE_WAYLAND)
+ case EVAS_NATIVE_SURFACE_WL:
+return (glsym_eglQueryWaylandBufferWL != NULL) ? 1 : 0;
+#endif
default:
ERR("Native surface type %d not supported!", type);
return 0;
@@ -1023,7 +1026,9 @@ eng_image_native_shutdown(void *data EINA_UNUSED,
Evas_Native_Surface_Type type)
#endif
case EVAS_NATIVE_SURFACE_EVASGL:
case EVAS_NATIVE_SURFACE_OPENGL:
+#if defined(GL_GLES) && defined(HAVE_WAYLAND)
case EVAS_NATIVE_SURFACE_WL:
+#endif
return;
default:
ERR("Native surface type %d not supported!", type);
@@ -1423,6 +1428,8 @@ module_open(Evas_Module *em)
ORD(output_dump);
ORD(image_native_set);
+ ORD(image_native_init);
+ ORD(image_native_shutdown);
gl_symbols();
--
[EGIT] [tools/eflete] master 01/04: UTC: remove outdated tests
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=28ed83902b77153c88e0e8579ec5596224822968
commit 28ed83902b77153c88e0e8579ec5596224822968
Author: Vyacheslav Reutskiy
Date: Fri Mar 18 13:14:58 2016 +0200
UTC: remove outdated tests
Change-Id: I0c2af6ff550764dc8ec0b050ebd462aa987bd543
---
tests/Makefile.am | 11 +--
tests/test_colorselector/colorselector_add.c | 71 --
tests/test_colorselector/colorselector_color_get.c | 84 --
tests/test_colorselector/test_colorselector.c | 40 ---
tests/test_colorselector/test_colorselector.h | 29
5 files changed, 1 insertion(+), 234 deletions(-)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5cfaece..0e32952 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -15,7 +15,6 @@ logger_test \
project_manager_test \
config_test \
cursor_test \
-colorselector_test \
shortcuts_test
check_PROGRAMS = ${TESTS}
@@ -71,8 +70,7 @@ include_HEADERS = \
../tests/test_config/test_config.h \
../tests/test_cursor/test_cursor.h \
../tests/test_live_widget/test_live_widget.h \
- ../tests/test_shortcuts/test_shortcuts.h \
- ../tests/test_colorselector/test_colorselector.h
+ ../tests/test_shortcuts/test_shortcuts.h
ewe_init_test_SOURCES = \
../tests/test_ewe_init/test_ewe_init.c \
@@ -231,13 +229,6 @@ shortcuts_test_SOURCES = \
shortcuts_test_CFLAGS = ${FLAGS}
shortcuts_test_LDADD = ${LD}
-colorselector_test_SOURCES = \
-../tests/test_colorselector/test_colorselector.c \
-../tests/test_colorselector/colorselector_add.c \
-../tests/test_colorselector/colorselector_color_get.c
-colorselector_test_CFLAGS = ${FLAGS}
-colorselector_test_LDADD = ${LD}
-
coverage:
echo "" > ../coverage.html
lcov --zerocounters --directory ../src
diff --git a/tests/test_colorselector/colorselector_add.c
b/tests/test_colorselector/colorselector_add.c
deleted file mode 100644
index a299a8c..000
--- a/tests/test_colorselector/colorselector_add.c
+++ /dev/null
@@ -1,71 +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_colorselector.h"
-
-/**
- * @addtogroup colorselector_test
- * @{
- * @addtogroup colorselector_add
- * @{
- * colorselector
- *
- * @}
- */
-
-/**
- * @addtogroup colorselector_add
- * @{
- *
- * colorselector_add
- * colorselector_add_test_p
- *
- * @precondition
- * @step 1 initialized efl and app
- * @step 2 main_window created
- *
- * @procedure
- * @step 1 Call colorselector_add()
- * @step 2 Check returned pointer
- *
- * void
- * Evas_Object pointer returned
- *
- * @}
- */
-EFLETE_TEST (colorselector_add_test_p)
-{
- elm_init(0,0);
-
- app_init();
- ui_main_window_add();
- ck_assert_msg(colorselector_add(ap.win) != NULL, "cannot create the
Colorselector");
-
- app_shutdown();
- elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup colorselector_add
- * @{
- *
- * @}
- * @}
- */
diff --git a/tests/test_colorselector/colorselector_color_get.c
b/tests/test_colorselector/colorselector_color_get.c
deleted file mode 100644
index 033a166..000
--- a/tests/test_colorselector/colorselector_color_get.c
+++ /dev/null
@@ -1,84 +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_colorselector.h"
-
-/**
- * @addtogroup colorselector_test
- * @{
- * @addtogroup colorselector_color_get
- * @{
- * colorselector
- *
- * @}
- */
-
-/**
- * @addtogroup colorselector_color_get
- * @{
- *
- * colorselector_color_get
- * colorselector_color_get_te
[EGIT] [tools/enventor] master 01/01: live_edit: fix malfunction of key input on Windows system.
jaehyun pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=99b9790146fa7294df374d91d867cf98efaaa986
commit 99b9790146fa7294df374d91d867cf98efaaa986
Author: Jaehyun Cho
Date: Thu Mar 17 20:04:55 2016 +0900
live_edit: fix malfunction of key input on Windows system.
re-implement live edit key input by using key grab mechanism.
This commit is based on commit 502a8265992b18687b81a6ff8505e6b5d91836de.
@fix
---
src/bin/live_edit.c | 35 ++-
1 file changed, 22 insertions(+), 13 deletions(-)
diff --git a/src/bin/live_edit.c b/src/bin/live_edit.c
index cd3d62a..d23abc7 100644
--- a/src/bin/live_edit.c
+++ b/src/bin/live_edit.c
@@ -62,7 +62,7 @@ typedef struct live_editor_s
float rel2_x, rel2_y;
} part_info;
- Ecore_Event_Handler *key_down_handler;
+ Evas_Object *keygrabber;
Eina_Bool on : 1;
} live_data;
@@ -205,18 +205,18 @@ live_edit_insert(live_data *ld)
enventor_object_save(base_enventor_get(), config_input_path_get());
}
-static Eina_Bool
-key_down_cb(void *data, int type EINA_UNUSED, void *ev)
+static void
+keygrabber_key_down_cb(void *data, Evas *e EINA_UNUSED,
+ Evas_Object *obj EINA_UNUSED, void *event_info)
{
- Ecore_Event_Key *event = ev;
live_data *ld = data;
+ Evas_Event_Key_Down *ev = event_info;
- if (!strcmp(event->key, "Return")) live_edit_insert(ld);
- else if (strcmp(event->key, "Delete") &&
-strcmp(event->key, "BackSpace")) return EINA_TRUE;
+ if (!strcmp(ev->key, "Return")) live_edit_insert(ld);
+ else if (strcmp(ev->key, "Delete") &&
+strcmp(ev->key, "BackSpace")) return;
live_edit_cancel();
- return EINA_TRUE;
}
static void
@@ -873,9 +873,18 @@ info_text_init(live_data *ld)
static void
live_edit_layer_set(live_data *ld)
{
- ld->key_down_handler = ecore_event_handler_add(ECORE_EVENT_KEY_DOWN,
- key_down_cb,
- ld);
+ //Keygrabber
+ ld->keygrabber =
+ evas_object_rectangle_add(evas_object_evas_get(ld->live_view));
+ evas_object_event_callback_add(ld->keygrabber, EVAS_CALLBACK_KEY_DOWN,
+ keygrabber_key_down_cb, ld);
+ if (!evas_object_key_grab(ld->keygrabber, "Return", 0, 0, EINA_TRUE))
+ EINA_LOG_ERR(_("Failed to grab key - Return"));
+ if (!evas_object_key_grab(ld->keygrabber, "Delete", 0, 0, EINA_TRUE))
+ EINA_LOG_ERR(_("Failed to grab key - Delete"));
+ if (!evas_object_key_grab(ld->keygrabber, "BackSpace", 0, 0, EINA_TRUE))
+ EINA_LOG_ERR(_("Failed to grab key - BackSpace"));
+
evas_object_event_callback_add(ld->live_view, EVAS_CALLBACK_RESIZE,
live_view_geom_cb, ld);
evas_object_event_callback_add(ld->live_view, EVAS_CALLBACK_MOVE,
@@ -942,8 +951,8 @@ live_edit_cancel(void)
enventor_object_disabled_set(base_enventor_get(), EINA_FALSE);
- ecore_event_handler_del(ld->key_down_handler);
- ld->key_down_handler = NULL;
+ evas_object_del(ld->keygrabber);
+ ld->keygrabber = NULL;
evas_object_event_callback_del(ld->live_view, EVAS_CALLBACK_RESIZE,
live_view_geom_cb);
--
[EGIT] [editors/vim-configs] master 01/03: syntax/eo: add support for @virtual
jayji pushed a commit to branch master.
http://git.enlightenment.org/editors/vim-configs.git/commit/?id=c429a4af9831af70225b83af09842ece85168675
commit c429a4af9831af70225b83af09842ece85168675
Author: Jean Guyomarc'h
Date: Thu Mar 17 00:00:24 2016 +0100
syntax/eo: add support for @virtual
---
syntax/eo.vim | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/syntax/eo.vim b/syntax/eo.vim
index 2068857..032d6cc 100644
--- a/syntax/eo.vim
+++ b/syntax/eo.vim
@@ -24,7 +24,7 @@ syn keywordeoStatements return
" syn match className "\(\w\+\.\)\+\w\+"
-syn match attributes
"@\(inout\|out\|in\|property\|class\|free\|constructor\|extern\|beta\|protected\|const\|optional\|nullable\|warn_unused\|private\|hot\)"
+syn match attributes
"@\(inout\|out\|in\|property\|class\|free\|constructor\|virtual\|extern\|beta\|protected\|const\|optional\|nullable\|warn_unused\|private\|hot\)"
syn match eoLabelMatch "\w\+:" contains=eoClassBodyLabels
syn match eoBlockOpener "\w\+\s*{"
contains=eoClassBodyBlockOpener,eoInnerBlockOpener
--
[EGIT] [core/efl] master 05/06: efl js: Finish Eina_Iterator binding
vitorsousa pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=a6025b5d27f98b8595a1eb33f8f24fe998af8b90
commit a6025b5d27f98b8595a1eb33f8f24fe998af8b90
Author: Vitor Sousa
Date: Wed Mar 16 16:08:45 2016 -0300
efl js: Finish Eina_Iterator binding
---
src/bindings/js/eina_js/eina_js_compatibility.hh | 22
src/bindings/js/eina_js/eina_js_get_value.hh | 14 ++-
.../js/eina_js/eina_js_get_value_from_c.hh | 16 ++-
src/bindings/js/eina_js/eina_js_iterator.cc| 1 +
src/bindings/js/eina_js/eina_js_iterator.hh| 50
src/tests/eolian_js/eolian_js_suite.js | 127 +
.../eolian_js/eolian_js_test_test_object_impl.c| 122
src/tests/eolian_js/test_object.eo | 42 +++
8 files changed, 364 insertions(+), 30 deletions(-)
diff --git a/src/bindings/js/eina_js/eina_js_compatibility.hh
b/src/bindings/js/eina_js/eina_js_compatibility.hh
index 7cc16a3..fb36e4e 100644
--- a/src/bindings/js/eina_js/eina_js_compatibility.hh
+++ b/src/bindings/js/eina_js/eina_js_compatibility.hh
@@ -134,6 +134,22 @@ struct container_wrapper
};
template
+inline T get_c_container_data(void* ptr, typename std::enable_if<
+ std::is_pointer::value
+>::type* = 0)
+{
+ return static_cast(ptr);
+}
+
+template
+inline T get_c_container_data(void* ptr, typename std::enable_if<
+ !std::is_pointer::value
+>::type* = 0)
+{
+ return *static_cast(ptr);
+}
+
+template
T container_wrap(T&& v)
{
return std::forward(v);
@@ -259,6 +275,12 @@ v8::Local
export_accessor(::efl::eina::accessor&, v8::Isolate*, c
template
::efl::eina::accessor& import_accessor(v8::Handle);
+// Iterator
+template
+inline v8::Local export_iterator(Eina_Iterator*, v8::Isolate*,
const char*);
+
+inline Eina_Iterator* import_iterator(v8::Handle);
+
// Wrap value functions
template
typename std::remove_cv::type>::type
diff --git a/src/bindings/js/eina_js/eina_js_get_value.hh
b/src/bindings/js/eina_js/eina_js_get_value.hh
index 637b48a..5d62b28 100644
--- a/src/bindings/js/eina_js/eina_js_get_value.hh
+++ b/src/bindings/js/eina_js/eina_js_get_value.hh
@@ -333,18 +333,24 @@ inline const Eina_Array* get_value_from_javascript(
return get_value_from_javascript(v, isolate, class_name,
value_tag>{}, throw_js_exception);
}
-template
+template
inline Eina_Iterator* get_value_from_javascript(
- v8::Local,
+ v8::Local v,
v8::Isolate* isolate,
const char*,
- value_tag> tag,
+ value_tag> /*tag*/,
bool throw_js_exception = true)
{
+ if(v->IsNull())
+return nullptr;
+ else if(v->IsObject())
+{
+ return import_iterator(v->ToObject());
+}
if (throw_js_exception)
eina::js::compatibility_throw
(isolate, v8::Exception::TypeError
- (eina::js::compatibility_new(isolate, "Not implemented
yet")));
+ (eina::js::compatibility_new(isolate, "Type expected is
different. Expected Eolian accessor type")));
throw std::logic_error("");
}
diff --git a/src/bindings/js/eina_js/eina_js_get_value_from_c.hh
b/src/bindings/js/eina_js/eina_js_get_value_from_c.hh
index 9a0089e..204c497 100644
--- a/src/bindings/js/eina_js/eina_js_get_value_from_c.hh
+++ b/src/bindings/js/eina_js/eina_js_get_value_from_c.hh
@@ -207,18 +207,22 @@ get_value_from_c(efl::eina::js::complex_tag v, v8::Iso
template
inline v8::Local
-get_value_from_c(efl::eina::js::complex_tag,
v8::Isolate*, const char*)
+get_value_from_c(efl::eina::js::complex_tag v,
v8::Isolate* isolate, const char*)
{
- std::cerr << "get_value_from_c for Eina_Iterator not implemented.
Aborting..." << std::endl;
- std::abort();
+ bool own = false; // TODO: handle ownership
+ auto ptr = v.value;
+ auto obj = export_iterator(ptr , isolate, K::class_name());
+ if (own && ptr)
+efl::eina::js::make_weak(isolate, obj, [ptr]{ ::eina_iterator_free(ptr);
});
+ return obj;
}
template
inline v8::Local
-get_value_from_c(efl::eina::js::complex_tag,
v8::Isolate*, const char*)
+get_value_from_c(efl::eina::js::complex_tag v,
v8::Isolate* isolate, const char* class_name)
{
- std::cerr << "get_value_from_c for Eina_Iterator not implemented.
Aborting..." << std::endl;
- std::abort();
+ // TODO: implement const iterators?
+ return get_value_from_c(efl::eina::js::complex_tag{const_cast(v.value)}, isolate, class_name);
}
template
diff --git a/src/bindings/js/eina_js/eina_js_iterator.cc
b/src/bindings/js/eina_js/eina_js_iterator.cc
index d2480b8..40d0db3 100644
--- a/src/bindings/js/eina_js/eina_js_iterator.cc
+++ b/src/bindings/js/eina_js/eina_js_iterator.cc
@@ -23,6 +23,7 @@ void register_destroy_iterator(v8::Isolate *isolate,
deleter_t deleter =
compatibility_get_pointer_internal_field(o, 1);
deleter(compatibility_get_pointer_internal_field<>(o, 0));
+compatibility_set_pointer_internal_field(o, 0, static_cast(0));
return compatibility_return();
};
dif
[EGIT] [website/www-content] master 04/10: Wiki page newsdata changed with summary [] by Mike Blumenkrantz
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=62c044aedc35a317d419b860d00077d8da1a7bdf commit 62c044aedc35a317d419b860d00077d8da1a7bdf Author: Mike Blumenkrantz Date: Wed Mar 9 09:43:06 2016 -0800 Wiki page newsdata changed with summary [] by Mike Blumenkrantz --- pages/news/newsdata.txt | 125 1 file changed, 125 insertions(+) diff --git a/pages/news/newsdata.txt b/pages/news/newsdata.txt index 87e4ee1..ff9fa6c 100644 --- a/pages/news/newsdata.txt +++ b/pages/news/newsdata.txt @@ -1,5 +1,130 @@ == Enlightenment DR 0.20.6 Release == + * anchor: #20160309094239 + * head: Enlightenment DR 0.20.6 Release + * subtitle: is this thing on? + * link: /news/allnewsdata#20160309094239 + * start: 2016-03-09 + * stop: + * text: +This bugfix release improves on the 0.20.5 release and resolves a number of issues. +**Note:** Wayland >= 1.10 is now required. + +=Changes= +Carsten @raster Haitzler (2): + e - efm: fix op registry listener add and dont use eina_error + e xkbswitch: don't free layouts that are just pointed to in instances + +Chris @devilhorns Michael (6): + update mailmap addresses + update mailmap addresses + add prototype functions for missing wl_data_offer interface + add prototype function for missing wl_seat interface + add prototype functions for missing wl_data_source interface + don't have to hook the ecore_evas resize callback here as that should be handled by elm now + +Derek @ManMower Foreman (20): + Ensure wayland clients haven't been deleted when processing callbacks + Remove wayland frame callbacks from subsurface cache on destruction + Fix xdg-shell destructors + Protect the wayland frame callback list from corruption + Use eina_list_merge instead of eina_list_move for wayland lists + Move pixmap free to client free from client destroy + Bump wayland version requirement + Remove wayland focus timer in delete callback + Add a NULL check in native_surface_init under wayland + Render deleted objects as long as they still have a pixmap + Track whether objects are on the post_updates list or not + Take an extra reference on wayland clients + Don't allow deleted wayland clients to set the cursor + Track whether a render is in progress or not + Rework wayland buffer handling + Remove wayland buffer reference + Re-enable window close animations for wayland + Stop copying all wayland buffers + Don't use e_pixmap_image_data_argb_convert for wayland images + Remove argb_convert for wayland buffers + +Mike @zmike Blumenkrantz (42): + clamp minimum shelf size to 20px in shelf config + do not perform special case position adjustment for re_manage clients + do not clamp comp object input regions to 0,0 + improve enforcement of shelf autohide-related window adjustment + reshuffle x11 comp init to cleanup on failure cases + pre-remove pixmap from x11 clients during del hook + enable comp object image data refresh if a dirty call is made with no damages + redo wayland pixmap ids to use monotonic decreasing ints with no collisions + remove some unused variables + make bgpreview create vdesk config dialog on mouse up instead of mouse down + do not decrement e_comp->new_clients for non-new clients during _e_client_eval + update winlist ui when using directional window selection + force changed when adding or removing keyboard layouts in config + disable emotion_shutdown during shutdown procedure + use strbufs instead of strcat in fwin navbars + do not set XCURSOR_PATH variable if re-setting existing value + remove security hole in e_start_main + remove DISPLAY usage from E_IPC_SOCKET value + remove multihead env var setting in e_exec + strcpy -> strncpy in evry files plugin + use strbuf instead of strcat in keybinding string synthesis + use strbuf instead of strcat in edgebinding string synthesis + use dblequal for double comparisons in edgebindings config + replace static buffer usage with binbuf in e_fm_ipc + prevent potential null deref during pager (plain) window drag + remove unused value in config profile saving + remove useless client_add handler in e_ipc + use uint instead of int for eina_list_count() return in cpufreq (trivial) + simplify static grab case statements + remove ipc command allowing arbitrary command execution by the compositor + simplify ipc socket creation + remove impossible null check in color dialog + do not add render updates during damage of deleted clients + don't directly use image data when creating a comp object mirror + Revert "send mouse out+in on desk flip end" + reject x11 client mouse-in events on
[EGIT] [core/efl] master 01/06: efl js: Update Javascript binding to compile with new Eolian API
vitorsousa pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=a85348b70bdae9672ed2017d9a0c16fa315edcfa
commit a85348b70bdae9672ed2017d9a0c16fa315edcfa
Author: Vitor Sousa
Date: Mon Mar 14 13:14:37 2016 -0300
efl js: Update Javascript binding to compile with new Eolian API
Reword test method names to check naming convention.
---
src/bin/eolian_js/eolian/class.hh | 41 +-
src/bin/eolian_js/eolian/js/format.hh | 16 +-
src/bin/eolian_js/main.cc | 78 ++--
src/bindings/js/efl_js/efl_js.cc | 21 +-
src/bindings/js/eina_js/eina_js_compatibility.hh | 9 +-
.../js/eina_js/eina_js_get_value_from_c.hh | 8 +-
src/bindings/js/eo_js/eo_js_call_function.hh | 20 +-
src/bindings/js/eo_js/eo_js_constructor.hh | 28 +-
src/bindings/js/eo_js/eo_js_event.hh | 10 +-
src/tests/efl_js/benchmark_object_impl.cc | 10 +-
src/tests/eolian_js/eolian_js_suite.js | 192 -
.../eolian_js/eolian_js_test_test_object_impl.c| 440 -
src/tests/eolian_js/test_object.eo | 94 ++---
13 files changed, 530 insertions(+), 437 deletions(-)
diff --git a/src/bin/eolian_js/eolian/class.hh
b/src/bin/eolian_js/eolian/class.hh
index bd04d5f..2277987 100644
--- a/src/bin/eolian_js/eolian/class.hh
+++ b/src/bin/eolian_js/eolian/class.hh
@@ -38,28 +38,37 @@ inline std::string type_class_name(Eolian_Type const* tp)
if (tp)
{
Eolian_Type_Type tpt = ::eolian_type_type_get(tp);
-if (tpt == EOLIAN_TYPE_POINTER || tpt == EOLIAN_TYPE_ALIAS || tpt ==
EOLIAN_TYPE_REGULAR)
+if (tpt == EOLIAN_TYPE_POINTER)
{
return type_class_name(::eolian_type_base_type_get(tp));
}
-else if(tpt == EOLIAN_TYPE_CLASS)
+else
{
- Eolian_Class const* klass = ::eolian_type_class_get(tp);
- if (klass)
+ tp = ::eolian_type_aliased_base_get(tp);
+ tpt = ::eolian_type_type_get(tp);
+ if (tpt == EOLIAN_TYPE_CLASS)
{
- Eina_Stringshare* klass_name =
::eolian_class_full_name_get(klass);
- if (!klass_name)
-throw std::runtime_error("Could not get Eo class name");
+ Eolian_Class const* klass = ::eolian_type_class_get(tp);
+ if (klass)
+{
+ Eina_Stringshare* klass_name =
::eolian_class_full_name_get(klass);
+ if (!klass_name)
+ throw std::runtime_error("Could not get Eo class
name");
- return klass_name;
- } // TODO: else should throw std::runtime_error("Could not get
Eo class");
- }
-else if(tpt == EOLIAN_TYPE_STRUCT)
- {
- auto struct_type_full_name = ::eolian_type_full_name_get(tp);
- if (!struct_type_full_name)
- throw std::runtime_error("Could not get struct name");
- return struct_type_full_name;
+ return klass_name;
+} // TODO: else should throw std::runtime_error("Could not
get Eo class");
+ }
+ else if (tpt == EOLIAN_TYPE_REGULAR)
+ {
+ auto tpd = eolian_type_typedecl_get(tp);
+ if (tpd && eolian_typedecl_type_get(tpd) ==
EOLIAN_TYPEDECL_STRUCT)
+{
+ auto struct_type_full_name =
::eolian_type_full_name_get(tp);
+ if (!struct_type_full_name)
+ throw std::runtime_error("Could not get struct name");
+ return struct_type_full_name;
+}
+ }
}
}
return "";
diff --git a/src/bin/eolian_js/eolian/js/format.hh
b/src/bin/eolian_js/eolian/js/format.hh
index e1f02c3..679fb9b 100644
--- a/src/bin/eolian_js/eolian/js/format.hh
+++ b/src/bin/eolian_js/eolian/js/format.hh
@@ -152,7 +152,21 @@ std::string format_method(std::string const& in)
std::string format_field(std::string const& in)
{
- return format_method(in);
+ std::string r;
+ bool up = false;
+ for (char c : in)
+{
+ if (c == '_')
+ up = true;
+ else if (!up)
+ r += c;
+ else
+ {
+r += std::toupper(c);
+up = false;
+ }
+}
+ return r;
}
std::string format_class(std::string const& in)
diff --git a/src/bin/eolian_js/main.cc b/src/bin/eolian_js/main.cc
index c8dc1f0..fdf782b 100644
--- a/src/bin/eolian_js/main.cc
+++ b/src/bin/eolian_js/main.cc
@@ -66,13 +66,19 @@ _final_type_and_type_type_get(Eolian_Type const* tp_in,
Eolian_Type const*& tp_o
{
tp_out = tp_in;
tpt_out = eolian_type_type_get(tp_in);
- while ((tpt_out == EOLIAN_TYPE_REGULAR || tpt_out == EOLIAN_TYPE_AL
[EGIT] [core/elementary] master 01/01: docs: bring back docs from eo files by switching to the new group name
stefan pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=a6592b1ec6efe862008d1038327cb4a0b8fd636a commit a6592b1ec6efe862008d1038327cb4a0b8fd636a Author: Stefan Schmidt Date: Wed Mar 16 16:05:31 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. @fix Fixes T3109 --- doc/index.doxy | 104 ++-- src/lib/elc_combobox.h | 2 +- src/lib/elc_combobox_legacy.h| 2 +- src/lib/elc_ctxpopup.h | 2 +- src/lib/elc_ctxpopup_legacy.h| 2 +- src/lib/elc_fileselector.h | 4 +- src/lib/elc_fileselector_button.h| 2 +- src/lib/elc_fileselector_button_legacy.h | 2 +- src/lib/elc_fileselector_entry.h | 2 +- src/lib/elc_fileselector_entry_legacy.h | 2 +- src/lib/elc_fileselector_eo.h| 2 +- src/lib/elc_fileselector_legacy.h| 50 +++--- src/lib/elc_hoversel.h | 2 +- src/lib/elc_hoversel_legacy.h| 2 +- src/lib/elc_popup.h | 2 +- src/lib/elc_popup_eo.h | 2 +- src/lib/elc_popup_legacy.h | 2 +- src/lib/elm_actionslider.h | 2 +- src/lib/elm_actionslider_legacy.h| 4 +- src/lib/elm_bg.h | 2 +- src/lib/elm_bg_legacy.h | 10 +-- src/lib/elm_bubble.h | 2 +- src/lib/elm_bubble_legacy.h | 2 +- src/lib/elm_button.h | 4 +- src/lib/elm_button_legacy.h | 4 +- src/lib/elm_calendar.h | 4 +- src/lib/elm_calendar_common.h| 2 +- src/lib/elm_calendar_legacy.h| 2 +- src/lib/elm_check.h | 2 +- src/lib/elm_check_legacy.h | 2 +- src/lib/elm_clock.h | 4 +- src/lib/elm_clock_legacy.h | 2 +- src/lib/elm_colorselector.h | 2 +- src/lib/elm_colorselector_common.h | 2 +- src/lib/elm_colorselector_legacy.h | 2 +- src/lib/elm_config.h | 8 +-- src/lib/elm_datetime.h | 4 +- src/lib/elm_datetime_common.h| 2 +- src/lib/elm_datetime_legacy.h| 2 +- src/lib/elm_dayselector.h| 4 +- src/lib/elm_dayselector_legacy.h | 2 +- src/lib/elm_deprecated.h | 112 +++ src/lib/elm_diskselector.h | 4 +- src/lib/elm_diskselector_legacy.h| 2 +- src/lib/elm_entry.h | 2 +- src/lib/elm_entry_common.h | 2 +- src/lib/elm_entry_legacy.h | 10 +-- src/lib/elm_flip.h | 2 +- src/lib/elm_flip_legacy.h| 4 +- src/lib/elm_flipselector.h | 4 +- src/lib/elm_flipselector_legacy.h| 2 +- src/lib/elm_frame.h | 2 +- src/lib/elm_frame_legacy.h | 2 +- src/lib/elm_glview.h | 4 +- src/lib/elm_glview_common.h | 2 +- src/lib/elm_glview_legacy.h | 2 +- src/lib/elm_hover.h | 2 +- src/lib/elm_hover_legacy.h | 6 +- src/lib/elm_icon.h | 2 +- src/lib/elm_icon_legacy.h| 2 +- src/lib/elm_image.h | 4 +- src/lib/elm_image_eo.h | 2 +- src/lib/elm_image_legacy.h | 22 +++--- src/lib/elm_index.h | 4 +- src/lib/elm_index_eo.h | 2 +- src/lib/elm_index_legacy.h | 2 +- src/lib/elm_inwin.h | 4 +- src/lib/elm_inwin_legacy.h | 8 +-- src/lib/elm_label.h | 2 +- src/lib/elm_label_eo.h | 2 +- src/lib/elm_label_legacy.h | 2 +- src/lib/elm_list.h | 4 +- src/lib/elm_list_eo.h| 2 +- src/lib/elm_list_legacy.h| 2 +- src/lib/elm_map.h| 2 +- src/lib/elm_map_common.h | 2 +- src/lib/elm_map_legacy.h | 2 +- src/lib/elm_mapbuf.h | 4 +- src/lib/elm_mapbuf_eo.h | 2 +- src/lib/elm_mapbuf_legacy.h | 2 +- src/lib/elm_menu.h | 2 +- src/lib/elm_menu_legacy.h| 6 +- src/lib/elm_need.h |
[EGIT] [tools/expedite] master 02/04: migrate to new proxy object.
cedric pushed a commit to branch master.
http://git.enlightenment.org/tools/expedite.git/commit/?id=adea5d2b265b7ea6f9ff9391df6c1c67ad50f130
commit adea5d2b265b7ea6f9ff9391df6c1c67ad50f130
Author: Cedric BAIL
Date: Thu Mar 17 16:53:50 2016 -0700
migrate to new proxy object.
---
src/bin/proxy_image.c | 6 +++---
src/bin/proxy_image_offscreen.c | 4 ++--
src/bin/proxy_text_fixed.c | 8
src/bin/proxy_text_random.c | 6 +++---
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/bin/proxy_image.c b/src/bin/proxy_image.c
index df2b4ab..e3ba82a 100644
--- a/src/bin/proxy_image.c
+++ b/src/bin/proxy_image.c
@@ -32,9 +32,9 @@ static void _setup(void)
for (i = 1; i < OBNUM; i++)
{
- o = eo_add(EVAS_IMAGE_CLASS, evas);
- o_images[i] = o;
-evas_obj_image_source_set(o, src);
+o = eo_add(EFL_CANVAS_PROXY_CLASS, evas);
+o_images[i] = o;
+efl_canvas_proxy_source_set(o, src);
efl_gfx_size_set(o, 120, 160);
efl_gfx_fill_set(o, 0, 0, 120, 160);
efl_gfx_visible_set(o, EINA_TRUE);
diff --git a/src/bin/proxy_image_offscreen.c b/src/bin/proxy_image_offscreen.c
index 5e4fb80..626b7d0 100644
--- a/src/bin/proxy_image_offscreen.c
+++ b/src/bin/proxy_image_offscreen.c
@@ -35,9 +35,9 @@ static void _setup(void)
for (i = 0; i < OBNUM / 2; i++)
{
-o = eo_add(EVAS_IMAGE_CLASS, evas);
+o = eo_add(EFL_CANVAS_PROXY_CLASS, evas);
o_images[i] = o;
-evas_obj_image_source_set(o, src, NULL);
+efl_canvas_proxy_source_set(o, src, NULL);
efl_gfx_size_set(o, 120, 160);
efl_gfx_fill_set(o, 0, 0, 120, 160);
efl_gfx_visible_set(o, EINA_TRUE);
diff --git a/src/bin/proxy_text_fixed.c b/src/bin/proxy_text_fixed.c
index 0d8ec83..01ce228 100644
--- a/src/bin/proxy_text_fixed.c
+++ b/src/bin/proxy_text_fixed.c
@@ -44,10 +44,10 @@ static void _setup(void)
for ( ; i < OBNUM ; i ++)
{
- s = o_texts[i % st];
- o = eo_add(EVAS_IMAGE_CLASS, evas);
- o_texts[i] = o;
-evas_obj_image_source_set(o, s);
+s = o_texts[i % st];
+o = eo_add(EFL_CANVAS_PROXY_CLASS, evas);
+o_texts[i] = o;
+efl_canvas_proxy_source_set(o, s);
/* FIXME s == NULL*/
efl_gfx_size_get(s, &w, &h);
efl_gfx_size_set(o, w, h);
diff --git a/src/bin/proxy_text_random.c b/src/bin/proxy_text_random.c
index eed870c..0d58c4a 100644
--- a/src/bin/proxy_text_random.c
+++ b/src/bin/proxy_text_random.c
@@ -50,9 +50,9 @@ static void _setup(void)
efl_gfx_visible_set(o, EINA_TRUE);
for (i = 1 ; i < OBNUM ; i ++)
{
- o = eo_add(EVAS_IMAGE_CLASS, evas);
- o_texts[i] = o;
- evas_obj_image_source_set(o, o_texts[0]);
+o = eo_add(EFL_CANVAS_PROXY_CLASS, evas);
+o_texts[i] = o;
+efl_canvas_proxy_source_set(o, o_texts[0]);
efl_gfx_size_get(o_texts[0], &w, &h);
efl_gfx_size_set(o, w, h);
efl_gfx_fill_set(o, 0, 0, w, h);
--
[EGIT] [core/enlightenment] master 01/02: ignore deleted clients when reapplying zone geometry policy in canvas update
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=0d6f019bc6c4f35a7499702defad69fbc914d7a9
commit 0d6f019bc6c4f35a7499702defad69fbc914d7a9
Author: Mike Blumenkrantz
Date: Thu Mar 17 14:08:23 2016 -0400
ignore deleted clients when reapplying zone geometry policy in canvas update
this breaks the compositor!
---
src/bin/e_comp_canvas.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bin/e_comp_canvas.c b/src/bin/e_comp_canvas.c
index 265448c..45385a9 100644
--- a/src/bin/e_comp_canvas.c
+++ b/src/bin/e_comp_canvas.c
@@ -593,7 +593,7 @@ e_comp_canvas_update(void)
* rearranges the order. */
EINA_INLIST_FOREACH(e_comp->layers[i].clients, ec)
{
- if (!e_client_util_ignored_get(ec))
+ if ((!e_client_util_ignored_get(ec)) &&
(!e_object_is_del(E_OBJECT(ec
tmp = eina_list_append(tmp, ec);
}
--
[EGIT] [core/elementary] master 01/04: Elm_glview: change method from changed_set to draw_request_set
jypark pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=715b4110e14c6ecbfbb8ca4c7bc14c84c12d3956
commit 715b4110e14c6ecbfbb8ca4c7bc14c84c12d3956
Author: Ji-Youn Park
Date: Fri Mar 11 14:27:34 2016 +0830
Elm_glview: change method from changed_set to draw_request_set
changed_set method is already used in Evas.Object_Smart.
elm_glview_changed_set requests Elm_glview for drawing, so change the API to
elm_glview_draw_request_set.
---
src/lib/elm_glview.c| 16
src/lib/elm_glview.eo | 4 ++--
src/lib/elm_glview_legacy.h | 10 ++
3 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/src/lib/elm_glview.c b/src/lib/elm_glview.c
index bfa801d..e16eab5 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_changed_set(obj);
+ elm_glview_draw_request_set(obj);
// fake a resize event so that clients can reconfigure their viewport
sd->resized = EINA_TRUE;
@@ -308,6 +308,14 @@ elm_glview_version_add(Evas_Object *parent,
Evas_GL_Context_Version version)
return obj;
}
+EAPI void
+elm_glview_changed_set(Evas_Object *obj)
+{
+ ELM_GLVIEW_CHECK(obj);
+
+ elm_glview_draw_request_set(obj);
+}
+
EOLIAN static void
_elm_glview_version_constructor(Eo *obj, Elm_Glview_Data *sd,
Evas_GL_Context_Version version)
@@ -431,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_changed_set(obj);
+elm_glview_draw_request_set(obj);
return EINA_TRUE;
default:
@@ -470,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_changed_set(obj);
+ elm_glview_draw_request_set(obj);
}
EOLIAN static void
@@ -507,7 +515,7 @@ _elm_glview_render_func_set(Eo *obj EINA_UNUSED,
Elm_Glview_Data *sd, Elm_GLView
}
EOLIAN static void
-_elm_glview_changed_set(Eo *obj, Elm_Glview_Data *sd)
+_elm_glview_draw_request_set(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 16813d5..20c44ab 100644
--- a/src/lib/elm_glview.eo
+++ b/src/lib/elm_glview.eo
@@ -122,7 +122,7 @@ class Elm.Glview (Elm.Widget)
policy: Elm.GLView.Resize.Policy; [[The scaling policy.]]
}
}
- @property changed {
+ @property draw_request {
set {
[[Notifies that there has been changes in the GLView.]]
}
@@ -208,7 +208,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
- @.changed.set gets called.
+ @.draw_request.set gets called.
]]
}
values {
diff --git a/src/lib/elm_glview_legacy.h b/src/lib/elm_glview_legacy.h
index 41944da..fe2d57b 100644
--- a/src/lib/elm_glview_legacy.h
+++ b/src/lib/elm_glview_legacy.h
@@ -19,4 +19,14 @@ EAPI Evas_Object *elm_glview_add(Evas_Object *parent);
*/
EAPI Evas_Object *elm_glview_version_add(Evas_Object *parent,
Evas_GL_Context_Version version);
+
+/**
+ * Notifies that there has been changes in the GLView.
+ *
+ * @param obj The GLView object
+ *
+ * @ingroup GLView
+ */
+EAPI void elm_glview_changed_set(Evas_Object *obj);
+
#include "elm_glview.eo.legacy.h"
--
[EGIT] [core/enlightenment] master 03/05: do not reset the wizard got_desktops flag when setting the default system lang
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=c0f7e4cb4da627ee3da5fa5852b7fb65dc7a853b commit c0f7e4cb4da627ee3da5fa5852b7fb65dc7a853b Author: Mike Blumenkrantz Date: Wed Mar 16 12:52:06 2016 -0400 do not reset the wizard got_desktops flag when setting the default system lang this does not trigger any efreet cache rebuilds and will result in the user being forced to sit through the full duration of the wait timer: currently 7.0s this gets triggered multiple times throughout the wizard. embarrassing.jpg --- src/modules/wizard/page_010.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/modules/wizard/page_010.c b/src/modules/wizard/page_010.c index d12dd19..d07ec2f 100644 --- a/src/modules/wizard/page_010.c +++ b/src/modules/wizard/page_010.c @@ -251,7 +251,8 @@ wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED) /* TODO: * This should be on lang select, * so if next page needs xdg we can't press next */ - e_wizard_xdg_desktops_reset(); + if (lang) + e_wizard_xdg_desktops_reset(); e_intl_language_set(e_config->language); e_wizard_labels_update(); return 1; --
[EGIT] [core/enlightenment] master 01/01: destroy seat resource when we get a release request
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=ccd867e6ff64ecae2cd538f61a26e26d7d4e2959
commit ccd867e6ff64ecae2cd538f61a26e26d7d4e2959
Author: Chris Michael
Date: Wed Mar 16 08:40:41 2016 -0400
destroy seat resource when we get a release request
Signed-off-by: Chris Michael
---
src/bin/e_comp_wl_input.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/bin/e_comp_wl_input.c b/src/bin/e_comp_wl_input.c
index 22147ba..3c13a4e 100644
--- a/src/bin/e_comp_wl_input.c
+++ b/src/bin/e_comp_wl_input.c
@@ -242,9 +242,9 @@ _e_comp_wl_input_cb_touch_get(struct wl_client *client
EINA_UNUSED, struct wl_re
}
static void
-_e_comp_wl_input_cb_release(struct wl_client *client EINA_UNUSED, struct
wl_resource *resource EINA_UNUSED)
+_e_comp_wl_input_cb_release(struct wl_client *client EINA_UNUSED, struct
wl_resource *resource)
{
- /* TODO: implement */
+ wl_resource_destroy(resource);
}
static const struct wl_seat_interface _e_seat_interface =
--
[EGIT] [core/enlightenment] master 02/02: hide wl clients before deleting them when surface is destroyed
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=952d2c1d256a7b6f545a92fdd7943e1cd6d415c1 commit 952d2c1d256a7b6f545a92fdd7943e1cd6d415c1 Author: Mike Blumenkrantz Date: Thu Mar 17 14:09:08 2016 -0400 hide wl clients before deleting them when surface is destroyed clients without hide animations will fail to run cleanup operations during hide if they are not marked as deleted --- src/bin/e_comp_wl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c index 5f2892f..f74aa7f 100644 --- a/src/bin/e_comp_wl.c +++ b/src/bin/e_comp_wl.c @@ -1437,8 +1437,8 @@ _e_comp_wl_surface_destroy(struct wl_resource *resource) if (!(ec = wl_resource_get_user_data(resource))) return; - evas_object_hide(ec->frame); e_object_del(E_OBJECT(ec)); + evas_object_hide(ec->frame); } static void --
[EGIT] [core/efl] master 04/06: efl js: Fix naming of manual binding functions.
vitorsousa pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=1422e62f302f2f2f0995b19f98d6f971e39a921f
commit 1422e62f302f2f2f0995b19f98d6f971e39a921f
Author: Lauro Moura
Date: Tue Mar 15 18:00:20 2016 -0300
efl js: Fix naming of manual binding functions.
Also removed references to the discarded manual binding "ecore_js_file".
---
src/Makefile_Ecore_Js.am | 3 +-
src/bindings/js/ecore_js/Ecore_Js.hh | 2 +-
src/bindings/js/ecore_js/ecore_js_animator.cc | 48 +++---
src/bindings/js/ecore_js/ecore_js_event.cc| 51 +++
src/bindings/js/ecore_js/ecore_js_idle.cc | 12 +-
src/bindings/js/ecore_js/ecore_js_init.cc | 16 +-
src/bindings/js/ecore_js/ecore_js_job.cc | 2 +-
src/bindings/js/ecore_js/ecore_js_mainloop.cc | 20 +--
src/bindings/js/ecore_js/ecore_js_poller.cc | 12 +-
src/bindings/js/ecore_js/ecore_js_throttle.cc | 4 +-
src/bindings/js/ecore_js/ecore_js_timer.cc| 10 +-
src/bindings/js/efl_js/efl_js.cc | 6 +-
src/bindings/js/eio_js/Eio_Js.hh | 2 +-
src/bindings/js/eio_js/eio_js.cc | 181 +++
src/bindings/js/ethumb_js/Ethumb_Js.hh| 1 +
src/bindings/js/ethumb_js/ethumb_js_client.cc | 29 ++--
src/tests/efl_js/benchmark_js_suite.js| 2 +-
src/tests/efl_js/ecore_js_suite.js| 202 +-
src/tests/efl_js/eina_js_containers_suite.js | 2 +-
src/tests/efl_js/eina_js_suite.js | 2 +-
src/tests/efl_js/eio_js_suite.js | 4 +-
src/tests/efl_js/eldbus_js_suite.js | 2 +-
src/tests/efl_js/ethumb_js_suite.js | 10 +-
src/tests/eolian_js/eolian_js_suite.js| 2 +-
24 files changed, 304 insertions(+), 321 deletions(-)
diff --git a/src/Makefile_Ecore_Js.am b/src/Makefile_Ecore_Js.am
index df5ac2f..0c73b99 100644
--- a/src/Makefile_Ecore_Js.am
+++ b/src/Makefile_Ecore_Js.am
@@ -13,7 +13,6 @@ bindings/js/ecore_js/ecore_js_job.hh \
bindings/js/ecore_js/ecore_js_idle.hh \
bindings/js/ecore_js/ecore_js_animator.hh \
bindings/js/ecore_js/ecore_js_poller.hh \
-bindings/js/ecore_js/ecore_js_throttle.hh \
-bindings/js/ecore_js/ecore_js_file.hh
+bindings/js/ecore_js/ecore_js_throttle.hh
endif
diff --git a/src/bindings/js/ecore_js/Ecore_Js.hh
b/src/bindings/js/ecore_js/Ecore_Js.hh
index 3f877f3..15331aa 100644
--- a/src/bindings/js/ecore_js/Ecore_Js.hh
+++ b/src/bindings/js/ecore_js/Ecore_Js.hh
@@ -5,6 +5,7 @@
#include
#include
#include
+#include
#ifdef EAPI
# undef EAPI
@@ -43,7 +44,6 @@ using
::efl::eina::js::compatibility_set_pointer_internal_field;
EAPI void register_ecore_animator(v8::Isolate *isolate,v8::Handle
exports);
EAPI void register_ecore_event(v8::Isolate* isolate, v8::Handle
exports);
-EAPI void register_ecore_file(v8::Isolate* isolate, v8::Handle
exports);
EAPI void register_ecore_idle(v8::Isolate *isolate,v8::Handle
exports);
EAPI void register_ecore_job(v8::Isolate *isolate,v8::Handle
exports);
EAPI void register_ecore_mainloop(v8::Isolate *isolate,v8::Handle
exports);
diff --git a/src/bindings/js/ecore_js/ecore_js_animator.cc
b/src/bindings/js/ecore_js/ecore_js_animator.cc
index 849e4d7..322db17 100644
--- a/src/bindings/js/ecore_js/ecore_js_animator.cc
+++ b/src/bindings/js/ecore_js/ecore_js_animator.cc
@@ -526,83 +526,75 @@ void register_ecore_animator(v8::Isolate* isolate,
v8::Handle export
{
register_pos_map_linear(isolate, exports,
compatibility_new(isolate,
- "ECORE_POS_MAP_LINEAR"));
+ "POS_MAP_LINEAR"));
register_pos_map_accelerate(isolate, exports,
compatibility_new(isolate,
- "ECORE_POS_MAP"
+ "POS_MAP"
"_ACCELERATE"));
register_pos_map_decelerate(isolate, exports,
compatibility_new(isolate,
- "ECORE_POS_MAP"
+ "POS_MAP"
"_DECELERATE"));
register_pos_map_sinusoidal(isolate, exports,
compatibility_new(isolate,
- "ECORE_POS_MAP"
+ "POS_MAP"
"_SINUSOIDAL"));
register_pos_map_accelerate_factor(isolate, exports,
compatibility_new(isolate,
-"ECORE_POS_MAP"
+"P
[EGIT] [core/enlightenment] master 05/05: fix stringshare usage in wizard language page (010)
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=604bf1ea4efeb2fe85d24987322e7c68fbf793c0
commit 604bf1ea4efeb2fe85d24987322e7c68fbf793c0
Author: Mike Blumenkrantz
Date: Wed Mar 16 13:01:09 2016 -0400
fix stringshare usage in wizard language page (010)
lang is not stringshared, and if it were then add/ref should always
be called before del
---
src/modules/wizard/page_010.c | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/modules/wizard/page_010.c b/src/modules/wizard/page_010.c
index d07ec2f..120953b 100644
--- a/src/modules/wizard/page_010.c
+++ b/src/modules/wizard/page_010.c
@@ -246,8 +246,7 @@ wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED)
{
// evas_object_del(pg->data);
/* special - language inits its stuff the moment it goes away */
- eina_stringshare_del(e_config->language);
- e_config->language = eina_stringshare_ref(lang);
+ eina_stringshare_replace(&e_config->language, lang);
/* TODO:
* This should be on lang select,
* so if next page needs xdg we can't press next */
@@ -262,8 +261,7 @@ E_API int
wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED)
{
// do this again as we want it to apply to the new profile
- eina_stringshare_del(e_config->language);
- e_config->language = eina_stringshare_ref(lang);
+ eina_stringshare_replace(&e_config->language, lang);
e_intl_language_set(e_config->language);
e_wizard_labels_update();
return 1;
--
[EGIT] [core/enlightenment] master 02/02: store (internal) elm win geometry when set prior to showing the win
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=7ce5f68b51ad9f4fe3cc20ae2acbd46334fe227e
commit 7ce5f68b51ad9f4fe3cc20ae2acbd46334fe227e
Author: Mike Blumenkrantz
Date: Fri Mar 18 13:47:25 2016 -0400
store (internal) elm win geometry when set prior to showing the win
this fixes the case where attempts to manipulate a window would fail
prior to showing the window
---
src/bin/e_win.c | 7 +++
1 file changed, 7 insertions(+)
diff --git a/src/bin/e_win.c b/src/bin/e_win.c
index 018a887..2e0ba14 100644
--- a/src/bin/e_win.c
+++ b/src/bin/e_win.c
@@ -7,8 +7,10 @@ typedef struct _Elm_Win_Trap_Ctx
{
E_Client *client;
E_Pointer *pointer;
+ int x, y, w, h;
Eina_Bool centered : 1;
Eina_Bool placed : 1;
+ Eina_Bool sized : 1;
Eina_Bool internal_no_remember : 1;
Eina_Bool internal_no_reopen : 1;
Eina_Bool visible : 1;
@@ -154,6 +156,8 @@ _e_elm_win_trap_show(void *data, Evas_Object *o)
e_comp_object_frame_xy_adjust(ctx->client->frame, ctx->client->client.x,
ctx->client->client.y, &ctx->client->x, &ctx->client->y);
e_comp_object_frame_wh_adjust(ctx->client->frame, ctx->client->client.w,
ctx->client->client.h, &ctx->client->w, &ctx->client->h);
if (ctx->centered) e_comp_object_util_center(ctx->client->frame);
+ else if (ctx->placed) evas_object_move(o, ctx->x, ctx->y);
+ if (ctx->sized) evas_object_resize(o, ctx->w, ctx->h);
return EINA_TRUE;
}
@@ -174,6 +178,7 @@ _e_elm_win_trap_move(void *data, Evas_Object *o, int x, int
y)
if ((x == ex) && (y == ey)) return EINA_FALSE;
}
ctx->placed = 1;
+ ctx->x = x, ctx->y = y;
if (!ctx->client) return EINA_TRUE;
if ((ctx->client->client.x != x) || (ctx->client->client.y != y))
e_client_util_move_without_frame(ctx->client, x, y);
@@ -185,6 +190,8 @@ _e_elm_win_trap_resize(void *data, Evas_Object *o
EINA_UNUSED, int w, int h)
{
Elm_Win_Trap_Ctx *ctx = data;
EINA_SAFETY_ON_NULL_RETURN_VAL(ctx, EINA_TRUE);
+ ctx->sized = 1;
+ ctx->w = w, ctx->h = h;
if (!ctx->client) return EINA_TRUE;
e_comp_object_frame_wh_adjust(ctx->client->frame, w, h, &w, &h);
e_client_resize_limit(ctx->client, &w, &h);
--
[EGIT] [tools/enventor] master 01/01: edc_editor: Fix to allocate memory including null character '\0'.
jaehyun pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=eb1f95d02c92b2f3a4ed108f88219a3dd5a07bdb commit eb1f95d02c92b2f3a4ed108f88219a3dd5a07bdb Author: Jaehyun Cho Date: Thu Mar 17 17:54:56 2016 +0900 edc_editor: Fix to allocate memory including null character '\0'. Without this patch, crash sometimes happens when preview part is clicked on Windows. --- src/lib/edc_editor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/edc_editor.c b/src/lib/edc_editor.c index f5a4c14..b819e49 100644 --- a/src/lib/edc_editor.c +++ b/src/lib/edc_editor.c @@ -1142,11 +1142,11 @@ edit_part_cursor_set(edit_data *ed, char *utf8 = elm_entry_markup_to_utf8(text); int part_name_size = strlen(part_name) + 2; // 2 - is quotes. - char *part_name_search = calloc(part_name_size, sizeof(char)); + char *part_name_search = calloc(part_name_size + 1, sizeof(char)); snprintf(part_name_search, part_name_size, "\"%s\"", part_name); int group_name_size = strlen(group_name) + 2; // 2 - is quotes. - char *group_name_search = calloc(group_name_size, sizeof(char)); + char *group_name_search = calloc(group_name_size + 1, sizeof(char)); snprintf(group_name_search, group_name_size, "\"%s\"", group_name); const char *group_pos = strstr(utf8, group_name_search); --
[EGIT] [tools/eflete] master 04/04: property_group: update transition on action add
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=738be3a9f6d5582334d718401c0994cca309116a commit 738be3a9f6d5582334d718401c0994cca309116a Author: Vitalii Vorobiov Date: Fri Mar 18 10:40:01 2016 +0200 property_group: update transition on action add Since action can't be changed now but getting changed right after program_add, it should update things which happens. Fixes T3224 --- src/bin/ui/property_group.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bin/ui/property_group.c b/src/bin/ui/property_group.c index d8897be..0c7ca9c 100644 --- a/src/bin/ui/property_group.c +++ b/src/bin/ui/property_group.c @@ -1023,6 +1023,7 @@ _on_editor_attribute_changed(void *data, break; case ATTRIBUTE_PROGRAM_ACTION: prop_program_action_update(pd); + prop_program_transition_update(pd); break; case ATTRIBUTE_PROGRAM_STATE: prop_program_state_update(pd); --
[EGIT] [core/elementary] elementary-1.17 02/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=156834082f9deb6cccf9870619b7bf6aa31a217d
commit 156834082f9deb6cccf9870619b7bf6aa31a217d
Author: Stefan Schmidt
Date: Wed Mar 16 21:52:09 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.
This did not only affect the widget but also our container. Infrastructure
is
up next. Hopefully that will be the last change.
@fix
Ref T3109
---
doc/index.doxy | 20 ++---
src/lib/elc_naviframe.h| 4 +--
src/lib/elc_naviframe_common.h | 2 +-
src/lib/elc_naviframe_eo.h | 2 +-
src/lib/elm_box.h | 2 +-
src/lib/elm_box_common.h | 2 +-
src/lib/elm_box_legacy.h | 2 +-
src/lib/elm_conform.h | 4 +--
src/lib/elm_conform_eo.h | 2 +-
src/lib/elm_conform_legacy.h | 2 +-
src/lib/elm_deprecated.h | 14 -
src/lib/elm_gengrid.h | 4 +--
src/lib/elm_gengrid_common.h | 38 -
src/lib/elm_gengrid_eo.h | 2 +-
src/lib/elm_gengrid_legacy.h | 10 +++
src/lib/elm_genlist.h | 4 +--
src/lib/elm_genlist_common.h | 32 ++---
src/lib/elm_genlist_eo.h | 2 +-
src/lib/elm_genlist_legacy.h | 2 +-
src/lib/elm_grid.h | 2 +-
src/lib/elm_grid_eo.h | 2 +-
src/lib/elm_grid_legacy.h | 6 ++--
src/lib/elm_layout.h | 2 +-
src/lib/elm_layout_common.h| 2 +-
src/lib/elm_layout_eo.h| 2 +-
src/lib/elm_layout_legacy.h| 14 -
src/lib/elm_panes.h| 4 +--
src/lib/elm_panes_legacy.h | 2 +-
src/lib/elm_removed.h | 28 +-
src/lib/elm_scroller.h | 2 +-
src/lib/elm_scroller_eo.h | 2 +-
src/lib/elm_scroller_legacy.h | 64 +-
src/lib/elm_table.h| 2 +-
src/lib/elm_table_legacy.h | 6 ++--
34 files changed, 145 insertions(+), 145 deletions(-)
diff --git a/doc/index.doxy b/doc/index.doxy
index 41fa963..eb197a3 100644
--- a/doc/index.doxy
+++ b/doc/index.doxy
@@ -254,49 +254,49 @@
* it provides a number of containers. It's important to note that as
containers
* widgets don't have their own visual identity, so here we show one use for
* them and a diagram showing their component parts:
- * @li @ref Gengrid
+ * @li @ref Elm_Gengrid
*
* @image html img/widget/gengrid/preview-00.png
* @image latex img/widget/gengrid/preview-00.eps
- * @li @ref Genlist
+ * @li @ref Elm_Genlist
*
* @image html img/widget/genlist/preview-00.png
* @image latex img/widget/genlist/preview-00.eps
* @image html img/genlist.png
* @image latex img/genlist.eps
- * @li @ref Box
+ * @li @ref Elm_Box
*
* @image html img/widget/box/preview-00.png
* @image latex img/widget/box/preview-00.eps
* @image html img/box.png
* @image latex img/box.eps
- * @li @ref Conformant
+ * @li @ref Elm_Conformant
*
* @image html img/widget/conformant/preview-00.png
* @image latex img/widget/conformant/preview-00.eps
* @image html img/conformant.png
* @image latex img/conformant.eps
- * @li @ref Grid
- * @li @ref Layout
+ * @li @ref Elm_Grid
+ * @li @ref Elm_Layout
*
* @image html img/widget/layout/preview-00.png
* @image latex img/widget/layout/preview-00.eps
* @image html img/layout-predefined.png
* @image latex img/layout-predefined.eps
*
- * @li @ref Naviframe
+ * @li @ref Elm_Naviframe
*
- * @li @ref Panes
+ * @li @ref Elm_Panes
*
* @image html img/widget/panes/preview-00.png
* @image latex img/widget/panes/preview-00.eps
* @image html img/panes.png
* @image latex img/panes.eps
- * @li @ref Scroller
+ * @li @ref Elm_Scroller
*
* @image html img/widget/scroller/preview-00.png
* @image latex img/widget/scroller/preview-00.eps
- * @li @ref Table
+ * @li @ref Elm_Table
*
* @image html img/widget/table/preview-00.png
* @image latex img/widget/table/preview-00.eps
diff --git a/src/lib/elc_naviframe.h b/src/lib/elc_naviframe.h
index f4c4a27..d99c842 100644
--- a/src/lib/elc_naviframe.h
+++ b/src/lib/elc_naviframe.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Naviframe Naviframe
+ * @defgroup Elm_Naviframe Naviframe
* @ingroup Elementary
*
* @image html naviframe_inheritance_tree.png
@@ -85,7 +85,7 @@
*/
/**
- * @addtogroup Naviframe
+ * @addtogroup Elm_Naviframe
* @{
*/
diff --git a/src/lib/elc_naviframe_common.h b/src/lib/elc_naviframe_common.h
index 01b87c5..525f995 100644
--- a/src/lib/elc_naviframe_common.h
+++ b/src/lib/elc_naviframe_common.h
@@ -17,7 +17,7 @@ ty
[EGIT] [core/efl] master 02/02: evas-wayland-shm: Override image_native init and shutdown functions
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=6418810307560fa12b02b412891596673b8bb53e commit 6418810307560fa12b02b412891596673b8bb53e Author: Chris Michael Date: Fri Mar 18 08:53:35 2016 -0400 evas-wayland-shm: Override image_native init and shutdown functions A previous commit added these functions so we can test if native image is supported, however that commit did not actually override this functions (evas api override). This small patch simply does that. ref 20b4d9dd6adb88f9dd0cd51fa849f0c360432279 @fix Signed-off-by: Chris Michael --- src/modules/evas/engines/wayland_shm/evas_engine.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/modules/evas/engines/wayland_shm/evas_engine.c b/src/modules/evas/engines/wayland_shm/evas_engine.c index adf33f6..0bcfcc4 100644 --- a/src/modules/evas/engines/wayland_shm/evas_engine.c +++ b/src/modules/evas/engines/wayland_shm/evas_engine.c @@ -392,6 +392,8 @@ module_open(Evas_Module *em) ORD(output_resize); ORD(image_native_set); ORD(image_native_get); + ORD(image_native_init); + ORD(image_native_shutdown); _symbols(); /* advertise our own engine functions */ --
[EGIT] [core/efl] master 03/05: Efl.Gfx.Fill: Rename filled to fill_auto
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=b8f682b842675d8ac952ddbc067befc22ec486ce
commit b8f682b842675d8ac952ddbc067befc22ec486ce
Author: Jean-Philippe Andre
Date: Fri Mar 18 11:50:48 2016 +0900
Efl.Gfx.Fill: Rename filled to fill_auto
fill_filled is a strange name for the property.
fill_auto seems to make more sense. If you disagree, scream at
me or revert this commit.
---
src/examples/evas/evas-object-manipulation-eo.c | 2 --
src/lib/efl/interfaces/efl_gfx_fill.eo | 22 +++---
src/lib/efl/interfaces/efl_image.eo | 2 +-
src/lib/evas/Evas_Legacy.h | 4 ++--
src/lib/evas/canvas/efl_canvas_snapshot.c | 1 -
src/lib/evas/canvas/evas_image.eo | 4 ++--
src/lib/evas/canvas/evas_image_legacy.c | 6 +++---
src/lib/evas/canvas/evas_object_image.c | 6 +++---
src/tests/evas/evas_test_image.c| 2 +-
9 files changed, 19 insertions(+), 30 deletions(-)
diff --git a/src/examples/evas/evas-object-manipulation-eo.c
b/src/examples/evas/evas-object-manipulation-eo.c
index 3cc125a..4fe38f4 100644
--- a/src/examples/evas/evas-object-manipulation-eo.c
+++ b/src/examples/evas/evas-object-manipulation-eo.c
@@ -197,7 +197,6 @@ main(void)
* So it's possible to decrement refcount, and 'image' object
* will be deleted automatically by parent.*/
- efl_gfx_fill_filled_set(d.img, EINA_TRUE);
efl_file_set(d.img, img_path, NULL);
err = efl_image_load_error_get(d.img);
@@ -218,7 +217,6 @@ main(void)
/* border on the image's clipper, here just to emphasize its position */
d.clipper_border = eo_add(EVAS_IMAGE_CLASS, d.canvas);
- efl_gfx_fill_filled_set(d.clipper_border, EINA_TRUE);
efl_file_set(d.clipper_border, border_img_path, NULL);
err = efl_image_load_error_get(d.clipper_border);
diff --git a/src/lib/efl/interfaces/efl_gfx_fill.eo
b/src/lib/efl/interfaces/efl_gfx_fill.eo
index 0dde45c..5ee05e0 100644
--- a/src/lib/efl/interfaces/efl_gfx_fill.eo
+++ b/src/lib/efl/interfaces/efl_gfx_fill.eo
@@ -1,17 +1,19 @@
interface Efl.Gfx.Fill {
legacy_prefix: null;
methods {
- @property filled {
+ @property fill_auto {
[[Binds the object's @.fill property to its actual geometry.
If $true, then every time the object is resized, it will
automatically trigger a call to @Efl.Gfx.Fill.fill.set
with the new size (and 0, 0 as source image's origin),
- so the bound image will fill the whole object's area.
+ so the image will cover the whole object's area.
- This property takes precedence over @.fill.
+ This property takes precedence over @.fill. If set to $false, then
+ @.fill should be set.
- This flag is $true by default (used to be $false with the old APIs).
+ This flag is $true by default (used to be $false with the old APIs,
+ and was known as "filled").
]]
set {}
get {}
@@ -29,18 +31,8 @@ interface Efl.Gfx.Fill {
$w and $h need to be the exact width and height of the image object
itself, respectively.
- Note that this property has no effect if @.filled is $true.
+ Setting this property will reset the @.fill_auto to $false.
]]
-/* FIXME-doc
- * See the following image to better understand the effects of this
- * call. On this diagram, both image object and original image
source
- * have $a x $a dimensions and the image itself is a circle, with
- * empty space around it:
-
- * @image html image-fill.png
- * @image rtf image-fill.png
- * @image latex image-fill.eps
- */
set {}
get {}
values {
diff --git a/src/lib/efl/interfaces/efl_image.eo
b/src/lib/efl/interfaces/efl_image.eo
index b0499a3..50982a4 100644
--- a/src/lib/efl/interfaces/efl_image.eo
+++ b/src/lib/efl/interfaces/efl_image.eo
@@ -116,7 +116,7 @@ interface Efl.Image ()
in @Efl.Gfx.Border_Fill_Mode. By center we mean the complementary
part of that defined by @.border.set. This is very useful for
making frames and decorations. You would most probably also be
- using a filled image (as in @Efl.Gfx.Fill.filled) to use as a frame.
+ using a filled image (as in @Efl.Gfx.Fill.fill_auto) to use as a
frame.
The default value is @Efl.Gfx.Border_Fill_Mode.default, ie. render
and scale the center area, respecting its transparency.
diff --git a/src/lib/evas/Evas_Legacy.h b/src/lib/evas/Evas_Legacy.h
index 9f92ddd..ec276ea 100644
--- a/src/lib/evas/Evas_Legacy.h
+++ b/src/lib/evas/Evas_Legacy.h
@@ -3325,7 +3325,7 @@ EAPI double evas_object_image_border_scale_get(const
Evas_Object *obj);
* By center we mean t
[EGIT] [enlightenment/modules/edgar] master 01/01: Follow recent Eo changes
davemds pushed a commit to branch master.
http://git.enlightenment.org/enlightenment/modules/edgar.git/commit/?id=f23d28a58771bb3c4d357f94e22320d489d71570
commit f23d28a58771bb3c4d357f94e22320d489d71570
Author: Dave Andreoli
Date: Fri Mar 18 21:30:21 2016 +0100
Follow recent Eo changes
---
src/e_mod_edgar.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/e_mod_edgar.c b/src/e_mod_edgar.c
index 33d6f14..67be2c8 100644
--- a/src/e_mod_edgar.c
+++ b/src/e_mod_edgar.c
@@ -354,19 +354,19 @@ edgar_theme_object_set(Edgar_Py_Gadget *gadget,
Evas_Object *obj, const char *gr
}
static Eina_Bool
-edgar_popup_del_cb(void *data, Eo *obj, const Eo_Event_Description *desc, void
*event_info)
+edgar_popup_del_cb(void *data, const Eo_Event *event)
{
Edgar_Py_Gadget *gadget = data;
// call the popup_destoyed() method of the gadget.
- PyObject *pyobj = object_from_instance(obj);
+ PyObject *pyobj = object_from_instance(event->obj);
PyObject *ret = PyObject_CallMethod(gadget->instance, "popup_destroyed",
"(S)", pyobj);
PY_ON_ERROR_RETURN(!ret, EO_CALLBACK_CONTINUE, "Cannot call
popup_destroyed()");
Py_DECREF(pyobj);
Py_DECREF(ret);
- gadget->pops_obj = eina_list_remove(gadget->pops_obj, obj);
+ gadget->pops_obj = eina_list_remove(gadget->pops_obj, event->obj);
return EO_CALLBACK_CONTINUE;
}
@@ -386,8 +386,8 @@ edgar_popup_new(Edgar_Py_Gadget *gadget, E_Gadcon_Client
*gcc)
}
// NOTE: del cb with priority to be called before the python-efl one.
// Otherwise python-efl delete the python obj too soon
- eo_do(content, eo_event_callback_priority_add(
- EO_EV_DEL, EO_CALLBACK_PRIORITY_BEFORE, edgar_popup_del_cb, gadget));
+ eo_event_callback_priority_add(content, EO_BASE_EVENT_DEL,
+ EO_CALLBACK_PRIORITY_BEFORE, edgar_popup_del_cb, gadget);
// call the popup_created() method of the gadget.
PyObject *pyobj = object_from_instance(content);
--
[EGIT] [website/www-content] master 08/10: Wiki page download-latest changed with summary [E20.6] by Mike Blumenkrantz
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=4fe97e63f867838025378f027971905987e9eb68 commit 4fe97e63f867838025378f027971905987e9eb68 Author: Mike Blumenkrantz Date: Wed Mar 9 11:21:23 2016 -0800 Wiki page download-latest changed with summary [E20.6] by Mike Blumenkrantz --- pages/download-latest.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/download-latest.txt b/pages/download-latest.txt index 5e0bc50..673317b 100644 --- a/pages/download-latest.txt +++ b/pages/download-latest.txt @@ -5,7 +5,7 @@ emotion_generic_players_v = 1.17.0 evas_generic_loaders_v= 1.17.0 python_efl_v = 1.17.0 -enlightenment_v = 0.20.5 +enlightenment_v = 0.20.6 terminology_v = 0.9.1 rage_v= 0.1.4 econnman_v= 1.1 --
