[EGIT] [core/efl] master 01/01: efl_ui_win: always force resize job on first pre-render
bu5hm4n pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=efe5f9237795f05153bba3663cef74aa90f90956 commit efe5f9237795f05153bba3663cef74aa90f90956 Author: Mike Blumenkrantz Date: Wed May 23 10:28:05 2018 +0200 efl_ui_win: always force resize job on first pre-render Summary: ensure that a resize eval occurs after the frame edje has been thawed so that sizing will be correct in engines which either still have broken size handling (D6019) or have sub-optimal size handling (D6145) Reviewers: bu5hm4n, cedric Reviewed By: bu5hm4n Tags: #efl Differential Revision: https://phab.enlightenment.org/D6165 --- src/lib/elementary/efl_ui_win.c | 6 ++ 1 file changed, 6 insertions(+) diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index a2e0e62e44..d538af96ec 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c @@ -999,6 +999,12 @@ _elm_win_pre_render(Ecore_Evas *ee) _elm_win_frame_style_update(sd, 1, 1); ELM_WIN_DATA_ALIVE_CHECK(obj, sd); +/* set this to handle ecore-evas engine code which incorrectly + * assumes that a client resize call is the same as a server resize + * event, or which has no server event + */ +sd->deferred_resize_job = EINA_TRUE; + /* force initial sizing on frame to enable sizing of content */ edje_object_size_min_calc(sd->frame_obj, &mw, &mh); evas_object_resize(sd->frame_obj, mw, mh); --
[EGIT] [core/efl] master 01/01: elm: fix backward compatibility for "default" name part
jaehyun pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=495edbd9958ff077e44a62bf83f1a9032875f423
commit 495edbd9958ff077e44a62bf83f1a9032875f423
Author: YeongJong Lee
Date: Wed May 23 19:35:18 2018 +0900
elm: fix backward compatibility for "default" name part
Summary:
If you use legacy content/text set/get/unset with "default" part name,
_elm_layout_part_aliasing_eval change the part name to
"elm.swallow.content".
Because internal _content_set/get/unset checked only "default" string,
legacy content/test set/get/unset with "default" part name was not working.
This patch fixes that bug.
Test Plan: elm_object_part_content/text_set(obj, "default", content)
Reviewers: Jaehyun_Cho, woohyun
Reviewed By: Jaehyun_Cho
Subscribers: cedric, zmike
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D6185
---
src/lib/elementary/elc_ctxpopup.c | 8 +++-
src/lib/elementary/elc_fileselector_entry.c | 4 ++--
src/lib/elementary/elc_multibuttonentry.c | 4 ++--
src/lib/elementary/elc_popup.c | 10 --
src/lib/elementary/elm_notify.c | 6 +++---
src/lib/elementary/elm_panel.c | 6 +++---
src/lib/elementary/elm_scroller.c | 15 ++-
7 files changed, 23 insertions(+), 30 deletions(-)
diff --git a/src/lib/elementary/elc_ctxpopup.c
b/src/lib/elementary/elc_ctxpopup.c
index 55507d7252..9423e04fce 100644
--- a/src/lib/elementary/elc_ctxpopup.c
+++ b/src/lib/elementary/elc_ctxpopup.c
@@ -700,7 +700,7 @@ _elm_ctxpopup_efl_ui_widget_theme_apply(Eo *obj,
Elm_Ctxpopup_Data *sd)
static Eina_Bool
_elm_ctxpopup_content_set(Eo *obj, Elm_Ctxpopup_Data *sd, const char *part,
Evas_Object *content)
{
- if ((part) && (strcmp(part, "default")))
+ if ((part) && (strcmp(part, "elm.swallow.content")))
{
return efl_content_set(efl_part(efl_super(obj, MY_CLASS), part),
content);
}
@@ -733,7 +733,7 @@ _elm_ctxpopup_content_set(Eo *obj, Elm_Ctxpopup_Data *sd,
const char *part, Evas
static Evas_Object*
_elm_ctxpopup_content_get(Eo *obj, Elm_Ctxpopup_Data *sd, const char *part)
{
- if ((part) && (strcmp(part, "default")))
+ if ((part) && (strcmp(part, "elm.swallow.content")))
return efl_content_get(efl_part(efl_super(obj, MY_CLASS), part));
return sd->content;
@@ -744,7 +744,7 @@ _elm_ctxpopup_content_unset(Eo *obj, Elm_Ctxpopup_Data *sd,
const char *part)
{
Evas_Object *content = NULL;
- if ((part) && (strcmp(part, "default")))
+ if ((part) && (strcmp(part, "elm.swallow.content")))
return efl_content_unset(efl_part(efl_super(obj, MY_CLASS), part));
content = sd->content;
@@ -1572,7 +1572,6 @@ ELM_PART_OVERRIDE(elm_ctxpopup, ELM_CTXPOPUP,
Elm_Ctxpopup_Data)
ELM_PART_OVERRIDE_CONTENT_SET(elm_ctxpopup, ELM_CTXPOPUP, Elm_Ctxpopup_Data)
ELM_PART_OVERRIDE_CONTENT_GET(elm_ctxpopup, ELM_CTXPOPUP, Elm_Ctxpopup_Data)
ELM_PART_OVERRIDE_CONTENT_UNSET(elm_ctxpopup, ELM_CTXPOPUP, Elm_Ctxpopup_Data)
-ELM_PART_CONTENT_DEFAULT_GET(elm_ctxpopup, "default")
#include "elm_ctxpopup_part.eo.c"
/* Efl.Part end */
@@ -1581,7 +1580,6 @@ ELM_PART_CONTENT_DEFAULT_GET(elm_ctxpopup, "default")
#define ELM_CTXPOPUP_EXTRA_OPS \
ELM_LAYOUT_SIZING_EVAL_OPS(elm_ctxpopup), \
- ELM_PART_CONTENT_DEFAULT_OPS(elm_ctxpopup), \
EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_ctxpopup)
#include "elm_ctxpopup_item.eo.c"
diff --git a/src/lib/elementary/elc_fileselector_entry.c
b/src/lib/elementary/elc_fileselector_entry.c
index 59108cd7aa..b935acc0c0 100644
--- a/src/lib/elementary/elc_fileselector_entry.c
+++ b/src/lib/elementary/elc_fileselector_entry.c
@@ -173,7 +173,7 @@ _elm_fileselector_entry_efl_ui_widget_on_disabled_update(Eo
*obj, Elm_Fileselect
static Eina_Bool
_elm_fileselector_entry_text_set(Eo *obj, Elm_Fileselector_Entry_Data *sd,
const char *part, const char *label)
{
- if (part && strcmp(part, "default"))
+ if (part && strcmp(part, "elm.text"))
{
efl_text_set(efl_part(efl_super(obj, MY_CLASS), part), label);
}
@@ -185,7 +185,7 @@ _elm_fileselector_entry_text_set(Eo *obj,
Elm_Fileselector_Entry_Data *sd, const
static const char *
_elm_fileselector_entry_text_get(Eo *obj, Elm_Fileselector_Entry_Data *sd,
const char *part)
{
- if (part && strcmp(part, "default"))
+ if (part && strcmp(part, "elm.text"))
{
const char *text = NULL;
text = efl_text_get(efl_part(efl_super(obj, MY_CLASS), part));
diff --git a/src/lib/elementary/elc_multibuttonentry.c
b/src/lib/elementary/elc_multibuttonentry.c
index f91ba38a9d..a155d85474 100644
--- a/src/lib/elementary/elc_multibuttonentry.c
+++ b/src/lib/elementary/elc_multibuttonentry.c
@@ -1477,7 +1477,7 @@ _view_init(Evas_Object *obj, Elm_Multibuttonentry_Data
*sd)
static void
_elm_multibuttonentry_text_set(Eo *obj, Elm_Multibuttonentry_Data *sd
EINA_UNUSED, const char *
[EGIT] [core/efl] master 01/01: evas: fix a map rendering problem.
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=9fcd03952ee51d34871794cb95585f3e589a3bb9
commit 9fcd03952ee51d34871794cb95585f3e589a3bb9
Author: Hermet Park
Date: Wed May 23 22:57:16 2018 +0900
evas: fix a map rendering problem.
When map of a smart object is turned off, redraw-updation area could be
incorrect.
This results in a mirror image problem.
for fixing this, let smart object request update-area in render_pre()
properly only in case of map changed.
Thanks to akanad for reviewing together.
@fix
---
src/lib/evas/canvas/evas_object_main.c | 1 -
src/lib/evas/canvas/evas_object_smart.c | 12 ++--
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/lib/evas/canvas/evas_object_main.c
b/src/lib/evas/canvas/evas_object_main.c
index d4a2040e84..f336b915ec 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -831,7 +831,6 @@ evas_object_render_pre_effect_updates(Eina_Array *rects,
Evas_Object *eo_obj, in
if (!obj) return;
if (!obj->layer) return;
- if (obj->is_smart) goto end;
/* FIXME: was_v isn't used... why? */
if (!obj->clip.clipees)
{
diff --git a/src/lib/evas/canvas/evas_object_smart.c
b/src/lib/evas/canvas/evas_object_smart.c
index c8c4441254..b5265331b4 100644
--- a/src/lib/evas/canvas/evas_object_smart.c
+++ b/src/lib/evas/canvas/evas_object_smart.c
@@ -1702,11 +1702,19 @@ evas_object_smart_render_pre(Evas_Object *eo_obj,
Evas_Object_Protected_Data *obj,
void *type_private_data EINA_UNUSED)
{
+ int is_v, was_v;
+
if (obj->pre_render_done) return;
if (obj->changed_map || obj->changed_src_visible)
- evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes,
- eo_obj, obj);
+ {
+evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes,
+eo_obj, obj);
+is_v = evas_object_is_visible(eo_obj, obj);
+was_v = evas_object_was_visible(eo_obj,obj);
+evas_object_render_pre_effect_updates(&obj->layer->evas->clip_changes,
+ eo_obj, is_v, was_v);
+ }
obj->pre_render_done = EINA_TRUE;
}
--
[EGIT] [core/efl] master 06/26: efl: rename Efl.Exe.* -> Efl.Exe_*
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=4396687b6c0efb4c314bd86bbd6e6ad2cd27feba
commit 4396687b6c0efb4c314bd86bbd6e6ad2cd27feba
Author: Xavi Artigas
Date: Tue May 22 17:29:59 2018 +0200
efl: rename Efl.Exe.* -> Efl.Exe_*
---
src/lib/ecore/efl_exe.eo | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/lib/ecore/efl_exe.eo b/src/lib/ecore/efl_exe.eo
index 289fe204c3..c58451c3a5 100644
--- a/src/lib/ecore/efl_exe.eo
+++ b/src/lib/ecore/efl_exe.eo
@@ -1,4 +1,4 @@
-enum Efl.Exe.Signal {
+enum Efl.Exe_Signal {
[[ ]]
int,
quit,
@@ -11,7 +11,7 @@ enum Efl.Exe.Signal {
usr2
}
-enum Efl.Exe.Flags {
+enum Efl.Exe_Flags {
[[ ]]
none = 0,
group_leader = 1,
@@ -25,14 +25,14 @@ class Efl.Exe (Efl.Task)
methods {
signal {
params {
-sig: Efl.Exe.Signal; [[ Send this signal to the task ]]
+sig: Efl.Exe_Signal; [[ Send this signal to the task ]]
}
}
@property exe_flags {
set { }
get { }
values {
- flags: Efl.Exe.Flags; [[ ]]
+ flags: Efl.Exe_Flags; [[ ]]
}
}
@property exit_signal {
--
[EGIT] [core/efl] master 17/26: efl: rename Efl.Ui.Focus.Composition.Adapter -> Efl.Ui.Focus.Composition_Adapter
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=1e8b7cc405863c23826dd0dfb16f12a62a6e620e
commit 1e8b7cc405863c23826dd0dfb16f12a62a6e620e
Author: Xavi Artigas
Date: Wed May 23 11:54:12 2018 +0200
efl: rename Efl.Ui.Focus.Composition.Adapter ->
Efl.Ui.Focus.Composition_Adapter
---
src/lib/elementary/efl_ui_focus_composition_adapter.eo | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/elementary/efl_ui_focus_composition_adapter.eo
b/src/lib/elementary/efl_ui_focus_composition_adapter.eo
index 429ffde02b..b9d26fdfe8 100644
--- a/src/lib/elementary/efl_ui_focus_composition_adapter.eo
+++ b/src/lib/elementary/efl_ui_focus_composition_adapter.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Focus.Composition.Adapter (Efl.Object, Efl.Ui.Focus.Object)
+class Efl.Ui.Focus.Composition_Adapter (Efl.Object, Efl.Ui.Focus.Object)
{
[[EFL UI Focus Composition Adapter class]]
methods {
--
[EGIT] [core/efl] master 23/26: efl: rename Efl.Ui.Widget.Orientation_Mode -> Efl.Ui.Widget_Orientation_Mode
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=61b409015e375ec17c6bdd8a0c6a6fd95cf8dd63
commit 61b409015e375ec17c6bdd8a0c6a6fd95cf8dd63
Author: Xavi Artigas
Date: Wed May 23 12:39:08 2018 +0200
efl: rename Efl.Ui.Widget.Orientation_Mode -> Efl.Ui.Widget_Orientation_Mode
---
src/lib/elementary/efl_ui.eot | 2 +-
src/lib/elementary/efl_ui_widget.eo | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lib/elementary/efl_ui.eot b/src/lib/elementary/efl_ui.eot
index 6d16db996c..0fd3622d1e 100644
--- a/src/lib/elementary/efl_ui.eot
+++ b/src/lib/elementary/efl_ui.eot
@@ -88,7 +88,7 @@ enum Efl.Ui.Activate
back, [[Activate back]]
}
-enum Efl.Ui.Widget.Orientation_Mode
+enum Efl.Ui.Widget_Orientation_Mode
{
[[Widget orientation mode, or how the theme handles screen orientation.
diff --git a/src/lib/elementary/efl_ui_widget.eo
b/src/lib/elementary/efl_ui_widget.eo
index cf5b834545..a3f9cd3952 100644
--- a/src/lib/elementary/efl_ui_widget.eo
+++ b/src/lib/elementary/efl_ui_widget.eo
@@ -262,7 +262,7 @@ abstract Efl.Ui.Widget (Efl.Canvas.Group, Efl.Access.Object,
See also @.on_orientation_update.
]]
values {
-mode:
Efl.Ui.Widget.Orientation_Mode(Efl.Ui.Widget.Orientation_Mode.default);
+mode:
Efl.Ui.Widget_Orientation_Mode(Efl.Ui.Widget_Orientation_Mode.default);
[[How window orientation should affect this widget.]]
}
}
--
[EGIT] [core/efl] master 22/26: efl: rename Efl.Ui.Text.Change_Info -> Efl.Ui.Text_Change_Info
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=e31b3213ec09bd5309d02172e95a0988ab9861f7
commit e31b3213ec09bd5309d02172e95a0988ab9861f7
Author: Xavi Artigas
Date: Wed May 23 12:37:35 2018 +0200
efl: rename Efl.Ui.Text.Change_Info -> Efl.Ui.Text_Change_Info
---
src/lib/efl/interfaces/efl_text_types.eot | 2 +-
src/lib/elementary/efl_ui_text.eo | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lib/efl/interfaces/efl_text_types.eot
b/src/lib/efl/interfaces/efl_text_types.eot
index 969ebacf7c..61003586b9 100644
--- a/src/lib/efl/interfaces/efl_text_types.eot
+++ b/src/lib/efl/interfaces/efl_text_types.eot
@@ -7,7 +7,7 @@ enum Efl.Text_Bidirectional_Type {
inherit [[Inherit text type]]
}
-struct Efl.Ui.Text.Change_Info {
+struct Efl.Ui.Text_Change_Info {
[[This structure includes all the information about content changes.
It's meant to be used to implement undo/redo.
diff --git a/src/lib/elementary/efl_ui_text.eo
b/src/lib/elementary/efl_ui_text.eo
index aaf34cce4d..c0ecc3c00c 100644
--- a/src/lib/elementary/efl_ui_text.eo
+++ b/src/lib/elementary/efl_ui_text.eo
@@ -368,7 +368,7 @@ class Efl.Ui.Text (Efl.Ui.Layout.Object,
Elm.Interface_Scrollable, Efl.Ui.Clicka
activated: void; [[Called when entry is activated]]
changed: void; [[Called when entry changes]]
/* FIXME: Sometimes it can be NULL but @nullable does not work on events
*/
- changed,user: Efl.Ui.Text.Change_Info;
+ changed,user: Efl.Ui.Text_Change_Info;
[[The text object has changed due to user interaction]]
validate: Elm.Validate_Content; [[Called when validating]]
context,open: void; [[Called when context menu was opened]]
--
[EGIT] [core/efl] master 24/26: efl: rename Efl.Ui.Zoom.Mode -> Efl.Ui.Zoom_Mode
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=e5ef9057b5c8bc5a2df4fe4d1989105bc40d25d2
commit e5ef9057b5c8bc5a2df4fe4d1989105bc40d25d2
Author: Xavi Artigas
Date: Wed May 23 12:39:57 2018 +0200
efl: rename Efl.Ui.Zoom.Mode -> Efl.Ui.Zoom_Mode
---
src/lib/efl/interfaces/efl_ui_zoom.eo | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lib/efl/interfaces/efl_ui_zoom.eo
b/src/lib/efl/interfaces/efl_ui_zoom.eo
index 4618070676..bc37073a53 100644
--- a/src/lib/efl/interfaces/efl_ui_zoom.eo
+++ b/src/lib/efl/interfaces/efl_ui_zoom.eo
@@ -1,4 +1,4 @@
-enum Efl.Ui.Zoom.Mode
+enum Efl.Ui.Zoom_Mode
{
[[Types of zoom available.]]
legacy: efl_ui_zoom_mode;
@@ -88,7 +88,7 @@ interface Efl.Ui.Zoom ()
]]
}
values {
-mode: Efl.Ui.Zoom.Mode; [[The zoom mode.]]
+mode: Efl.Ui.Zoom_Mode; [[The zoom mode.]]
}
}
}
--
[EGIT] [core/efl] master 05/26: efl: rename Efl.Event.Description -> Efl.Event_Description
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=029f0769a56d5f8f29751f4edbed0ebfb27e9aab
commit 029f0769a56d5f8f29751f4edbed0ebfb27e9aab
Author: Xavi Artigas
Date: Tue May 22 17:24:06 2018 +0200
efl: rename Efl.Event.Description -> Efl.Event_Description
---
src/lib/elementary/efl_access_object.eo| 2 +-
src/lib/eo/efl_object.eo | 8
src/lib/evas/canvas/efl_canvas_object.eo | 2 +-
src/lib/evas/gesture/efl_canvas_gesture.eo | 2 +-
src/lib/evas/gesture/efl_canvas_gesture_manager.eo | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/lib/elementary/efl_access_object.eo
b/src/lib/elementary/efl_access_object.eo
index b2d28d1686..5eb8b2deac 100644
--- a/src/lib/elementary/efl_access_object.eo
+++ b/src/lib/elementary/efl_access_object.eo
@@ -376,7 +376,7 @@ mixin Efl.Access.Object (Efl.Interface, Efl.Object)
[[Emit event]]
params {
@in accessible: Efl.Access.Object; [[Accessibility object.]]
-@cref event: Efl.Event.Description; [[Accessibility event type.]]
+@cref event: Efl.Event_Description; [[Accessibility event type.]]
@in event_info: void_ptr; [[Accessibility event details.]]
}
}
diff --git a/src/lib/eo/efl_object.eo b/src/lib/eo/efl_object.eo
index ba68b77734..a9fd471c47 100644
--- a/src/lib/eo/efl_object.eo
+++ b/src/lib/eo/efl_object.eo
@@ -1,6 +1,6 @@
import eina_types;
-struct Efl.Event.Description {
+struct Efl.Event_Description {
[[This struct holds the description of a specific event.]]
name: string; [[name of the event.]]
unfreezable: bool; [[$true if the event cannot be frozen.]]
@@ -230,14 +230,14 @@ abstract Efl.Object ()
event_callback_forwarder_add {
[[Add an event callback forwarder for an event and an object.]]
params {
-@cref desc: Efl.Event.Description; [[The description of the event
to listen to]]
+@cref desc: Efl.Event_Description; [[The description of the event
to listen to]]
@in new_obj: Efl.Object; [[The object to emit events from]]
}
}
event_callback_forwarder_del {
[[Remove an event callback forwarder for an event and an object.]]
params {
-@cref desc: Efl.Event.Description; [[The description of the event
to listen to]]
+@cref desc: Efl.Event_Description; [[The description of the event
to listen to]]
@in new_obj: Efl.Object; [[The object to emit events from]]
}
}
@@ -318,6 +318,6 @@ struct Efl.Event {
This is the full event information passed to callbacks in C.
]]
object: Efl.Object; [[The object the callback was called on.]]
-desc: const(ptr(Efl.Event.Description)); [[The event description.]]
+desc: const(ptr(Efl.Event_Description)); [[The event description.]]
info: void_ptr; [[Extra event information passed by the event caller]]
}
diff --git a/src/lib/evas/canvas/efl_canvas_object.eo
b/src/lib/evas/canvas/efl_canvas_object.eo
index e44cb53dee..dabfe74dbc 100644
--- a/src/lib/evas/canvas/efl_canvas_object.eo
+++ b/src/lib/evas/canvas/efl_canvas_object.eo
@@ -581,7 +581,7 @@ abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx.Entity,
Efl.Gfx.Color, Efl.Gfx.S
get { legacy: null; }
set { legacy: null; }
keys {
-@cref desc: Efl.Event.Description;
+@cref desc: Efl.Event_Description;
[[The event description for which the given $animation is set.]]
}
values {
diff --git a/src/lib/evas/gesture/efl_canvas_gesture.eo
b/src/lib/evas/gesture/efl_canvas_gesture.eo
index fdad8d2335..d4abd7c671 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture.eo
+++ b/src/lib/evas/gesture/efl_canvas_gesture.eo
@@ -10,7 +10,7 @@ abstract Efl.Canvas.Gesture(Efl.Object)
get {
}
values {
-@cref type: Efl.Event.Description; [[gesture type]]
+@cref type: Efl.Event_Description; [[gesture type]]
}
}
@property state {
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_manager.eo
b/src/lib/evas/gesture/efl_canvas_gesture_manager.eo
index 79fc3cc595..5084083a38 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_manager.eo
+++ b/src/lib/evas/gesture/efl_canvas_gesture_manager.eo
@@ -8,7 +8,7 @@ class Efl.Canvas.Gesture_Manager (Efl.Object)
params {
@in recognizer: Efl.Canvas.Gesture_Recognizer; [[The gesture
recognizer object]]
}
- return: ptr(const(Efl.Event.Description)); [[Returns the
Efl.Event.Description type the recognizer supports]]
+ return: ptr(const(Efl.Event_Description)); [[Returns the
Efl.Event_Description type the recognizer supports]]
}
recognizer_unregister {
[[This function is called to unregister a
Efl.Canvas.Gesture_Re
[EGIT] [core/efl] master 04/26: efl: rename Efl.Event.Animator_Tick -> Efl.Event_Animator_Tick
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=7a427b3bfca09ae270ed33783bd5e8db58d5eba3
commit 7a427b3bfca09ae270ed33783bd5e8db58d5eba3
Author: Xavi Artigas
Date: Tue May 22 17:11:31 2018 +0200
efl: rename Efl.Event.Animator_Tick -> Efl.Event_Animator_Tick
---
src/lib/efl/interfaces/efl_animator.eo | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lib/efl/interfaces/efl_animator.eo
b/src/lib/efl/interfaces/efl_animator.eo
index ac7e86ba28..ca969d99fe 100644
--- a/src/lib/efl/interfaces/efl_animator.eo
+++ b/src/lib/efl/interfaces/efl_animator.eo
@@ -1,6 +1,6 @@
import eina_types;
-struct Efl.Event.Animator_Tick {
+struct Efl.Event_Animator_Tick {
[[EFL event animator tick data structure]]
update_area: Eina.Rect; [[Area of the canvas that will be pushed to
screen.]]
}
@@ -10,6 +10,6 @@ interface Efl.Animator {
eo_prefix: efl_animator;
event_prefix: efl;
events {
- animator,tick: Efl.Event.Animator_Tick; [[Animator tick synchronized
with screen vsync if possible.]]
+ animator,tick: Efl.Event_Animator_Tick; [[Animator tick synchronized
with screen vsync if possible.]]
}
}
--
[EGIT] [core/efl] master 11/26: efl: rename Efl.Observable.Tuple -> Efl.Observable_Tuple
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=f78c5f3e6ce6f015ff72a88e30861f80fec431d5
commit f78c5f3e6ce6f015ff72a88e30861f80fec431d5
Author: Xavi Artigas
Date: Wed May 23 11:22:38 2018 +0200
efl: rename Efl.Observable.Tuple -> Efl.Observable_Tuple
---
src/lib/efl/interfaces/efl_observable.eo | 2 +-
src/lib/efl/interfaces/efl_types.eot | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lib/efl/interfaces/efl_observable.eo
b/src/lib/efl/interfaces/efl_observable.eo
index 8aa7bba6c1..f39d3dc8bb 100644
--- a/src/lib/efl/interfaces/efl_observable.eo
+++ b/src/lib/efl/interfaces/efl_observable.eo
@@ -56,7 +56,7 @@ class Efl.Observable (Efl.Object) {
[[Return a new iterator associated to this observable.
@since 1.19]]
- return: iterator @owned; [[Iterator for
observer]]
+ return: iterator @owned; [[Iterator for
observer]]
}
}
implements {
diff --git a/src/lib/efl/interfaces/efl_types.eot
b/src/lib/efl/interfaces/efl_types.eot
index f515a92ddb..06a9426ee8 100644
--- a/src/lib/efl/interfaces/efl_types.eot
+++ b/src/lib/efl/interfaces/efl_types.eot
@@ -39,7 +39,7 @@ struct Efl.Version
build_id: string; [[Contains $EFL_BUILD_ID.]]
}
-struct Efl.Observable.Tuple
+struct Efl.Observable_Tuple
{
[[This type describes an observable touple]]
key: string; [[Touple key]]
--
[EGIT] [core/efl] master 26/26: efl: merge namespace conflict related renaming progress
q66 pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=0f57eb861060b63b954f881da572dde88d626a32 commit 0f57eb861060b63b954f881da572dde88d626a32 Merge: 9fcd03952e c4572d3f79 Author: Daniel Kolesa Date: Wed May 23 17:34:09 2018 +0200 efl: merge namespace conflict related renaming progress This is a batch of changes renaming classes/types/etc to prevent namespace related conflcits in our tree, with the ultimate goal being enabling more static analysis on your eo files. This is accomplished mostly by flattening the namespaces. src/bin/eolian_mono/eolian/mono/blacklist.hh | 2 +- src/bin/eolian_mono/eolian/mono/klass.hh | 2 +- .../eolian_mono/eolian/mono/struct_definition.hh | 2 +- src/bindings/mono/eo_mono/iwrapper.cs | 5 + src/bindings/mono/eo_mono/workaround.cs| 8 +++ src/lib/ecore/efl_exe.eo | 8 +++ src/lib/ecore/efl_task.eo | 8 +++ src/lib/ecore_con/efl_net_ip_address.eo| 4 ++-- src/lib/ecore_con/efl_net_session.eo | 16 ++--- src/lib/efl/interfaces/efl_animator.eo | 4 ++-- src/lib/efl/interfaces/efl_gfx_color.eo| 2 +- src/lib/efl/interfaces/efl_gfx_color_class.eo | 2 +- src/lib/efl/interfaces/efl_gfx_gradient.eo | 4 ++-- src/lib/efl/interfaces/efl_gfx_path.eo | 4 ++-- src/lib/efl/interfaces/efl_gfx_shape.eo| 2 +- src/lib/efl/interfaces/efl_gfx_types.eot | 18 +++ src/lib/efl/interfaces/efl_input_device.eo | 6 ++--- src/lib/efl/interfaces/efl_observable.eo | 2 +- src/lib/efl/interfaces/efl_text_types.eot | 4 ++-- src/lib/efl/interfaces/efl_types.eot | 2 +- src/lib/efl/interfaces/efl_ui_drag.eo | 2 +- src/lib/efl/interfaces/efl_ui_types.eot| 2 +- src/lib/efl/interfaces/efl_ui_zoom.eo | 4 ++-- src/lib/elementary/efl_access_object.eo| 2 +- src/lib/elementary/efl_selection.eo| 16 ++--- src/lib/elementary/efl_selection_manager.eo| 26 +++--- src/lib/elementary/efl_selection_types.eot | 20 - src/lib/elementary/efl_ui.eot | 4 ++-- src/lib/elementary/efl_ui_button_legacy_part.eo| 2 +- src/lib/elementary/efl_ui_check_legacy_part.eo | 2 +- src/lib/elementary/efl_ui_dnd.eo | 12 +- src/lib/elementary/efl_ui_dnd_container.eo | 2 +- src/lib/elementary/efl_ui_dnd_types.eot| 10 - .../elementary/efl_ui_focus_composition_adapter.eo | 2 +- src/lib/elementary/efl_ui_pager.eo | 4 ++-- .../elementary/efl_ui_progressbar_legacy_part.eo | 2 +- src/lib/elementary/efl_ui_radio_legacy_part.eo | 2 +- src/lib/elementary/efl_ui_stack.eo | 16 ++--- src/lib/elementary/efl_ui_tab_page.eo | 10 - src/lib/elementary/efl_ui_tab_page_part_tab.eo | 2 +- src/lib/elementary/efl_ui_text.eo | 6 ++--- src/lib/elementary/efl_ui_widget.eo| 2 +- src/lib/elementary/elm_slider_part_indicator.eo| 2 +- src/lib/eo/efl_object.eo | 8 +++ src/lib/evas/canvas/efl_canvas_animation.eo| 2 +- src/lib/evas/canvas/efl_canvas_animation_player.eo | 2 +- src/lib/evas/canvas/efl_canvas_animation_types.eot | 4 ++-- src/lib/evas/canvas/efl_canvas_object.eo | 12 +- src/lib/evas/canvas/evas_canvas.eo | 2 +- src/lib/evas/canvas/evas_text.eo | 2 +- src/lib/evas/gesture/efl_canvas_gesture.eo | 4 ++-- src/lib/evas/gesture/efl_canvas_gesture_manager.eo | 2 +- .../evas/gesture/efl_canvas_gesture_recognizer.eo | 2 +- src/lib/evas/gesture/efl_canvas_gesture_touch.eo | 2 +- src/lib/evas/gesture/efl_canvas_gesture_types.eot | 6 ++--- 55 files changed, 150 insertions(+), 155 deletions(-) --
[EGIT] [core/efl] master 01/26: efl: rename Efl.Canvas.Animation.* -> Efl.Canvas.Animation_*
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=57b078f3df87c6c0f8f2b671e9d53cb91743c722
commit 57b078f3df87c6c0f8f2b671e9d53cb91743c722
Author: Xavi Artigas
Date: Tue May 22 13:01:34 2018 +0200
efl: rename Efl.Canvas.Animation.* -> Efl.Canvas.Animation_*
---
src/lib/evas/canvas/efl_canvas_animation.eo| 2 +-
src/lib/evas/canvas/efl_canvas_animation_player.eo | 2 +-
src/lib/evas/canvas/efl_canvas_animation_types.eot | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/lib/evas/canvas/efl_canvas_animation.eo
b/src/lib/evas/canvas/efl_canvas_animation.eo
index b3a2b22646..7773ca3d7c 100644
--- a/src/lib/evas/canvas/efl_canvas_animation.eo
+++ b/src/lib/evas/canvas/efl_canvas_animation.eo
@@ -32,7 +32,7 @@ class Efl.Canvas.Animation (Efl.Object, Efl.Playable)
get {
}
values {
-mode: Efl.Canvas.Animation.Repeat_Mode; [[Repeat mode.
EFL_ANIMATION_REPEAT_MODE_RESTART restarts animation when the animation ends
and EFL_ANIMATION_REPEAT_MODE_REVERSE reverses animation when the animation
ends.]]
+mode: Efl.Canvas.Animation_Repeat_Mode; [[Repeat mode.
EFL_ANIMATION_REPEAT_MODE_RESTART restarts animation when the animation ends
and EFL_ANIMATION_REPEAT_MODE_REVERSE reverses animation when the animation
ends.]]
}
}
@property repeat_count {
diff --git a/src/lib/evas/canvas/efl_canvas_animation_player.eo
b/src/lib/evas/canvas/efl_canvas_animation_player.eo
index 0418294136..a8e6dee9e8 100644
--- a/src/lib/evas/canvas/efl_canvas_animation_player.eo
+++ b/src/lib/evas/canvas/efl_canvas_animation_player.eo
@@ -49,7 +49,7 @@ class Efl.Canvas.Animation_Player (Efl.Object, Efl.Player)
events {
/* FIXME: This event is similar to Efl.Canvas.Object.anim_started but
with different type, might be confusing. */
started: void; [[Animation is started.]]
- running: Efl.Canvas.Object.Animation_Event; [[Animation is running.]]
+ running: Efl.Canvas.Object_Animation_Event; [[Animation is running.]]
/* FIXME: This event is similar to Efl.Canvas.Object.anim_ended but with
different type, might be confusing. */
ended: void; [[Animation is ended.]]
}
diff --git a/src/lib/evas/canvas/efl_canvas_animation_types.eot
b/src/lib/evas/canvas/efl_canvas_animation_types.eot
index 6961b27e4a..ad3aecc637 100644
--- a/src/lib/evas/canvas/efl_canvas_animation_types.eot
+++ b/src/lib/evas/canvas/efl_canvas_animation_types.eot
@@ -1,9 +1,9 @@
//
// All the below types are for Efl Animation
-struct Efl.Canvas.Animation.Player.Event_Running; [[Information of event
running]]
+struct Efl.Canvas.Animation_Player_Event_Running; [[Information of event
running]]
-enum Efl.Canvas.Animation.Repeat_Mode
+enum Efl.Canvas.Animation_Repeat_Mode
{
[[Animation repeat mode]]
--
[EGIT] [core/efl] master 16/26: efl: rename Efl.Ui.Drag.Dir -> Efl.Ui.Drag_Dir
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=cd349762c679b61f94726f0cba4b2aca2228037b
commit cd349762c679b61f94726f0cba4b2aca2228037b
Author: Xavi Artigas
Date: Wed May 23 11:52:03 2018 +0200
efl: rename Efl.Ui.Drag.Dir -> Efl.Ui.Drag_Dir
---
src/lib/efl/interfaces/efl_ui_drag.eo | 2 +-
src/lib/efl/interfaces/efl_ui_types.eot | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lib/efl/interfaces/efl_ui_drag.eo
b/src/lib/efl/interfaces/efl_ui_drag.eo
index 227015f2b0..dedcb348f1 100644
--- a/src/lib/efl/interfaces/efl_ui_drag.eo
+++ b/src/lib/efl/interfaces/efl_ui_drag.eo
@@ -73,7 +73,7 @@ interface Efl.Ui.Drag
]]
get {
[[Gets the draggable direction.]]
-return: Efl.Ui.Drag.Dir; [[The direction(s) premitted for drag.]]
+return: Efl.Ui.Drag_Dir; [[The direction(s) premitted for drag.]]
}
}
@property drag_step {
diff --git a/src/lib/efl/interfaces/efl_ui_types.eot
b/src/lib/efl/interfaces/efl_ui_types.eot
index 275d82fbd5..59cf1abf7f 100644
--- a/src/lib/efl/interfaces/efl_ui_types.eot
+++ b/src/lib/efl/interfaces/efl_ui_types.eot
@@ -1,4 +1,4 @@
-enum Efl.Ui.Drag.Dir {
+enum Efl.Ui.Drag_Dir {
[[Permitted directions for dragging objects.]]
none = 0, [[Not draggable in any direction.]]
x = 1, [[Draggable horizontally.]]
--
[EGIT] [core/efl] master 15/26: efl: rename Efl.Ui.*_Legacy.Part -> Efl.Ui.*_Legacy_Part
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=761aaa269d3ad9eab69b5bef67d537dd3fb2d712
commit 761aaa269d3ad9eab69b5bef67d537dd3fb2d712
Author: Xavi Artigas
Date: Wed May 23 11:50:45 2018 +0200
efl: rename Efl.Ui.*_Legacy.Part -> Efl.Ui.*_Legacy_Part
---
src/lib/elementary/efl_ui_button_legacy_part.eo | 2 +-
src/lib/elementary/efl_ui_check_legacy_part.eo | 2 +-
src/lib/elementary/efl_ui_progressbar_legacy_part.eo | 2 +-
src/lib/elementary/efl_ui_radio_legacy_part.eo | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/lib/elementary/efl_ui_button_legacy_part.eo
b/src/lib/elementary/efl_ui_button_legacy_part.eo
index 88b05c13f5..15b07c863f 100644
--- a/src/lib/elementary/efl_ui_button_legacy_part.eo
+++ b/src/lib/elementary/efl_ui_button_legacy_part.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Button_Legacy.Part (Efl.Ui.Layout.Part_Content)
+class Efl.Ui.Button_Legacy_Part (Efl.Ui.Layout.Part_Content)
{
[[Elementary button internal part class]]
data: null;
diff --git a/src/lib/elementary/efl_ui_check_legacy_part.eo
b/src/lib/elementary/efl_ui_check_legacy_part.eo
index 5abfae7010..40d62d3661 100644
--- a/src/lib/elementary/efl_ui_check_legacy_part.eo
+++ b/src/lib/elementary/efl_ui_check_legacy_part.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Check_Legacy.Part (Efl.Ui.Layout.Part_Content)
+class Efl.Ui.Check_Legacy_Part (Efl.Ui.Layout.Part_Content)
{
[[Elementary check internal part class]]
data: null;
diff --git a/src/lib/elementary/efl_ui_progressbar_legacy_part.eo
b/src/lib/elementary/efl_ui_progressbar_legacy_part.eo
index 18a713d851..382980829b 100644
--- a/src/lib/elementary/efl_ui_progressbar_legacy_part.eo
+++ b/src/lib/elementary/efl_ui_progressbar_legacy_part.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Progressbar_Legacy.Part (Efl.Ui.Layout.Part_Content)
+class Efl.Ui.Progressbar_Legacy_Part (Efl.Ui.Layout.Part_Content)
{
[[Elementary progressbar internal part class]]
data: null;
diff --git a/src/lib/elementary/efl_ui_radio_legacy_part.eo
b/src/lib/elementary/efl_ui_radio_legacy_part.eo
index a9882a824d..666d3c2318 100644
--- a/src/lib/elementary/efl_ui_radio_legacy_part.eo
+++ b/src/lib/elementary/efl_ui_radio_legacy_part.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Radio_Legacy.Part (Efl.Ui.Layout.Part_Content)
+class Efl.Ui.Radio_Legacy_Part (Efl.Ui.Layout.Part_Content)
{
[[Elementary radio internal part class]]
data: null;
--
[EGIT] [core/efl] master 08/26: efl: rename Efl.Gfx.*.* -> Efl.Gfx.*_*
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=88e92a63ed7cd4a6515729f9ca513ea18742b9dc
commit 88e92a63ed7cd4a6515729f9ca513ea18742b9dc
Author: Xavi Artigas
Date: Wed May 23 10:48:21 2018 +0200
efl: rename Efl.Gfx.*.* -> Efl.Gfx.*_*
---
src/lib/efl/interfaces/efl_gfx_gradient.eo | 4 ++--
src/lib/efl/interfaces/efl_gfx_path.eo | 4 ++--
src/lib/efl/interfaces/efl_gfx_shape.eo| 2 +-
src/lib/efl/interfaces/efl_gfx_types.eot | 16
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/lib/efl/interfaces/efl_gfx_gradient.eo
b/src/lib/efl/interfaces/efl_gfx_gradient.eo
index c8d4b3c880..311e873698 100644
--- a/src/lib/efl/interfaces/efl_gfx_gradient.eo
+++ b/src/lib/efl/interfaces/efl_gfx_gradient.eo
@@ -13,7 +13,7 @@ interface Efl.Gfx.Gradient
[[Get the list of color stops.]]
}
values {
-colors: ptr(const(Efl.Gfx.Gradient.Stop)); [[Color stops list]]
+colors: ptr(const(Efl.Gfx.Gradient_Stop)); [[Color stops list]]
length: uint; [[Length of the list]]
}
}
@@ -27,7 +27,7 @@ interface Efl.Gfx.Gradient
]]
}
values {
-s: Efl.Gfx.Gradient.Spread; [[Spread type to be used]]
+s: Efl.Gfx.Gradient_Spread; [[Spread type to be used]]
}
}
}
diff --git a/src/lib/efl/interfaces/efl_gfx_path.eo
b/src/lib/efl/interfaces/efl_gfx_path.eo
index a6df70d756..730ec8ba91 100644
--- a/src/lib/efl/interfaces/efl_gfx_path.eo
+++ b/src/lib/efl/interfaces/efl_gfx_path.eo
@@ -18,7 +18,7 @@ mixin Efl.Gfx.Path
get {
}
values {
-op: ptr(const(Efl.Gfx.Path.Command_Type)); [[Command list]]
+op: ptr(const(Efl.Gfx.Path_Command_Type)); [[Command list]]
points: ptr(const(double)); [[Point list]]
}
}
@@ -284,6 +284,6 @@ mixin Efl.Gfx.Path
}
}
events {
- changed: Efl.Gfx.Path.Change_Event; [[Graphics path was changed.]]
+ changed: Efl.Gfx.Path_Change_Event; [[Graphics path was changed.]]
}
}
diff --git a/src/lib/efl/interfaces/efl_gfx_shape.eo
b/src/lib/efl/interfaces/efl_gfx_shape.eo
index bd3c769422..6ad491763c 100644
--- a/src/lib/efl/interfaces/efl_gfx_shape.eo
+++ b/src/lib/efl/interfaces/efl_gfx_shape.eo
@@ -113,7 +113,7 @@ mixin Efl.Gfx.Shape (Efl.Gfx.Path)
get {
}
values {
-fill_rule: Efl.Gfx.Fill.Rule; [[The current fill rule of the shape
object.
+fill_rule: Efl.Gfx.Fill_Rule; [[The current fill rule of the shape
object.
One of $EFL_GFX_FILL_RULE_WINDING,
$EFL_GFX_FILL_RULE_ODD_EVEN]]
}
}
diff --git a/src/lib/efl/interfaces/efl_gfx_types.eot
b/src/lib/efl/interfaces/efl_gfx_types.eot
index 7ceb923a10..8f8292c992 100644
--- a/src/lib/efl/interfaces/efl_gfx_types.eot
+++ b/src/lib/efl/interfaces/efl_gfx_types.eot
@@ -30,7 +30,7 @@ enum Efl.Gfx.Render_Op {
last [[Sentinel value to indicate last enum field during iteration]]
}
-enum Efl.Gfx.Path.Command_Type {
+enum Efl.Gfx.Path_Command_Type {
[[These values determine how the points are interpreted in a stream of
points.
@since 1.14
]]
@@ -66,7 +66,7 @@ enum Efl.Gfx.Join
last [[Sentinel value to indicate last enum field during iteration]]
}
-enum Efl.Gfx.Gradient.Spread
+enum Efl.Gfx.Gradient_Spread
{
[[Specifies how the area outside the gradient area should be filled.
$ref efl_gfx_gradient_spread_set()
@@ -78,7 +78,7 @@ enum Efl.Gfx.Gradient.Spread
last [[Sentinel value to indicate last enum field during iteration]]
}
-enum Efl.Gfx.Fill.Rule
+enum Efl.Gfx.Fill_Rule
{
[[Type defining how an image content get filled.
@since 1.14
@@ -96,7 +96,7 @@ struct Efl.Gfx.Dash {
gap: double; [[Distance between two dashes.]]
}
-struct Efl.Gfx.Gradient.Stop
+struct Efl.Gfx.Gradient_Stop
{
[[Type defining gradient stops.
Describes the location and color of a transition point in a gradient.
@@ -109,7 +109,7 @@ struct Efl.Gfx.Gradient.Stop
a: int; [[The component A color of the gradient stop]]
}
-struct Efl.Gfx.Stroke.Color
+struct Efl.Gfx.Stroke_Color
{
[[Internal structure for @Efl.Gfx.Stroke.]]
r: int; [[The component R color of the stroke]]
@@ -127,14 +127,14 @@ struct Efl.Gfx.Stroke
scale: double; [[Stroke scale]]
width: double; [[Stroke width]]
centered: double; [[Stroke centered]]
- color: Efl.Gfx.Stroke.Color; [[Stroke color]]
+ color: Efl.Gfx.Stroke_Color; [[Stroke color]]
dash: ptr(Efl.Gfx.Dash); [[Stroke dash]]
dash_length: uint; [[Stroke dash length]]
cap: Efl.Gfx.Cap; [[Stroke cap]]
join: Efl.Gfx.Join; [[Stroke join]]
}
-struct Efl.Gfx.Shape.Public
+struct Efl.Gfx.Shape_Public
{
[[Public shape]]
stroke: Efl.Gfx.Stroke; [[Internal representation as stroke]]
@@ -158,7 +158,7 @@ enum Efl.Gfx.
[EGIT] [core/efl] master 18/26: efl: rename Efl.Ui.Pager.Loop -> Efl.Ui.Pager_Loop
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=a0d4d3b140ad5a71efe00f37e73c7428dce141f5
commit a0d4d3b140ad5a71efe00f37e73c7428dce141f5
Author: Xavi Artigas
Date: Wed May 23 12:23:13 2018 +0200
efl: rename Efl.Ui.Pager.Loop -> Efl.Ui.Pager_Loop
---
src/lib/elementary/efl_ui_pager.eo | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lib/elementary/efl_ui_pager.eo
b/src/lib/elementary/efl_ui_pager.eo
index 89cb495e58..6f22a0ffb6 100644
--- a/src/lib/elementary/efl_ui_pager.eo
+++ b/src/lib/elementary/efl_ui_pager.eo
@@ -1,4 +1,4 @@
-enum Efl.Ui.Pager.Loop
+enum Efl.Ui.Pager_Loop
{
[[Efl ui pager loop mode]]
disabled,
@@ -69,7 +69,7 @@ class Efl.Ui.Pager (Efl.Ui.Layout.Object, Efl.Pack_Linear)
This property gives the option to make a loop through pages.
]]
values {
-loop: Efl.Ui.Pager.Loop;
+loop: Efl.Ui.Pager_Loop;
}
}
@property page_size {
--
[EGIT] [core/efl] master 21/26: efl: rename Efl.Ui.Tab_Page.* -> Efl.Ui.Tab_Page_*
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=4ab7e3fda0c61c71c4a1c0a03d79b6671778166c
commit 4ab7e3fda0c61c71c4a1c0a03d79b6671778166c
Author: Xavi Artigas
Date: Wed May 23 12:34:44 2018 +0200
efl: rename Efl.Ui.Tab_Page.* -> Efl.Ui.Tab_Page_*
---
src/lib/elementary/efl_ui_tab_page.eo | 10 +-
src/lib/elementary/efl_ui_tab_page_part_tab.eo | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/lib/elementary/efl_ui_tab_page.eo
b/src/lib/elementary/efl_ui_tab_page.eo
index 75249b816c..e60ed78157 100644
--- a/src/lib/elementary/efl_ui_tab_page.eo
+++ b/src/lib/elementary/efl_ui_tab_page.eo
@@ -1,11 +1,11 @@
-enum Efl.Ui.Tab_Page.Tab_Changed {
+enum Efl.Ui.Tab_Page_Tab_Changed {
label = 0, [[Label changed]]
icon [[Icon changed]]
}
-struct Efl.Ui.Tab_Page.Tab.Changed_Event {
+struct Efl.Ui.Tab_Page_Tab_Changed_Event {
[[Information of changed event]]
- changed_info: Efl.Ui.Tab_Page.Tab_Changed;
+ changed_info: Efl.Ui.Tab_Page_Tab_Changed;
}
class Efl.Ui.Tab_Page (Efl.Ui.Layout.Object, Efl.Content)
@@ -14,7 +14,7 @@ class Efl.Ui.Tab_Page (Efl.Ui.Layout.Object, Efl.Content)
methods {
}
parts {
- tab: Efl.Ui.Tab_Page.Part_Tab;
+ tab: Efl.Ui.Tab_Page_Part_Tab;
}
implements {
Efl.Object.constructor;
@@ -23,6 +23,6 @@ class Efl.Ui.Tab_Page (Efl.Ui.Layout.Object, Efl.Content)
Efl.Part.part;
}
events {
- tab,changed: Efl.Ui.Tab_Page.Tab.Changed_Event; [[Called when tab
changed]]
+ tab,changed: Efl.Ui.Tab_Page_Tab_Changed_Event; [[Called when tab
changed]]
}
}
\ No newline at end of file
diff --git a/src/lib/elementary/efl_ui_tab_page_part_tab.eo
b/src/lib/elementary/efl_ui_tab_page_part_tab.eo
index b28fd9ae20..8c2ce57be1 100644
--- a/src/lib/elementary/efl_ui_tab_page_part_tab.eo
+++ b/src/lib/elementary/efl_ui_tab_page_part_tab.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Tab_Page.Part_Tab (Efl.Ui.Layout.Part, Efl.Text)
+class Efl.Ui.Tab_Page_Part_Tab (Efl.Ui.Layout.Part, Efl.Text)
{
[[Tab_Page internal part class]]
data: null;
--
[EGIT] [core/efl] master 10/26: efl: rename Efl.Net.*.* -> Efl.Net.*_*
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=f477d4ad360d6b5c6442b0f3fdbe215741aac873
commit f477d4ad360d6b5c6442b0f3fdbe215741aac873
Author: Xavi Artigas
Date: Wed May 23 11:21:10 2018 +0200
efl: rename Efl.Net.*.* -> Efl.Net.*_*
---
src/lib/ecore_con/efl_net_ip_address.eo | 4 ++--
src/lib/ecore_con/efl_net_session.eo| 16
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/lib/ecore_con/efl_net_ip_address.eo
b/src/lib/ecore_con/efl_net_ip_address.eo
index e715a0c7bb..eebbb0ac5b 100644
--- a/src/lib/ecore_con/efl_net_ip_address.eo
+++ b/src/lib/ecore_con/efl_net_ip_address.eo
@@ -1,6 +1,6 @@
import eina_types;
-struct Efl.Net.Ip_Address.Resolve_Results {
+struct Efl.Net.Ip_Address_Resolve_Results {
[[The results of @Efl.Net.Ip_Address.resolve call.
This structure is created by @Efl.Net.Ip_Address.resolve.
@@ -112,7 +112,7 @@ class Efl.Net.Ip_Address (Efl.Object) {
family: int @optional; [[Preferred family. AF_UNSPEC or 0 for
both, otherwise one of AF_INET or AF_INET6]]
flags: int @optional; [[Flags to use with getaddrinfo(). If 0,
default flags are used (AI_V4MAPPED | AI_ADDRCONFIG, if these exist in your
system).]]
}
-return: future; [[The
resolve results. It contains a list of Efl.Net.Ip_Address, they will be
automatically deleted unless you keep a reference to it.]]
+return: future; [[The
resolve results. It contains a list of Efl.Net.Ip_Address, they will be
automatically deleted unless you keep a reference to it.]]
}
@property string {
diff --git a/src/lib/ecore_con/efl_net_session.eo
b/src/lib/ecore_con/efl_net_session.eo
index 8bfd4497cd..87ca0d05fd 100644
--- a/src/lib/ecore_con/efl_net_session.eo
+++ b/src/lib/ecore_con/efl_net_session.eo
@@ -1,4 +1,4 @@
-enum Efl.Net.Session.State {
+enum Efl.Net.Session_State {
[[Provides the session connectivity state.
@since 1.19
@@ -9,7 +9,7 @@ enum Efl.Net.Session.State {
}
/* keep in sync with efl_net_control_technology.eo, comment what doesn't make
sense */
-enum Efl.Net.Session.Technology {
+enum Efl.Net.Session_Technology {
[[Bitwise-able technologies to allow for a network session.
@since 1.9
@@ -24,7 +24,7 @@ enum Efl.Net.Session.Technology {
vpn = (1 << 6), [[Type: Virtual Private Network]]
gadget = (1 << 7), [[Type: USB gadget]]
/*p2p = (1 << 8), [[Type: Peer-2-Peer]]*/
-all = (Efl.Net.Session.Technology.ethernet |
Efl.Net.Session.Technology.wifi | Efl.Net.Session.Technology.bluetooth |
Efl.Net.Session.Technology.cellular | Efl.Net.Session.Technology.vpn |
Efl.Net.Session.Technology.gadget), [[All technology types]]
+all = (Efl.Net.Session_Technology.ethernet |
Efl.Net.Session_Technology.wifi | Efl.Net.Session_Technology.bluetooth |
Efl.Net.Session_Technology.cellular | Efl.Net.Session_Technology.vpn |
Efl.Net.Session_Technology.gadget), [[All technology types]]
}
class Efl.Net.Session (Efl.Loop_Consumer) {
@@ -37,9 +37,9 @@ class Efl.Net.Session (Efl.Loop_Consumer) {
Some platforms may not implement the backend for this class. In
this cases the system will report always @.state "online"
- (@Efl.Net.Session.State.online) and other properties will be
+ (@Efl.Net.Session_State.online) and other properties will be
NULL, such as @.network_name, @.interface, @.ipv4 and @.ipv6; as well as
- @.technology is set to @Efl.Net.Session.Technology.unknown. As such
+ @.technology is set to @Efl.Net.Session_Technology.unknown. As such
if you need to detect for an actual backend, check if the
state is online but those properties are NULL or technology is
unknown.
@@ -70,7 +70,7 @@ class Efl.Net.Session (Efl.Loop_Consumer) {
]]
params {
online_required: bool; [[If $false, access points with local
state are enough. If $true, the access point must be in online state, with a
validated internet connection]]
-technologies_allowed: Efl.Net.Session.Technology; [[Bitwise OR
of technologies to allow]]
+technologies_allowed: Efl.Net.Session_Technology; [[Bitwise OR
of technologies to allow]]
}
}
@@ -102,7 +102,7 @@ class Efl.Net.Session (Efl.Loop_Consumer) {
]]
get { }
values {
-state: Efl.Net.Session.State; [[Network session state]]
+state: Efl.Net.Session_State; [[Network session state]]
}
}
@@ -110,7 +110,7 @@ class Efl.Net.Session (Efl.Loop_Consumer) {
[[The access point technology that backs this session]]
get { }
values {
-technology: Efl.Net.Session.Technology; [[Network session
technology]]
+technology: Efl.Net.Session_Technology; [[Network session
technology]]
[EGIT] [core/efl] master 07/26: efl: rename Efl.Gfx.Color_Class.Layer -> Efl.Gfx.Color_Class_Layer
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=8e0e1b702ed87b7b3baedb085166301736f52942
commit 8e0e1b702ed87b7b3baedb085166301736f52942
Author: Xavi Artigas
Date: Wed May 23 10:36:38 2018 +0200
efl: rename Efl.Gfx.Color_Class.Layer -> Efl.Gfx.Color_Class_Layer
---
src/lib/efl/interfaces/efl_gfx_color.eo | 2 +-
src/lib/efl/interfaces/efl_gfx_color_class.eo | 2 +-
src/lib/efl/interfaces/efl_gfx_types.eot | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/lib/efl/interfaces/efl_gfx_color.eo
b/src/lib/efl/interfaces/efl_gfx_color.eo
index 61f5e76f1e..21f18d144e 100644
--- a/src/lib/efl/interfaces/efl_gfx_color.eo
+++ b/src/lib/efl/interfaces/efl_gfx_color.eo
@@ -73,7 +73,7 @@ mixin Efl.Gfx.Color
}
keys {
color_class: string; [[The name of color class]]
- layer: Efl.Gfx.Color_Class.Layer @optional; [[The layer to set
the color]]
+ layer: Efl.Gfx.Color_Class_Layer @optional; [[The layer to set
the color]]
}
values {
colorcode: string; [[the hex color code.]]
diff --git a/src/lib/efl/interfaces/efl_gfx_color_class.eo
b/src/lib/efl/interfaces/efl_gfx_color_class.eo
index 23df735233..116e2c9964 100644
--- a/src/lib/efl/interfaces/efl_gfx_color_class.eo
+++ b/src/lib/efl/interfaces/efl_gfx_color_class.eo
@@ -37,7 +37,7 @@ interface Efl.Gfx.Color_Class
}
keys {
color_class: string; [[The name of color class]]
-layer: Efl.Gfx.Color_Class.Layer @optional; [[The layer to set the
color]]
+layer: Efl.Gfx.Color_Class_Layer @optional; [[The layer to set the
color]]
}
values {
r: int; [[The intensity of the red color]]
diff --git a/src/lib/efl/interfaces/efl_gfx_types.eot
b/src/lib/efl/interfaces/efl_gfx_types.eot
index 72d26885ba..7ceb923a10 100644
--- a/src/lib/efl/interfaces/efl_gfx_types.eot
+++ b/src/lib/efl/interfaces/efl_gfx_types.eot
@@ -204,7 +204,7 @@ enum Efl.Gfx.Image_Load_Error
recursive_reference = 10[[(Edje only) The group/collection set to
load from had recursive references on its components]]
}
-enum Efl.Gfx.Color_Class.Layer {
+enum Efl.Gfx.Color_Class_Layer {
[[Efl Gfx Color Class layer enum]]
normal = 0, [[Default color]]
outline, [[Outline color]]
--
[EGIT] [core/efl] master 14/26: efl: rename Efl.Text.Bidirectional_Type -> Efl.Text_Bidirectional_Type
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=d808147e6f69b913f326b5f65216e6a2d65aab5f
commit d808147e6f69b913f326b5f65216e6a2d65aab5f
Author: Xavi Artigas
Date: Wed May 23 11:48:56 2018 +0200
efl: rename Efl.Text.Bidirectional_Type -> Efl.Text_Bidirectional_Type
---
src/lib/efl/interfaces/efl_text_types.eot | 2 +-
src/lib/evas/canvas/efl_canvas_object.eo | 2 +-
src/lib/evas/canvas/evas_text.eo | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/lib/efl/interfaces/efl_text_types.eot
b/src/lib/efl/interfaces/efl_text_types.eot
index 0d9c5ee723..969ebacf7c 100644
--- a/src/lib/efl/interfaces/efl_text_types.eot
+++ b/src/lib/efl/interfaces/efl_text_types.eot
@@ -1,4 +1,4 @@
-enum Efl.Text.Bidirectional_Type {
+enum Efl.Text_Bidirectional_Type {
[[Bidirectionaltext type]]
natural = 0, [[Natural text type, same as neutral]]
neutral = 0, [[Neutral text type, same as natural]]
diff --git a/src/lib/evas/canvas/efl_canvas_object.eo
b/src/lib/evas/canvas/efl_canvas_object.eo
index dabfe74dbc..cfb41ed07e 100644
--- a/src/lib/evas/canvas/efl_canvas_object.eo
+++ b/src/lib/evas/canvas/efl_canvas_object.eo
@@ -444,7 +444,7 @@ abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx.Entity,
Efl.Gfx.Color, Efl.Gfx.S
The default paragraph direction is $inherit.
]]
values {
-dir: Efl.Text.Bidirectional_Type; [[Paragraph direction for the
given object.]]
+dir: Efl.Text_Bidirectional_Type; [[Paragraph direction for the
given object.]]
}
}
clipees_has @const {
diff --git a/src/lib/evas/canvas/evas_text.eo b/src/lib/evas/canvas/evas_text.eo
index 332a0412c8..617c9dedae 100644
--- a/src/lib/evas/canvas/evas_text.eo
+++ b/src/lib/evas/canvas/evas_text.eo
@@ -186,7 +186,7 @@ class Evas.Text (Efl.Canvas.Object, Efl.Text,
[[Retrieves the direction of the text currently being displayed in
the
text object.]]
-return: Efl.Text.Bidirectional_Type; [[Bidirectional type]]
+return: Efl.Text_Bidirectional_Type; [[Bidirectional type]]
}
}
@property ascent {
--
[EGIT] [core/efl] master 13/26: efl: rename Efl.Task.* -> Efl.Task_*
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=0f47f53f575a91491a3071f3356f13d799afd592
commit 0f47f53f575a91491a3071f3356f13d799afd592
Author: Xavi Artigas
Date: Wed May 23 11:46:44 2018 +0200
efl: rename Efl.Task.* -> Efl.Task_*
---
src/lib/ecore/efl_task.eo | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/lib/ecore/efl_task.eo b/src/lib/ecore/efl_task.eo
index 00a01f3914..7fdb895f49 100644
--- a/src/lib/ecore/efl_task.eo
+++ b/src/lib/ecore/efl_task.eo
@@ -1,4 +1,4 @@
-enum Efl.Task.Priority {
+enum Efl.Task_Priority {
[[ ]]
normal,
background,
@@ -7,7 +7,7 @@ enum Efl.Task.Priority {
ultra
}
-enum Efl.Task.Flags {
+enum Efl.Task_Flags {
[[ ]]
none = 0,
use_stdin = 1,
@@ -121,7 +121,7 @@ class Efl.Task (Efl.Object, Efl.Io.Reader, Efl.Io.Writer,
Efl.Io.Closer)
get { }
set { }
values {
-priority: Efl.Task.Priority; [[ ]]
+priority: Efl.Task_Priority; [[ ]]
}
}
@property exit_code {
@@ -135,7 +135,7 @@ class Efl.Task (Efl.Object, Efl.Io.Reader, Efl.Io.Writer,
Efl.Io.Closer)
set { }
get { }
values {
-flags: Efl.Task.Flags; [[ ]]
+flags: Efl.Task_Flags; [[ ]]
}
}
run {
--
[EGIT] [core/efl] master 12/26: efl: rename Efl.Selection.* -> Efl.Selection_*
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=0e848ccf2d3ea6c91b26d2edac101973b0f1dc5d
commit 0e848ccf2d3ea6c91b26d2edac101973b0f1dc5d
Author: Xavi Artigas
Date: Wed May 23 11:43:22 2018 +0200
efl: rename Efl.Selection.* -> Efl.Selection_*
---
src/lib/elementary/efl_selection.eo | 16
src/lib/elementary/efl_selection_manager.eo | 26 +-
src/lib/elementary/efl_selection_types.eot | 20 ++--
src/lib/elementary/efl_ui_dnd.eo| 12 ++--
src/lib/elementary/efl_ui_dnd_container.eo | 2 +-
src/lib/elementary/efl_ui_dnd_types.eot | 10 +-
src/lib/elementary/efl_ui_text.eo | 4 ++--
7 files changed, 45 insertions(+), 45 deletions(-)
diff --git a/src/lib/elementary/efl_selection.eo
b/src/lib/elementary/efl_selection.eo
index 8dda11cb08..9db0de597b 100644
--- a/src/lib/elementary/efl_selection.eo
+++ b/src/lib/elementary/efl_selection.eo
@@ -7,8 +7,8 @@ mixin Efl.Selection {
selection_set {
[[Set the selection data to the object]]
params {
-@in type: Efl.Selection.Type; [[Selection Type]]
-@in format: Efl.Selection.Format; [[Selection Format]]
+@in type: Efl.Selection_Type; [[Selection Type]]
+@in format: Efl.Selection_Format; [[Selection Format]]
@in data: Eina.Slice;
@in seat: uint;[[Specified seat for multiple seats case.]]
}
@@ -17,29 +17,29 @@ mixin Efl.Selection {
selection_get {
[[Get the data from the object that has selection]]
params {
-@in type: Efl.Selection.Type; [[Selection Type]]
-@in format: Efl.Selection.Format; [[Selection Format]]
-@in data_func: Efl.Selection.Data_Ready; [[Data ready function
pointer]]
+@in type: Efl.Selection_Type; [[Selection Type]]
+@in format: Efl.Selection_Format; [[Selection Format]]
+@in data_func: Efl.Selection_Data_Ready; [[Data ready function
pointer]]
@in seat: uint;[[Specified seat for multiple seats case.]]
}
}
selection_clear {
[[Clear the selection data from the object]]
params {
-@in type: Efl.Selection.Type; [[Selection Type]]
+@in type: Efl.Selection_Type; [[Selection Type]]
@in seat: uint; [[Specified seat for multiple seats case.]]
}
}
has_owner {
[[Determine whether the selection data has owner]]
params {
-@in type: Efl.Selection.Type; [[Selection type]]
+@in type: Efl.Selection_Type; [[Selection type]]
@in seat: uint; [[Specified seat for multiple seats case.]]
}
return: bool; [[EINA_TRUE if there is object owns selection,
otherwise EINA_FALSE]]
}
}
events {
- selection,changed: Efl.Selection.Changed; [[Called when display server's
selection has changed]]
+ selection,changed: Efl.Selection_Changed; [[Called when display server's
selection has changed]]
}
}
diff --git a/src/lib/elementary/efl_selection_manager.eo
b/src/lib/elementary/efl_selection_manager.eo
index 8556d063b1..00914e53ba 100644
--- a/src/lib/elementary/efl_selection_manager.eo
+++ b/src/lib/elementary/efl_selection_manager.eo
@@ -6,8 +6,8 @@ class Efl.Selection_Manager (Efl.Object) {
[[Set selection]]
params {
@in owner: Efl.Object; [[Seleciton owner]]
-@in type: Efl.Selection.Type; [[Selection type]]
-@in format: Efl.Selection.Format; [[Selection format]]
+@in type: Efl.Selection_Type; [[Selection type]]
+@in format: Efl.Selection_Format; [[Selection format]]
@in data: Eina.Slice; [[Selection data]]
@in seat: uint @optional;[[Specified seat for multiple seats
case.]]
}
@@ -17,16 +17,16 @@ class Efl.Selection_Manager (Efl.Object) {
[[Get selection]]
params {
@in request: const(Efl.Object); [[Seleciton owner]]
-@in type: Efl.Selection.Type; [[Selection type]]
-@in format: Efl.Selection.Format; [[Selection Format]]
-@in data_func: Efl.Selection.Data_Ready; [[Data ready function
pointer]]
+@in type: Efl.Selection_Type; [[Selection type]]
+@in format: Efl.Selection_Format; [[Selection Format]]
+@in data_func: Efl.Selection_Data_Ready; [[Data ready function
pointer]]
@in seat: uint @optional;[[Specified seat for multiple seats
case.]]
}
}
selection_clear @beta {
params {
@in owner: Efl.Object; [[Seleciton owner]]
-@in type: Efl.Selection.Type; [[Selection type]]
+@in type: Efl.Selection_Type; [[Selection type]]
@in seat: uint @optional; [[Specified seat for multiple seats
case.]]
[EGIT] [core/efl] master 19/26: efl: rename Efl.Ui.Slider.Indicator_Visible_Mode -> Efl.Ui.Slider_Indicator_Visible_Mode
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=ee27519432f130e7c630829c4b075715519a468e
commit ee27519432f130e7c630829c4b075715519a468e
Author: Xavi Artigas
Date: Wed May 23 12:27:16 2018 +0200
efl: rename Efl.Ui.Slider.Indicator_Visible_Mode ->
Efl.Ui.Slider_Indicator_Visible_Mode
---
src/lib/elementary/efl_ui.eot | 2 +-
src/lib/elementary/elm_slider_part_indicator.eo | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lib/elementary/efl_ui.eot b/src/lib/elementary/efl_ui.eot
index bdf0b74a61..6d16db996c 100644
--- a/src/lib/elementary/efl_ui.eot
+++ b/src/lib/elementary/efl_ui.eot
@@ -42,7 +42,7 @@ enum Efl.Ui.Focus.Move_Policy
Left, Right, Up, Down, Tab, or Shift+Tab.]]
}
-enum Efl.Ui.Slider.Indicator_Visible_Mode
+enum Efl.Ui.Slider_Indicator_Visible_Mode
{
[[Slider's indicator visiblity mode.
diff --git a/src/lib/elementary/elm_slider_part_indicator.eo
b/src/lib/elementary/elm_slider_part_indicator.eo
index 86e81474b8..934d80875c 100644
--- a/src/lib/elementary/elm_slider_part_indicator.eo
+++ b/src/lib/elementary/elm_slider_part_indicator.eo
@@ -9,7 +9,7 @@ class Elm.Slider.Part_Indicator (Efl.Ui.Layout.Part,
Efl.Ui.Format)
[[Set/Get the visible mode of indicator.
]]
values {
-mode: Efl.Ui.Slider.Indicator_Visible_Mode; [[The indicator
visible mode.]]
+mode: Efl.Ui.Slider_Indicator_Visible_Mode; [[The indicator
visible mode.]]
}
}
}
--
[EGIT] [core/efl] master 09/26: efl: rename Efl.Input.Device.Type -> Efl.Input.Device_Type
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=92bf45bf7cda2f22c0aa6b559f3907d72a4ec95c
commit 92bf45bf7cda2f22c0aa6b559f3907d72a4ec95c
Author: Xavi Artigas
Date: Wed May 23 10:56:08 2018 +0200
efl: rename Efl.Input.Device.Type -> Efl.Input.Device_Type
---
src/lib/efl/interfaces/efl_input_device.eo | 6 +++---
src/lib/evas/canvas/evas_canvas.eo | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/lib/efl/interfaces/efl_input_device.eo
b/src/lib/efl/interfaces/efl_input_device.eo
index c2dcc0ba88..e6c989871d 100644
--- a/src/lib/efl/interfaces/efl_input_device.eo
+++ b/src/lib/efl/interfaces/efl_input_device.eo
@@ -1,4 +1,4 @@
-enum Efl.Input.Device.Type
+enum Efl.Input.Device_Type
{
[[General type of input device.
@@ -29,7 +29,7 @@ class Efl.Input.Device (Efl.Object)
@property device_type {
[[Device type property]]
values {
-klass: Efl.Input.Device.Type; [[Input device class]]
+klass: Efl.Input.Device_Type; [[Input device class]]
}
}
@property source {
@@ -44,7 +44,7 @@ class Efl.Input.Device (Efl.Object)
This method will find the seat the device belongs to.
For this, it walk through device's parents looking for a device
- with @Efl.Input.Device.Type.seat. It may be
+ with @Efl.Input.Device_Type.seat. It may be
the device itself.
In case no seat is found, $null is returned.
diff --git a/src/lib/evas/canvas/evas_canvas.eo
b/src/lib/evas/canvas/evas_canvas.eo
index 09c2c2ed63..29a20414ba 100644
--- a/src/lib/evas/canvas/evas_canvas.eo
+++ b/src/lib/evas/canvas/evas_canvas.eo
@@ -948,7 +948,7 @@ class Evas.Canvas (Efl.Object, Efl.Canvas.Scene,
Efl.Animator, Efl.Input.Interfa
]]
get {}
keys {
-type: Efl.Input.Device.Type; [[The class of the default device to
fetch.]]
+type: Efl.Input.Device_Type; [[The class of the default device to
fetch.]]
}
values {
seat: Efl.Input.Device; [[The default device or $null on error.]]
--
[EGIT] [core/efl] master 25/26: efl_mono: Fix events after Event_Description rename.
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=c4572d3f791b3ae634c63f21ed05b17a1754a894
commit c4572d3f791b3ae634c63f21ed05b17a1754a894
Author: Lauro Moura
Date: Wed May 23 10:07:05 2018 -0300
efl_mono: Fix events after Event_Description rename.
---
src/bin/eolian_mono/eolian/mono/blacklist.hh | 2 +-
src/bin/eolian_mono/eolian/mono/klass.hh | 2 +-
src/bin/eolian_mono/eolian/mono/struct_definition.hh | 2 +-
src/bindings/mono/eo_mono/iwrapper.cs| 5 +
src/bindings/mono/eo_mono/workaround.cs | 8 +++-
5 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/src/bin/eolian_mono/eolian/mono/blacklist.hh
b/src/bin/eolian_mono/eolian/mono/blacklist.hh
index 1db4c6108a..a436bcc203 100644
--- a/src/bin/eolian_mono/eolian/mono/blacklist.hh
+++ b/src/bin/eolian_mono/eolian/mono/blacklist.hh
@@ -56,7 +56,7 @@ inline bool is_function_blacklisted(std::string const& c_name)
// Blacklist structs that require some kind of manual binding.
inline bool is_struct_blacklisted(std::string const& full_name)
{
- return full_name == "Efl.Event.Description"
+ return full_name == "Efl.Event_Description"
|| full_name == "Eina.Binbuf"
|| full_name == "Eina.Strbuf"
|| full_name == "Eina.Slice"
diff --git a/src/bin/eolian_mono/eolian/mono/klass.hh
b/src/bin/eolian_mono/eolian/mono/klass.hh
index e85654756d..c25b1d8e34 100644
--- a/src/bin/eolian_mono/eolian/mono/klass.hh
+++ b/src/bin/eolian_mono/eolian/mono/klass.hh
@@ -500,7 +500,7 @@ struct klass
<< scope_tab << scope_tab << "if (!event_cb_count.TryGetValue(key,
out event_count))\n"
<< scope_tab << scope_tab << scope_tab << "event_cb_count[key] =
event_count;\n"
<< scope_tab << scope_tab << "if (event_count == 1) {\n"
-<< scope_tab << scope_tab << scope_tab <<
"efl.kw_event.Description desc = new efl.kw_event.Description(key);\n"
+<< scope_tab << scope_tab << scope_tab << "efl.Event_Description
desc = new efl.Event_Description(key);\n"
<< scope_tab << scope_tab << scope_tab << "bool result =
efl.eo.Globals.efl_event_callback_del(handle, desc, evt_delegate,
System.IntPtr.Zero);\n"
<< scope_tab << scope_tab << scope_tab << "if (!result) {\n"
<< scope_tab << scope_tab << scope_tab << scope_tab <<
"eina.Log.Error($\"Failed to remove event proxy for event {key}\");\n"
diff --git a/src/bin/eolian_mono/eolian/mono/struct_definition.hh
b/src/bin/eolian_mono/eolian/mono/struct_definition.hh
index 618b433213..42d2f0d711 100644
--- a/src/bin/eolian_mono/eolian/mono/struct_definition.hh
+++ b/src/bin/eolian_mono/eolian/mono/struct_definition.hh
@@ -368,7 +368,7 @@ struct struct_binding_conversion_functions_generator
// Open conversion class
if (!as_generator
(
- "internal static class " << string << "_StructConversion\n{\n"
+ "public static class " << string << "_StructConversion\n{\n"
)
.generate(sink, struct_.cxx_name, context))
return false;
diff --git a/src/bindings/mono/eo_mono/iwrapper.cs
b/src/bindings/mono/eo_mono/iwrapper.cs
index bb7a45b291..d25ffec625 100644
--- a/src/bindings/mono/eo_mono/iwrapper.cs
+++ b/src/bindings/mono/eo_mono/iwrapper.cs
@@ -53,16 +53,13 @@ public class Globals {
[DllImport(efl.Libs.Eo)] public static extern bool
efl_event_callback_priority_add(
System.IntPtr obj,
- // FIXME commented to allow passing null stuff during test
- //ref efl.kw_event.Description desc,
- //efl.kw_event.Description desc,
IntPtr desc,
short priority,
efl.Event_Cb cb,
System.IntPtr data);
[DllImport(efl.Libs.Eo)] public static extern bool efl_event_callback_del(
System.IntPtr obj,
- efl.kw_event.Description desc,
+ efl.Event_Description desc,
efl.Event_Cb cb,
System.IntPtr data);
[DllImport(efl.Libs.Eo)] public static extern IntPtr
diff --git a/src/bindings/mono/eo_mono/workaround.cs
b/src/bindings/mono/eo_mono/workaround.cs
index 925e437908..207f5cab52 100644
--- a/src/bindings/mono/eo_mono/workaround.cs
+++ b/src/bindings/mono/eo_mono/workaround.cs
@@ -70,10 +70,10 @@ public struct Evas_Object_Box_Option {
};
#pragma warning restore 0169
-namespace efl { namespace kw_event {
+namespace efl {
[StructLayout(LayoutKind.Sequential)]
-public struct Description {
+public struct Event_Description {
public IntPtr Name;
[MarshalAs(UnmanagedType.U1)] public bool Unfreezable;
[MarshalAs(UnmanagedType.U1)] public bool Legacy_is;
@@ -81,7 +81,7 @@ public struct Description {
private static Dictionary descriptions = new
Dictionary();
-public Description(string name)
+public Event_Description(string name)
{
if (!descriptio
[EGIT] [core/efl] master 03/26: efl: rename Efl.Canvas.Gesture.* -> Efl.Canvas.Gesture_*
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=18ae917be6e699294d8e2f6ef3d36700913c6f56
commit 18ae917be6e699294d8e2f6ef3d36700913c6f56
Author: Xavi Artigas
Date: Tue May 22 13:18:52 2018 +0200
efl: rename Efl.Canvas.Gesture.* -> Efl.Canvas.Gesture_*
---
src/lib/evas/gesture/efl_canvas_gesture.eo| 2 +-
src/lib/evas/gesture/efl_canvas_gesture_recognizer.eo | 2 +-
src/lib/evas/gesture/efl_canvas_gesture_touch.eo | 2 +-
src/lib/evas/gesture/efl_canvas_gesture_types.eot | 6 +++---
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/lib/evas/gesture/efl_canvas_gesture.eo
b/src/lib/evas/gesture/efl_canvas_gesture.eo
index 3a682dc11c..fdad8d2335 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture.eo
+++ b/src/lib/evas/gesture/efl_canvas_gesture.eo
@@ -20,7 +20,7 @@ abstract Efl.Canvas.Gesture(Efl.Object)
set {
}
values {
-state: Efl.Canvas.Gesture.State; [[gesture state]]
+state: Efl.Canvas.Gesture_State; [[gesture state]]
}
}
@property hotspot {
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_recognizer.eo
b/src/lib/evas/gesture/efl_canvas_gesture_recognizer.eo
index bcc611b4bc..d2a918e118 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_recognizer.eo
+++ b/src/lib/evas/gesture/efl_canvas_gesture_recognizer.eo
@@ -23,7 +23,7 @@ abstract Efl.Canvas.Gesture_Recognizer (Efl.Object)
@in watched: Efl.Object; [[The watched object]]
@in event: Efl.Canvas.Gesture_Touch; [[The pointer event]]
}
- return: Efl.Canvas.Gesture.Recognizer_Result; [[Returns the
Efl.Canvas.Gesture event object]]
+ return: Efl.Canvas.Gesture_Recognizer_Result; [[Returns the
Efl.Canvas.Gesture event object]]
}
/* FIXME: This function is not used? */
reset {
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_touch.eo
b/src/lib/evas/gesture/efl_canvas_gesture_touch.eo
index b259043d58..d18001759b 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_touch.eo
+++ b/src/lib/evas/gesture/efl_canvas_gesture_touch.eo
@@ -48,7 +48,7 @@ class Efl.Canvas.Gesture_Touch(Efl.Object)
@property state {
[[This property holds the state of the touch event.]]
get {
-return : Efl.Canvas.Gesture.Touch.State; [[touch event state]]
+return : Efl.Canvas.Gesture_Touch_State; [[touch event state]]
}
}
/* FIXME: finger_list was broken by design - TODO */
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_types.eot
b/src/lib/evas/gesture/efl_canvas_gesture_types.eot
index 4710b7d306..4dbf88c727 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_types.eot
+++ b/src/lib/evas/gesture/efl_canvas_gesture_types.eot
@@ -1,4 +1,4 @@
-enum Efl.Canvas.Gesture.Touch.State
+enum Efl.Canvas.Gesture_Touch_State
{
[[ This enum type describes the state of a touch event. ]]
legacy: efl_gesture_touch;
@@ -8,7 +8,7 @@ enum Efl.Canvas.Gesture.Touch.State
end, [[Last fingure touch up]]
}
-enum Efl.Canvas.Gesture.State
+enum Efl.Canvas.Gesture_State
{
[[ This enum type describes the state of a gesture. ]]
legacy: efl_gesture;
@@ -19,7 +19,7 @@ enum Efl.Canvas.Gesture.State
canceled,[[A gesture was canceled.]]
}
-enum Efl.Canvas.Gesture.Recognizer_Result
+enum Efl.Canvas.Gesture_Recognizer_Result
{
[[ This enum type describes the state of a gesture recognizer. ]]
legacy: efl_gesture;
--
[EGIT] [core/efl] master 02/26: efl: rename Efl.Canvas.Object.Animation.* -> Efl.Canvas.Object_Animation_*
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=3e8b80cdb5f9eb988d7cf39289b55f425ba0
commit 3e8b80cdb5f9eb988d7cf39289b55f425ba0
Author: Xavi Artigas
Date: Tue May 22 13:02:18 2018 +0200
efl: rename Efl.Canvas.Object.Animation.* -> Efl.Canvas.Object_Animation_*
---
src/lib/evas/canvas/efl_canvas_object.eo | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/lib/evas/canvas/efl_canvas_object.eo
b/src/lib/evas/canvas/efl_canvas_object.eo
index 3d9e590881..e44cb53dee 100644
--- a/src/lib/evas/canvas/efl_canvas_object.eo
+++ b/src/lib/evas/canvas/efl_canvas_object.eo
@@ -1,6 +1,6 @@
import efl_text_types;
-struct Efl.Canvas.Object.Animation_Event; [[Information of animation events]]
+struct Efl.Canvas.Object_Animation_Event; [[Information of animation events]]
abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx.Entity, Efl.Gfx.Color,
Efl.Gfx.Stack, Efl.Animator,
Efl.Input.Interface, Efl.Gfx.Size_Hint,
@@ -624,8 +624,8 @@ abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx.Entity,
Efl.Gfx.Color, Efl.Gfx.S
Efl.Canvas.Pointer.pointer_inside { get; }
}
events {
- anim_started: Efl.Canvas.Object.Animation_Event; [[Animation is
started.]]
- anim_running: Efl.Canvas.Object.Animation_Event; [[Animation is
running.]]
- anim_ended: Efl.Canvas.Object.Animation_Event; [[Animation is ended.]]
+ anim_started: Efl.Canvas.Object_Animation_Event; [[Animation is
started.]]
+ anim_running: Efl.Canvas.Object_Animation_Event; [[Animation is
running.]]
+ anim_ended: Efl.Canvas.Object_Animation_Event; [[Animation is ended.]]
}
}
--
[EGIT] [core/efl] master 20/26: efl: rename Efl.Ui.Stack.Event_* -> Efl.Ui.Stack_Event_*
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=a7d29f71859b43d7bcc9b3116254d1cc7065a454
commit a7d29f71859b43d7bcc9b3116254d1cc7065a454
Author: Xavi Artigas
Date: Wed May 23 12:30:26 2018 +0200
efl: rename Efl.Ui.Stack.Event_* -> Efl.Ui.Stack_Event_*
---
src/lib/elementary/efl_ui_stack.eo | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/lib/elementary/efl_ui_stack.eo
b/src/lib/elementary/efl_ui_stack.eo
index 33772123db..65f8156789 100644
--- a/src/lib/elementary/efl_ui_stack.eo
+++ b/src/lib/elementary/efl_ui_stack.eo
@@ -1,19 +1,19 @@
-struct Efl.Ui.Stack.Event_Loaded {
+struct Efl.Ui.Stack_Event_Loaded {
[[Information of loaded event.]]
content: Efl.Canvas.Object; [[Loaded content.]]
}
-struct Efl.Ui.Stack.Event_Unloaded {
+struct Efl.Ui.Stack_Event_Unloaded {
[[Information of unloaded event.]]
content: Efl.Canvas.Object; [[Unloaded content.]]
}
-struct Efl.Ui.Stack.Event_Activated {
+struct Efl.Ui.Stack_Event_Activated {
[[Information of activated event.]]
content: Efl.Canvas.Object; [[Activated content.]]
}
-struct Efl.Ui.Stack.Event_Deactivated {
+struct Efl.Ui.Stack_Event_Deactivated {
[[Information of deactivated event.]]
content: Efl.Canvas.Object; [[Deactivated content.]]
}
@@ -123,9 +123,9 @@ class Efl.Ui.Stack (Efl.Ui.Layout.Object)
Efl.Object.constructor;
}
events {
- loaded: Efl.Ui.Stack.Event_Loaded; [[Called when content is loaded
right before transition.]]
- unloaded: Efl.Ui.Stack.Event_Unloaded;[[Called when content is
unloaded right after being deactivated.]]
- activated: Efl.Ui.Stack.Event_Activated; [[Called when content is
activated right after transition.]]
- deactivated: Efl.Ui.Stack.Event_Deactivated; [[Called when content is
deactivated right after transition.]]
+ loaded: Efl.Ui.Stack_Event_Loaded; [[Called when content is loaded
right before transition.]]
+ unloaded: Efl.Ui.Stack_Event_Unloaded;[[Called when content is
unloaded right after being deactivated.]]
+ activated: Efl.Ui.Stack_Event_Activated; [[Called when content is
activated right after transition.]]
+ deactivated: Efl.Ui.Stack_Event_Deactivated; [[Called when content is
deactivated right after transition.]]
}
}
--
[EGIT] [core/efl] master 01/01: ecore-evas-buffer: defer resize callback until pre-render
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=b7530726c80d67f0c009540be1d6df74f9195bba
commit b7530726c80d67f0c009540be1d6df74f9195bba
Author: Mike Blumenkrantz
Date: Wed May 23 17:35:18 2018 -0400
ecore-evas-buffer: defer resize callback until pre-render
Summary:
this mimics other engines, all of which have the same mechanics due
to display server interactions. it also avoids unnecessary recalcs before
pre-render if the canvas size was changing repeatedly
fix T6924
ref D6019
Reviewers: cedric, JackDanielZ
Reviewed By: JackDanielZ
Subscribers: #committers, JackDanielZ
Tags: #efl
Maniphest Tasks: T6924
Differential Revision: https://phab.enlightenment.org/D6145
---
src/lib/ecore_evas/ecore_evas_buffer.c | 8 +++-
src/lib/ecore_evas/ecore_evas_buffer.h | 1 +
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/lib/ecore_evas/ecore_evas_buffer.c
b/src/lib/ecore_evas/ecore_evas_buffer.c
index 241a122daa..cad4999337 100644
--- a/src/lib/ecore_evas/ecore_evas_buffer.c
+++ b/src/lib/ecore_evas/ecore_evas_buffer.c
@@ -100,7 +100,8 @@ _ecore_evas_resize(Ecore_Evas *ee, int w, int h)
}
if (bdata->image)
evas_object_image_data_set(bdata->image, bdata->pixels);
- if (ee->func.fn_resize) ee->func.fn_resize(ee);
+ else
+ bdata->resized = 1;
}
static void
@@ -163,6 +164,11 @@ _ecore_evas_buffer_prepare(Ecore_Evas *ee)
_ecore_evas_resize(ee, w, h);
bdata->pixels = evas_object_image_data_get(bdata->image, 1);
}
+ else if (bdata->resized)
+ {
+if (ee->func.fn_resize) ee->func.fn_resize(ee);
+bdata->resized = 0;
+ }
return EINA_TRUE;
}
diff --git a/src/lib/ecore_evas/ecore_evas_buffer.h
b/src/lib/ecore_evas/ecore_evas_buffer.h
index e29dee335b..1249c380f4 100644
--- a/src/lib/ecore_evas/ecore_evas_buffer.h
+++ b/src/lib/ecore_evas/ecore_evas_buffer.h
@@ -10,6 +10,7 @@ struct _Ecore_Evas_Engine_Buffer_Data {
void *(*alloc_func) (void *data, int size);
void *data;
Eina_Bool in_render : 1;
+ Eina_Bool resized : 1;
};
#endif /* _ECORE_EVAS_BUFFER_PRIVATE_H_ */
--
[EGIT] [core/efl] master 02/03: efl_mono: Initial support for Accessors.
vitorsousa pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=cfafd01bbe27bab90117e1a8d97fdace55b47944
commit cfafd01bbe27bab90117e1a8d97fdace55b47944
Author: Lauro Moura
Date: Fri May 18 00:50:37 2018 -0300
efl_mono: Initial support for Accessors.
Summary:
Plain conversion to IEnumerable, which is the base of LINQ
Depends on D6189
Reviewers: felipealmeida, vitor.sousa
Reviewed By: vitor.sousa
Subscribers: cedric, #committers, zmike
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D6190
---
src/Makefile_Efl_Mono.am | 1 +
src/bindings/mono/eina_mono/eina_accessor.cs | 108 +++
src/bindings/mono/eina_mono/eina_array.cs| 8 ++
src/bindings/mono/eina_mono/eina_inarray.cs | 6 ++
src/bindings/mono/eina_mono/eina_inlist.cs | 6 ++
src/bindings/mono/eina_mono/eina_list.cs | 6 ++
src/tests/efl_mono/Eina.cs | 71 ++
7 files changed, 206 insertions(+)
diff --git a/src/Makefile_Efl_Mono.am b/src/Makefile_Efl_Mono.am
index a4376c0761..41c9d225c9 100644
--- a/src/Makefile_Efl_Mono.am
+++ b/src/Makefile_Efl_Mono.am
@@ -23,6 +23,7 @@ efl_eina_mono_files = \
bindings/mono/eina_mono/eina_error.cs \
bindings/mono/eina_mono/eina_value.cs \
bindings/mono/eina_mono/eina_promises.cs \
+ bindings/mono/eina_mono/eina_accessor.cs \
bindings/mono/eina_mono/eina_strbuf.cs
efl_eldbus_mono_files = \
diff --git a/src/bindings/mono/eina_mono/eina_accessor.cs
b/src/bindings/mono/eina_mono/eina_accessor.cs
new file mode 100644
index 00..eab0aebc8c
--- /dev/null
+++ b/src/bindings/mono/eina_mono/eina_accessor.cs
@@ -0,0 +1,108 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Runtime.InteropServices;
+
+using static eina.TraitFunctions;
+
+using static eina.AccessorNativeFunctions;
+
+namespace eina {
+
+internal class AccessorNativeFunctions
+{
+[DllImport(efl.Libs.Eina)] [return: MarshalAs(UnmanagedType.U1)] public
static extern bool
+eina_accessor_data_get(IntPtr accessor, uint position, IntPtr data);
+[DllImport(efl.Libs.Eina)] public static extern void
+eina_accessor_free(IntPtr accessor);
+}
+
+/// Accessors provide an uniform way of accessing Eina containers,
similar to C++ STL's and C# IEnumerable.
+public class Accessor : IEnumerable, IDisposable
+{
+/// Pointer to the native accessor.
+public IntPtr Handle { get; private set; } = IntPtr.Zero;
+
+/// Who is in charge of releasing the resources wrapped by this
instance.
+private Ownership Ownership { get; set; }
+
+/// Create a new accessor wrapping the given pointer.
+public Accessor(IntPtr handle, Ownership owner=Ownership.Managed)
+{
+Handle = handle;
+Ownership = owner;
+}
+
+/// Release the native resources held by this instance.
+public void Dispose()
+{
+Dispose(true);
+}
+
+protected virtual void Dispose(bool disposing)
+{
+if (Ownership == Ownership.Managed && Handle != IntPtr.Zero)
+{
+eina_accessor_free(Handle);
+Handle = IntPtr.Zero;
+}
+}
+
+~Accessor()
+{
+Dispose(false);
+}
+
+public virtual T Convert(IntPtr data)
+{
+return NativeToManaged(data);
+}
+
+/// Returns an enumerator that iterates throught this
accessor.
+public IEnumerator GetEnumerator()
+{
+if (Handle == IntPtr.Zero)
+throw new ObjectDisposedException(base.GetType().Name);
+IntPtr tmp = MemoryNative.Alloc(Marshal.SizeOf(typeof(IntPtr)));
+uint position = 0;
+
+try
+{
+while(eina_accessor_data_get(Handle, position, tmp))
+{
+IntPtr data = (IntPtr)Marshal.PtrToStructure(tmp,
typeof(IntPtr));
+yield return Convert(data);
+position += 1;
+}
+}
+finally
+{
+MemoryNative.Free(tmp);
+}
+}
+
+IEnumerator IEnumerable.GetEnumerator()
+{
+return this.GetEnumerator();
+}
+}
+
+public class AccessorInList : Accessor
+{
+public AccessorInList(IntPtr handle, Ownership own): base(handle, own) {}
+public override T Convert(IntPtr data)
+{
+return NativeToManagedInlistNode(data);
+}
+}
+
+public class AccessorInArray : Accessor
+{
+public AccessorInArray(IntPtr handle, Ownership own): base(handle, own) {}
+public override T Convert(IntPtr data)
+{
+return NativeToManagedInplace(data);
+}
+}
+
+}
diff --git a/src/bindings/mono/eina_mono/eina_array.cs
b/src/bindings/mono/eina_mono/eina_array.cs
index 6156c0cbb1..86e69fc407 100644
--- a/src/bindings/mono/eina_mono/eina_array.cs
+++ b/src/bindings/mono/eina_mono/eina_array.cs
@@ -24,6 +24,8 @@ public
[EGIT] [core/efl] master 01/03: efl_mono: Reject the promise when it's disposed.
vitorsousa pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=2bbaada66eb0ea78b5d0a3a72d9720f55621a5ab
commit 2bbaada66eb0ea78b5d0a3a72d9720f55621a5ab
Author: Lauro Moura
Date: Thu May 17 19:46:57 2018 -0300
efl_mono: Reject the promise when it's disposed.
Summary:
As futures are tied to a given promises and are usually handled in
a 'attach and forget' scheme, we can't cancel them as it would cancel
the whole chain.
Reviewers: felipealmeida, vitor.sousa
Reviewed By: vitor.sousa
Subscribers: cedric, #committers, zmike
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D6189
---
src/bindings/mono/eina_mono/eina_promises.cs | 24 +++-
src/tests/efl_mono/Promises.cs | 26 ++
2 files changed, 49 insertions(+), 1 deletion(-)
diff --git a/src/bindings/mono/eina_mono/eina_promises.cs
b/src/bindings/mono/eina_mono/eina_promises.cs
index c280b400f3..b617b3a986 100644
--- a/src/bindings/mono/eina_mono/eina_promises.cs
+++ b/src/bindings/mono/eina_mono/eina_promises.cs
@@ -66,7 +66,7 @@ static internal class PromiseNativeMethods
///
/// With a Promise you can attach futures to it, which will be used to notify
of the value being available.
///
-public class Promise
+public class Promise : IDisposable
{
internal IntPtr Handle;
private GCHandle CleanupHandle;
@@ -116,6 +116,28 @@ public class Promise
handle.Free();
}
+/// Dispose this promise, causing its cancellation if it isn't
already fulfilled.
+public void Dispose()
+{
+Dispose(true);
+GC.SuppressFinalize(this);
+}
+
+/// Finalizer to be called from the Garbage Collector.
+~Promise()
+{
+Dispose(false);
+}
+
+protected virtual void Dispose(bool disposing)
+{
+if (Handle != IntPtr.Zero)
+{
+eina_promise_reject(Handle, eina.Error.ECANCELED);
+Handle = IntPtr.Zero;
+}
+}
+
private void SanityChecks()
{
if (this.Handle == IntPtr.Zero)
diff --git a/src/tests/efl_mono/Promises.cs b/src/tests/efl_mono/Promises.cs
index 5759f56800..4191c31c5f 100644
--- a/src/tests/efl_mono/Promises.cs
+++ b/src/tests/efl_mono/Promises.cs
@@ -230,6 +230,32 @@ class TestPromises
Test.Assert(callbackCalled, "Future callback should have been
called.");
Test.AssertEquals(received_value, reference_value);
}
+
+public static void test_reject_on_disposal()
+{
+bool callbackCalled = false;
+eina.Error received_error = eina.Error.NO_ERROR;
+
+efl.ILoop loop = efl.App.GetLoopMain();
+eina.Promise promise = new eina.Promise();
+eina.Future future = new eina.Future(promise);
+
+future = future.Then((eina.Value value) => {
+callbackCalled = true;
+value.Get(out received_error);
+return value;
+});
+
+promise.Dispose();
+
+loop.Iterate();
+
+Test.Assert(callbackCalled, "Future callback should have been
called.");
+Test.AssertEquals(received_error, eina.Error.ECANCELED);
+
+Test.AssertRaises(() => {
promise.Resolve(null); });
+Test.AssertRaises(future.Cancel);
+}
}
}
--
[EGIT] [core/efl] master 03/03: efl_mono: Generate support for accessors in .eos
vitorsousa pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=54f1e56b34e5b8b67161b70b582e54be1fbf5c74
commit 54f1e56b34e5b8b67161b70b582e54be1fbf5c74
Author: Lauro Moura
Date: Fri May 18 23:43:09 2018 -0300
efl_mono: Generate support for accessors in .eos
Summary: Depends on D6190
Reviewers: felipealmeida, vitor.sousa
Reviewed By: vitor.sousa
Subscribers: cedric, #committers, zmike
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D6191
---
.../eolian_mono/eolian/mono/marshall_type_impl.hh | 5
src/bin/eolian_mono/eolian/mono/parameter.hh | 28 ++
src/bin/eolian_mono/eolian/mono/type_impl.hh | 9 +++
src/bindings/mono/eina_mono/eina_accessor.cs | 18 ++
src/tests/efl_mono/Eo.cs | 22 +
src/tests/efl_mono/libefl_mono_native_test.c | 15
src/tests/efl_mono/test_testing.eo | 8 +++
7 files changed, 99 insertions(+), 6 deletions(-)
diff --git a/src/bin/eolian_mono/eolian/mono/marshall_type_impl.hh
b/src/bin/eolian_mono/eolian/mono/marshall_type_impl.hh
index 38dbbcb48c..95970dedd6 100644
--- a/src/bin/eolian_mono/eolian/mono/marshall_type_impl.hh
+++ b/src/bin/eolian_mono/eolian/mono/marshall_type_impl.hh
@@ -237,6 +237,11 @@ struct marshall_type_visitor_generate
return regular_type_def{" System.IntPtr",
complex.outer.base_qualifier, {}};
}
}
+,{"accessor", nullptr, nullptr, [&]
+ {
+ return regular_type_def{" System.IntPtr",
complex.outer.base_qualifier, {}};
+ }
+}
};
auto default_match = [&] (attributes::complex_type_def const& complex)
diff --git a/src/bin/eolian_mono/eolian/mono/parameter.hh
b/src/bin/eolian_mono/eolian/mono/parameter.hh
index f7c97b723f..55ea6f4115 100644
--- a/src/bin/eolian_mono/eolian/mono/parameter.hh
+++ b/src/bin/eolian_mono/eolian/mono/parameter.hh
@@ -275,6 +275,10 @@ inline bool
param_should_use_out_var(attributes::parameter_def const& param, boo
|| param_is_acceptable(param, "Eina_Inlist *", WANT_OWN, WANT_OUT)
|| param_is_acceptable(param, "const Eina_Inlist *", !WANT_OWN,
WANT_OUT)
|| param_is_acceptable(param, "const Eina_Inlist *", WANT_OWN,
WANT_OUT)
+ || param_is_acceptable(param, "Eina_Accessor *", !WANT_OWN,
WANT_OUT)
+ || param_is_acceptable(param, "Eina_Accessor *", WANT_OWN, WANT_OUT)
+ || param_is_acceptable(param, "const Eina_Accessor *", !WANT_OWN,
WANT_OUT)
+ || param_is_acceptable(param, "const Eina_Accessor *", WANT_OWN,
WANT_OUT)
|| param_is_acceptable(param, "Eina_Hash *", !WANT_OWN, WANT_OUT)
|| param_is_acceptable(param, "Eina_Hash *", WANT_OWN, WANT_OUT)
|| param_is_acceptable(param, "const Eina_Hash *", !WANT_OWN,
WANT_OUT)
@@ -321,6 +325,10 @@ inline bool
param_should_use_in_var(attributes::parameter_def const& param, bool
|| param_is_acceptable(param, "const Eina_List *", WANT_OWN, !WANT_OUT)
|| param_is_acceptable(param, "Eina_Inlist *", !WANT_OWN, !WANT_OUT)
|| param_is_acceptable(param, "Eina_Inlist *", WANT_OWN, !WANT_OUT)
+|| param_is_acceptable(param, "Eina_Accessor *", !WANT_OWN, !WANT_OUT)
+|| param_is_acceptable(param, "Eina_Accessor *", WANT_OWN, !WANT_OUT)
+|| param_is_acceptable(param, "const Eina_Accessor *", !WANT_OWN,
!WANT_OUT)
+|| param_is_acceptable(param, "const Eina_Accessor *", WANT_OWN,
!WANT_OUT)
|| param_is_acceptable(param, "const Eina_Inlist *", !WANT_OWN,
!WANT_OUT)
|| param_is_acceptable(param, "const Eina_Inlist *", WANT_OWN,
!WANT_OUT)
|| param_is_acceptable(param, "Eina_Hash *", !WANT_OWN, !WANT_OUT)
@@ -578,6 +586,7 @@ struct native_convert_in_variable_generator
|| param.type.c_type == "Eina_List *" || param.type.c_type ==
"const Eina_List *"
|| param.type.c_type == "Eina_Inlist *" || param.type.c_type ==
"const Eina_Inlist *"
|| param.type.c_type == "Eina_Iterator *" || param.type.c_type
== "const Eina_Iterator *"
+ || param.type.c_type == "Eina_Accessor *" || param.type.c_type
== "const Eina_Accessor *"
)
{
attributes::complex_type_def const* complex =
efl::eina::get(¶m.type.original_type);
@@ -665,6 +674,7 @@ struct convert_in_variable_generator
|| param.type.c_type == "Eina_List *" || param.type.c_type ==
"const Eina_List *"
|| param.type.c_type == "Eina_Inlist *" || param.type.c_type ==
"const Eina_Inlist *"
|| param.type.c_type == "Eina_Iterator *" || param.type.c_type
== "const Eina_Iterator *"
+ || param.type.c_type == "Eina_Accessor *" || param.type.c_type
== "const Eina_Accessor *"
)
[EGIT] [core/efl] master 01/01: eina: path get actually allocate memory and can't be pure.
cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=9dce56687b5967a36514c8f731a146197415f481 commit 9dce56687b5967a36514c8f731a146197415f481 Author: Cedric BAIL Date: Wed May 23 19:36:56 2018 -0700 eina: path get actually allocate memory and can't be pure. --- src/lib/eina/eina_module.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/eina/eina_module.h b/src/lib/eina/eina_module.h index dafdb203ec..151b1c3101 100644 --- a/src/lib/eina/eina_module.h +++ b/src/lib/eina/eina_module.h @@ -230,7 +230,7 @@ EAPI void eina_module_symbol_global_set(Eina_Module *module, Eina_Bool global) E * or allocation fails, this function returns @c NULL. */ EAPI char * - eina_module_symbol_path_get(const void *symbol, const char *sub_dir) EINA_PURE EINA_MALLOC EINA_ARG_NONNULL(1, 2); + eina_module_symbol_path_get(const void *symbol, const char *sub_dir) EINA_MALLOC EINA_ARG_NONNULL(1, 2); /** * @brief Returns the path built from the value of an environment variable and a @@ -247,7 +247,7 @@ EAPI char * * allocation fails, this function returns @c NULL. */ EAPI char * - eina_module_environment_path_get(const char *env, const char *sub_dir) EINA_PURE EINA_MALLOC EINA_ARG_NONNULL(1, 2); + eina_module_environment_path_get(const char *env, const char *sub_dir) EINA_MALLOC EINA_ARG_NONNULL(1, 2); /** --
[EGIT] [core/efl] master 01/01: elm_main: call _elm_config_shutdown() after loop_iterate()
woohyun pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=ea1760380e34074d9e6b9633a54a4f9c27e64aec commit ea1760380e34074d9e6b9633a54a4f9c27e64aec Author: WooHyun Jung Date: Thu May 24 15:30:29 2018 +0900 elm_main: call _elm_config_shutdown() after loop_iterate() In _elm_config_shutdown(), _elm_config is freed. So, if some ecore events call efl_ui_xxx API which refers _elm_config, there can be crashes. @fix --- src/lib/elementary/elm_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/elementary/elm_main.c b/src/lib/elementary/elm_main.c index e5e43858a7..5196af7858 100644 --- a/src/lib/elementary/elm_main.c +++ b/src/lib/elementary/elm_main.c @@ -818,8 +818,8 @@ elm_quicklaunch_sub_shutdown(void) elm_color_class_shutdown(); } - _elm_config_shutdown(); ecore_main_loop_iterate(); + _elm_config_shutdown(); return _elm_sub_init_count; } --
