[EGIT] [core/efl] master 02/02: edje: convert var timer list to inlist
derekf pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=a9d9ccefe42a3aca55daa7a0fe6e3ee2a4ca
commit a9d9ccefe42a3aca55daa7a0fe6e3ee2a4ca
Author: Derek Foreman
Date: Wed Jan 16 16:44:36 2019 -0600
edje: convert var timer list to inlist
Since these are only ever on one list, inlist is better.
Signed-off-by: Derek Foreman
Reviewed-by: Mike Blumenkrantz
Reviewed-by: Cedric BAIL
Differential Revision: https://phab.enlightenment.org/D7697
---
src/lib/edje/edje_private.h | 3 ++-
src/lib/edje/edje_var.c | 16 ++--
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h
index 2781ce4c4c..7c61d59bc1 100644
--- a/src/lib/edje/edje_private.h
+++ b/src/lib/edje/edje_private.h
@@ -2148,6 +2148,7 @@ struct _Edje_Var_Hash
struct _Edje_Var_Timer
{
+ EINA_INLIST;
Edje *edje;
int id;
Embryo_Function func;
@@ -2168,7 +2169,7 @@ struct _Edje_Var_Animator
struct _Edje_Var_Pool
{
int id_count;
- Eina_List *timers;
+ Eina_Inlist *timers;
Eina_List *animators;
int size;
Edje_Var*vars;
diff --git a/src/lib/edje/edje_var.c b/src/lib/edje/edje_var.c
index 0d66c3d17a..40f32ff363 100644
--- a/src/lib/edje/edje_var.c
+++ b/src/lib/edje/edje_var.c
@@ -20,7 +20,8 @@ _edje_var_timer_cb(void *data)
embryo_program_vm_push(ed->collection->script);
_edje_embryo_globals_init(ed);
embryo_parameter_cell_push(ed->collection->script, (Embryo_Cell)et->val);
- ed->var_pool->timers = eina_list_remove(ed->var_pool->timers, et);
+ ed->var_pool->timers = eina_inlist_remove(ed->var_pool->timers,
+ EINA_INLIST_GET(et));
fn = et->func;
free(et);
{
@@ -239,8 +240,10 @@ _edje_var_shutdown(Edje *ed)
}
free(ed->var_pool->vars);
}
- EINA_LIST_FREE(ed->var_pool->timers, et)
+ EINA_INLIST_FREE(ed->var_pool->timers, et)
{
+ed->var_pool->timers = eina_inlist_remove(ed->var_pool->timers,
+ EINA_INLIST_GET(et));
ecore_timer_del(et->timer);
free(et);
}
@@ -1006,19 +1009,19 @@ _edje_var_timer_add(Edje *ed, double in, const char
*fname, int val)
free(et);
return 0;
}
- ed->var_pool->timers = eina_list_prepend(ed->var_pool->timers, et);
+ ed->var_pool->timers = eina_inlist_prepend(ed->var_pool->timers,
+ EINA_INLIST_GET(et));
return et->id;
}
static Edje_Var_Timer *
_edje_var_timer_find(Edje *ed, int id)
{
- Eina_List *l;
Edje_Var_Timer *et;
if (!ed->var_pool) return NULL;
- EINA_LIST_FOREACH(ed->var_pool->timers, l, et)
+ EINA_INLIST_FOREACH(ed->var_pool->timers, et)
if (et->id == id) return et;
return NULL;
@@ -1032,7 +1035,8 @@ _edje_var_timer_del(Edje *ed, int id)
et = _edje_var_timer_find(ed, id);
if (!et) return;
- ed->var_pool->timers = eina_list_remove(ed->var_pool->timers, et);
+ ed->var_pool->timers = eina_inlist_remove(ed->var_pool->timers,
+ EINA_INLIST_GET(et));
ecore_timer_del(et->timer);
free(et);
}
--
[EGIT] [core/efl] master 01/02: edje: Use EINA_LIST_FREE instead of hand coded variant
derekf pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=529abe2de559f357186a2f718eb0fe26436545bd
commit 529abe2de559f357186a2f718eb0fe26436545bd
Author: Derek Foreman
Date: Wed Jan 16 14:19:11 2019 -0600
edje: Use EINA_LIST_FREE instead of hand coded variant
Minor simplification, should be no functional change.
Signed-off-by: Derek Foreman
Reviewed-by: Mike Blumenkrantz
Reviewed-by: Cedric BAIL
Differential Revision: https://phab.enlightenment.org/D7696
---
src/lib/edje/edje_var.c | 8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/lib/edje/edje_var.c b/src/lib/edje/edje_var.c
index 3bc3ebf0b2..0d66c3d17a 100644
--- a/src/lib/edje/edje_var.c
+++ b/src/lib/edje/edje_var.c
@@ -211,6 +211,8 @@ _edje_var_init(Edje *ed)
void
_edje_var_shutdown(Edje *ed)
{
+ Edje_Var_Timer *et;
+
if (!ed->var_pool) return;
if (ed->var_pool->vars)
{
@@ -237,12 +239,8 @@ _edje_var_shutdown(Edje *ed)
}
free(ed->var_pool->vars);
}
- while (ed->var_pool->timers)
+ EINA_LIST_FREE(ed->var_pool->timers, et)
{
-Edje_Var_Timer *et;
-
-et = eina_list_data_get(ed->var_pool->timers);
-ed->var_pool->timers = eina_list_remove(ed->var_pool->timers, et);
ecore_timer_del(et->timer);
free(et);
}
--
[EGIT] [core/efl] master 01/01: efl_ui_widget: Save some pointer indirection
derekf pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=d14c700e9d41ce0db6ccb2bdc46fca56d3895b67
commit d14c700e9d41ce0db6ccb2bdc46fca56d3895b67
Author: Derek Foreman
Date: Fri Jan 18 13:39:46 2019 -0600
efl_ui_widget: Save some pointer indirection
We're getting the same widget data twice, as well as testing if the
object is a widget twice. Let's do these things once.
Signed-off-by: Derek Foreman
Reviewed-by: Mike Blumenkrantz
Differential Revision: https://phab.enlightenment.org/D7698
---
src/lib/elementary/efl_ui_widget.c | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/lib/elementary/efl_ui_widget.c
b/src/lib/elementary/efl_ui_widget.c
index 415882af0d..30f1ba3c4a 100644
--- a/src/lib/elementary/efl_ui_widget.c
+++ b/src/lib/elementary/efl_ui_widget.c
@@ -1469,24 +1469,26 @@ EOLIAN static Eina_Bool
_efl_ui_widget_widget_sub_object_add(Eo *obj, Elm_Widget_Smart_Data *sd,
Evas_Object *sobj)
{
Eina_Bool mirrored, pmirrored = efl_ui_mirrored_get(obj);
+ Elm_Widget_Smart_Data *sdc = NULL;
EINA_SAFETY_ON_TRUE_RETURN_VAL(obj == sobj, EINA_FALSE);
+ if (_elm_widget_is(sobj))
+ sdc = efl_data_scope_get(sobj, MY_CLASS);
+
if (sobj == sd->parent_obj)
{
/* in this case, sobj must be an elm widget, or something
* very wrong is happening */
-if (!_elm_widget_is(sobj)) return EINA_FALSE;
+if (!sdc) return EINA_FALSE;
if (!elm_widget_sub_object_del(sobj, obj)) return EINA_FALSE;
WRN("You passed a parent object of obj = %p as the sub object = %p!",
obj, sobj);
}
- if (_elm_widget_is(sobj))
+ if (sdc)
{
-ELM_WIDGET_DATA_GET(sobj, sdc);
-
if (sdc->parent_obj == obj) goto end;
if (sdc->parent_obj)
{
@@ -1543,10 +1545,8 @@ _efl_ui_widget_widget_sub_object_add(Eo *obj,
Elm_Widget_Smart_Data *sd, Evas_Ob
evas_object_data_set(sobj, "elm-parent", obj);
_callbacks_add(sobj, obj);
- if (_elm_widget_is(sobj))
+ if (sdc)
{
-ELM_WIDGET_DATA_GET(sobj, sdc);
-
/* NOTE: In the following two lines, 'sobj' is correct. Do not change
it.
* Due to elementary's scale policy, scale and pscale can be different
in
* some cases. This happens when sobj's previous parent and new parent
have
--
[EGIT] [core/efl] master 01/01: elm_code: Pass widget data to _elm_code_widget_fill_line
derekf pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=014705c740065865e1fae9c1a1e9862c0197684f
commit 014705c740065865e1fae9c1a1e9862c0197684f
Author: Derek Foreman
Date: Fri Jan 18 10:41:05 2019 -0600
elm_code: Pass widget data to _elm_code_widget_fill_line
We already have this looked up in all callers, and the lookup is mind
smashingly heavy. Just use what we have.
ref T6209
Signed-off-by: Derek Foreman
Reviewed-by: Chris Michael
Reviewed-by: Mike Blumenkrantz
Differential Revision: https://phab.enlightenment.org/D7694
---
src/lib/elementary/elm_code_widget.c | 15 ++-
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/src/lib/elementary/elm_code_widget.c
b/src/lib/elementary/elm_code_widget.c
index 39a1ee162e..265624778f 100644
--- a/src/lib/elementary/elm_code_widget.c
+++ b/src/lib/elementary/elm_code_widget.c
@@ -385,7 +385,7 @@ _elm_code_widget_fill_selection(Elm_Code_Widget *widget,
Elm_Code_Line *line, Ev
}
static void
-_elm_code_widget_fill_line(Elm_Code_Widget *widget, Elm_Code_Line *line)
+_elm_code_widget_fill_line(Elm_Code_Widget *widget, Elm_Code_Widget_Data *pd,
Elm_Code_Line *line)
{
char *chr;
Eina_Unicode unichr;
@@ -393,11 +393,9 @@ _elm_code_widget_fill_line(Elm_Code_Widget *widget,
Elm_Code_Line *line)
int chrpos, gutter;
Evas_Object *grid;
Evas_Textgrid_Cell *cells;
- Elm_Code_Widget_Data *pd;
EINA_SAFETY_ON_NULL_RETURN(line);
- pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
gutter = elm_obj_code_widget_text_left_gutter_width_get(widget);
if (eina_list_count(pd->grids) < line->number)
return;
@@ -409,7 +407,6 @@ _elm_code_widget_fill_line(Elm_Code_Widget *widget,
Elm_Code_Line *line)
length = elm_code_widget_line_text_column_width_get(widget, line);
chrpos = 0;
chr = (char *)elm_code_line_text_get(line, NULL);
-
for (x = gutter; x < (unsigned int) w && x < length + gutter; x+=charwidth)
{
unichr = eina_unicode_utf8_next_get(chr, );
@@ -477,7 +474,7 @@ _elm_code_widget_fill_range(Elm_Code_Widget *widget,
Elm_Code_Widget_Data *pd,
unsigned int y;
if (newline)
- _elm_code_widget_fill_line(widget, newline);
+ _elm_code_widget_fill_line(widget, pd, newline);
// if called from new line cb, no need to update whole range unless visible
if (newline && !elm_obj_code_widget_line_visible_get(widget, newline))
@@ -491,7 +488,7 @@ _elm_code_widget_fill_range(Elm_Code_Widget *widget,
Elm_Code_Widget_Data *pd,
line = elm_code_file_line_get(pd->code->file, y);
if (line)
- _elm_code_widget_fill_line(widget, line);
+ _elm_code_widget_fill_line(widget, pd, line);
}
if (pd->selection)
@@ -714,7 +711,7 @@ _elm_code_widget_cursor_move(Elm_Code_Widget *widget,
Elm_Code_Widget_Data *pd,
if (oldrow != pd->cursor_line)
_elm_code_widget_refresh(widget, line_obj);
else
- _elm_code_widget_fill_line(widget, elm_code_file_line_get(pd->code->file,
pd->cursor_line));
+ _elm_code_widget_fill_line(widget, pd,
elm_code_file_line_get(pd->code->file, pd->cursor_line));
elm_layout_signal_emit(pd->cursor_rect, "elm,action,show,cursor", "elm");
}
@@ -2080,9 +2077,9 @@ _elm_code_widget_resize(Elm_Code_Widget *widget,
Elm_Code_Line *newline)
}
EOAPI void
-_elm_code_widget_line_refresh(Eo *obj, Elm_Code_Widget_Data *pd EINA_UNUSED,
Elm_Code_Line *line)
+_elm_code_widget_line_refresh(Eo *obj, Elm_Code_Widget_Data *pd, Elm_Code_Line
*line)
{
- _elm_code_widget_fill_line(obj, line);
+ _elm_code_widget_fill_line(obj, pd, line);
}
EOAPI Eina_Bool
--
[EGIT] [core/efl] feature/themes/flat 02/02: TH - fix edje_cc errors with new edje_cc
raster pushed a commit to branch feature/themes/flat.
http://git.enlightenment.org/core/efl.git/commit/?id=81b6a29b8f1f43e31e9df27b03b713cf53fc0bfa
commit 81b6a29b8f1f43e31e9df27b03b713cf53fc0bfa
Author: Carsten Haitzler (Rasterman)
Date: Fri Jan 18 18:30:16 2019 +
TH - fix edje_cc errors with new edje_cc
---
data/elementary/themes/edc/elm/button.edc | 9 +
data/elementary/themes/edc/elm/list.edc | 2 +-
data/elementary/themes/edc/ilist.edc | 4
data/elementary/themes/edc/pointer.edc| 2 +-
data/elementary/themes/edc/toolbar.edc| 5 +
5 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/data/elementary/themes/edc/elm/button.edc
b/data/elementary/themes/edc/elm/button.edc
index 6ee8b3d71f..c64e132b99 100644
--- a/data/elementary/themes/edc/elm/button.edc
+++ b/data/elementary/themes/edc/elm/button.edc
@@ -323,6 +323,15 @@ group { name: "elm/button/base/anchor";
desc { "default";
color: 0 0 0 0;
}
+ desc { "pressed"; inherit;
+inherit: "default";
+ }
+ desc { "disabled"; inherit;
+inherit: "default";
+ }
+ desc { "hidden"; inherit;
+inherit: "default";
+ }
}
rect { "icon_clip";
desc { "default";
diff --git a/data/elementary/themes/edc/elm/list.edc
b/data/elementary/themes/edc/elm/list.edc
index 8630ef5186..6d9eca8e00 100644
--- a/data/elementary/themes/edc/elm/list.edc
+++ b/data/elementary/themes/edc/elm/list.edc
@@ -63,7 +63,7 @@ group { name: "elm/list/item/default";
description { state: "default" 0.0;
color: 0 0 0 0;
}
- description { state: "disabledv" 0.0;
+ description { state: "disabled" 0.0;
inherit: "default" 0.0;
visible: 0;
}
diff --git a/data/elementary/themes/edc/ilist.edc
b/data/elementary/themes/edc/ilist.edc
index 8d2b4c2da8..aabb23867b 100644
--- a/data/elementary/themes/edc/ilist.edc
+++ b/data/elementary/themes/edc/ilist.edc
@@ -78,6 +78,10 @@ group { name: "e/widgets/ilist";
inherit: "default" 0.0;
visible: 1;
}
+ description { state: "disabled" 0.0;
+inherit: "default" 0.0;
+visible: 0;
+ }
}
part { name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0;
scale: 1;
diff --git a/data/elementary/themes/edc/pointer.edc
b/data/elementary/themes/edc/pointer.edc
index 6fb7aebfbc..f1324fad27 100644
--- a/data/elementary/themes/edc/pointer.edc
+++ b/data/elementary/themes/edc/pointer.edc
@@ -406,7 +406,7 @@ group { name: "e/pointer/enlightenment/plus/color";
programs {
program { name: "fade1";
signal: "load"; source: "";
- action: STATE_SET "clicked" 0.0;
+ action: STATE_SET "faded" 0.0;
transition: SINUSOIDAL 0.5;
target: "add";
after: "fade2";
diff --git a/data/elementary/themes/edc/toolbar.edc
b/data/elementary/themes/edc/toolbar.edc
index 785bd7846d..0e81b2158d 100644
--- a/data/elementary/themes/edc/toolbar.edc
+++ b/data/elementary/themes/edc/toolbar.edc
@@ -217,6 +217,11 @@ group { name: "e/widgets/toolbar/item";
}
fixed: 0 1;
}
+ description { state: "noicon" 0.0;
+inherit: "default" 0.0;
+visible: 0;
+text.min: 0 0;
+ }
description { state: "disabled" 0.0;
inherit: "default" 0.0;
color: 96 96 96 255;
--
[EGIT] [core/efl] feature/themes/flat 01/02: Merge branch 'master' into feature/themes/flat
raster pushed a commit to branch feature/themes/flat. http://git.enlightenment.org/core/efl.git/commit/?id=2e95f35127693153465e295ad1814bdbb5d7279d commit 2e95f35127693153465e295ad1814bdbb5d7279d Merge: 366ab5c3bc ec910c5bb9 Author: Carsten Haitzler (Rasterman) Date: Fri Jan 18 18:22:10 2019 + Merge branch 'master' into feature/themes/flat .ci/build-efl-app.sh |6 +- .ci/ccache.conf|7 + .ci/ci-ccache-stats.sh |9 + .ci/ci-configure.sh| 151 + .ci/ci-linux-build.sh | 65 - .ci/ci-make-benchmark.sh | 19 + .ci/ci-make-check.sh | 54 + .ci/ci-make-checkbuild.sh | 22 + .ci/ci-make-distcheck.sh | 32 + .ci/ci-make-examples.sh| 19 + .ci/ci-make-install.sh | 24 + .ci/ci-make.sh | 24 + .ci/ci-osx-build.sh| 21 - .ci/ci-osx-deps.sh |3 +- .ci/ci-setup-ccache.sh | 12 + .ci/configure.sh | 12 + .ci/distcheck.sh | 125 + .ci/docker-ccache-setup.sh | 11 + .ci/dockerfiles/Dockerfile-Archlinux | 12 - .ci/dockerfiles/Dockerfile-Debian91|5 - .ci/dockerfiles/Dockerfile-Fedora26|5 - .ci/dockerfiles/Dockerfile-Fedora27| 11 - .ci/dockerfiles/Dockerfile-Opensuse423 |7 - .ci/dockerfiles/Dockerfile-Ubuntu1704 |5 - .ci/dockerfiles/Dockerfile-Ubuntu1710 |5 - .ci/efl.m4.diff| 24 + .ci/travis.sh | 24 + .travis.yml| 156 +- AUTHORS|5 + CMakeLists.txt | 70 - Makefile.am|3 +- NEWS | 479 +- README.meson | 51 + TODO-cmake.txt | 67 - cmake/config/common.cmake | 124 - cmake/config/ecore.cmake | 42 - cmake/config/ecore_con.cmake | 14 - cmake/config/ecore_x.cmake | 110 - cmake/config/eeze.cmake| 24 - cmake/config/eina.cmake| 80 - cmake/config/eldbus.cmake |1 - cmake/config/emile.cmake | 10 - cmake/config/eo.cmake |3 - cmake/config/eolian.cmake |1 - cmake/helpers/EflMacros.cmake | 1790 --- cmake/post/eina.cmake | 27 - cmakeconfig/meson.build| 61 + configure.ac | 189 +- data/edje/include/meson.build |3 + data/edje/meson.build |5 + data/elementary/config/default/base.src.in | 56 +- data/elementary/config/default/meson.build |7 + data/elementary/config/meson.build | 21 + data/elementary/config/mobile/base.src.in | 37 +- data/elementary/config/mobile/meson.build |7 + data/elementary/config/standard/base.src.in| 29 +- data/elementary/config/standard/meson.build|7 + data/elementary/desktop/elementary_perf.desktop|8 + data/elementary/desktop/meson.build| 13 + data/elementary/edje_externals/meson.build | 11 + data/elementary/meson.build| 10 + data/elementary/objects/meson.build| 41 + data/elementary/themes/Makefile.am |3 + data/elementary/themes/default.edc |3 + data/elementary/themes/edc/about-e.edc |2 - data/elementary/themes/edc/efl/datepicker.edc | 12 - data/elementary/themes/edc/efl/grid.edc| 269 + data/elementary/themes/edc/efl/list.edc|4 +- data/elementary/themes/edc/efl/panel.edc | 831 +++ data/elementary/themes/edc/efl/popup.edc | 46 +- data/elementary/themes/edc/efl/spin_button.edc | 83 +- data/elementary/themes/edc/efl/tab_bar.edc | 18 +- data/elementary/themes/edc/efl/text.edc| 27 +- data/elementary/themes/edc/efl/timepicker.edc | 15 - data/elementary/themes/edc/elm/button.edc | 23 - data/elementary/themes/edc/elm/gengrid.edc
[EGIT] [apps/terminology] master 01/01: themes - fix new error checks in edje_cc
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=5abb8b0eb316b048c80fd7d292d1598b3392bd23
commit 5abb8b0eb316b048c80fd7d292d1598b3392bd23
Author: Carsten Haitzler (Rasterman)
Date: Fri Jan 18 18:12:45 2019 +
themes - fix new error checks in edje_cc
where parts/states etc. dont exist.
---
data/themes/mild.edc| 4
data/themes/nyanology/nyanology.edc | 31 +--
2 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/data/themes/mild.edc b/data/themes/mild.edc
index 4a51c4b..a75cba0 100644
--- a/data/themes/mild.edc
+++ b/data/themes/mild.edc
@@ -1208,7 +1208,6 @@ collections {
target: "popmedia_clip";
target: "popmedia_dismiss";
target: "popmedia_shadow";
-target: "popmedia_fill";
target: "popmedia_overlay";
target: "popmedia_bevel";
target: "popmedia_glint";
@@ -1223,7 +1222,6 @@ collections {
target: "popmedia_clip";
target: "popmedia_dismiss";
target: "popmedia_shadow";
-target: "popmedia_fill";
target: "popmedia_overlay";
target: "popmedia_bevel";
target: "popmedia_glint";
@@ -1238,7 +1236,6 @@ collections {
target: "popmedia_clip";
target: "popmedia_dismiss";
target: "popmedia_shadow";
-target: "popmedia_fill";
target: "popmedia_overlay";
target: "popmedia_bevel";
target: "popmedia_glint";
@@ -1253,7 +1250,6 @@ collections {
target: "popmedia_clip";
target: "popmedia_dismiss";
target: "popmedia_shadow";
-target: "popmedia_fill";
target: "popmedia_overlay";
target: "popmedia_bevel";
target: "popmedia_glint";
diff --git a/data/themes/nyanology/nyanology.edc
b/data/themes/nyanology/nyanology.edc
index bc06124..5b07a77 100644
--- a/data/themes/nyanology/nyanology.edc
+++ b/data/themes/nyanology/nyanology.edc
@@ -95,6 +95,15 @@ collections {
description { state: "oneline" 0.0;
visible: 0;
}
+description { state: "disjoint" 0.0;
+ inherit: "default" 0.0;
+}
+description { state: "topfull" 0.0;
+ inherit: "default" 0.0;
+}
+description { state: "bottomfull" 0.0;
+ inherit: "default" 0.0;
+}
}
part { name: "middle_clip"; type: RECT;
mouse_events: 0;
@@ -110,6 +119,15 @@ collections {
rel2.to: "terminology.bottom_right";
rel2.relative: 0.0 1.0;
}
+description { state: "disjoint" 0.0;
+ inherit: "default" 0.0;
+}
+description { state: "topfull" 0.0;
+ inherit: "default" 0.0;
+}
+description { state: "bottomfull" 0.0;
+ inherit: "default" 0.0;
+}
}
part { name: "bottom_clip"; type: RECT;
mouse_events: 0;
@@ -118,10 +136,19 @@ collections {
rel1.relative: 0.0 0.0;
rel2.to_x: "terminology.bottom_right";
rel2.relative: 0.0 1.0;
-}
-description { state: "oneline" 0.0;
+ }
+ description { state: "oneline" 0.0;
visible: 0;
}
+description { state: "disjoint" 0.0;
+ inherit: "default" 0.0;
+}
+description { state: "topfull" 0.0;
+ inherit: "default" 0.0;
+}
+description { state: "bottomfull" 0.0;
+ inherit: "default" 0.0;
+}
}
// the outline around the selection...
--
[EGIT] [core/efl] master 01/01: elm_code: Don't update selection if it didn't change
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=ec910c5bb9dd23e266845a7dfcc7c9a8dcada1c8
commit ec910c5bb9dd23e266845a7dfcc7c9a8dcada1c8
Author: Derek Foreman
Date: Fri Jan 18 12:35:26 2019 -0500
elm_code: Don't update selection if it didn't change
Summary:
Mouse motion can cause multiple worthless selection updates with no
change to row or column. Discard updates that don't really update.
ref T6209
Depends on D7692
Reviewers: devilhorns
Reviewed By: devilhorns
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T6209
Differential Revision: https://phab.enlightenment.org/D7693
---
src/lib/elementary/elm_code_widget_selection.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/lib/elementary/elm_code_widget_selection.c
b/src/lib/elementary/elm_code_widget_selection.c
index 31476ca4ad..59a5615bd4 100644
--- a/src/lib/elementary/elm_code_widget_selection.c
+++ b/src/lib/elementary/elm_code_widget_selection.c
@@ -74,6 +74,9 @@ elm_code_widget_selection_end(Evas_Object *widget,
pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
+ if (pd->selection && (pd->selection->end_line == line) &&
+ (pd->selection->end_col == col)) return;
+
_elm_code_widget_selection_limit(widget, pd, , );
if (!pd->selection)
{
--
[EGIT] [core/efl] master 01/01: elm_code: Pass data to status_type_get
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=965cb9d28d183253eaa85e1764727ad40a5d0fe7
commit 965cb9d28d183253eaa85e1764727ad40a5d0fe7
Author: Derek Foreman
Date: Fri Jan 18 12:20:59 2019 -0500
elm_code: Pass data to status_type_get
Summary:
Every single call path has already dearly paid the price of pointer
indirection so let's save a few million extra look-ups and just pass
it along.
ref T6209
Reviewers: devilhorns
Reviewed By: devilhorns
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T6209
Differential Revision: https://phab.enlightenment.org/D7692
---
src/lib/elementary/elm_code_widget.c | 12
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/lib/elementary/elm_code_widget.c
b/src/lib/elementary/elm_code_widget.c
index 68738c10e0..39a1ee162e 100644
--- a/src/lib/elementary/elm_code_widget.c
+++ b/src/lib/elementary/elm_code_widget.c
@@ -152,12 +152,8 @@ _elm_code_widget_fill_line_token(Evas_Textgrid_Cell
*cells, int count, int start
}
static unsigned int
-_elm_code_widget_status_type_get(Elm_Code_Widget *widget, Elm_Code_Line *line,
unsigned int col)
+_elm_code_widget_status_type_get(Elm_Code_Widget_Data *pd, Elm_Code_Line
*line, unsigned int col)
{
- Elm_Code_Widget_Data *pd;
-
- pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
-
if (line->status != ELM_CODE_STATUS_TYPE_DEFAULT)
return line->status;
@@ -421,7 +417,7 @@ _elm_code_widget_fill_line(Elm_Code_Widget *widget,
Elm_Code_Line *line)
cells[x].codepoint = unichr;
cells[x].bold = 0;
cells[x].fg = ELM_CODE_TOKEN_TYPE_DEFAULT;
-cells[x].bg = _elm_code_widget_status_type_get(widget, line, x -
gutter + 1);
+cells[x].bg = _elm_code_widget_status_type_get(pd, line, x - gutter +
1);
charwidth = 1;
if (unichr == '\t')
@@ -429,7 +425,7 @@ _elm_code_widget_fill_line(Elm_Code_Widget *widget,
Elm_Code_Line *line)
for (i = x + 1; i < x + charwidth && i < (unsigned int) w; i++)
{
cells[i].codepoint = 0;
- cells[i].bg = _elm_code_widget_status_type_get(widget, line, i -
gutter + 1);
+ cells[i].bg = _elm_code_widget_status_type_get(pd, line, i -
gutter + 1);
}
_elm_code_widget_fill_whitespace(widget, unichr, [x]);
@@ -438,7 +434,7 @@ _elm_code_widget_fill_line(Elm_Code_Widget *widget,
Elm_Code_Line *line)
{
cells[x].codepoint = 0;
cells[x].bold = 0;
-cells[x].bg = _elm_code_widget_status_type_get(widget, line, x -
gutter + 1);
+cells[x].bg = _elm_code_widget_status_type_get(pd, line, x - gutter +
1);
}
_elm_code_widget_fill_line_gutter(widget, cells, w, line);
--
[EGIT] [core/efl] master 04/05: efl: convert all interfaces to the new eolian syntax
bu5hm4n pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=95160ab136863af013b39a93bcf5fb6f2565577c
commit 95160ab136863af013b39a93bcf5fb6f2565577c
Author: Marcel Hollerbach
Date: Fri Jan 18 14:29:31 2019 +0100
efl: convert all interfaces to the new eolian syntax
ref T7459
Reviewed-by: Daniel Kolesa
Reviewed-by: Xavi Artigas
Differential Revision: https://phab.enlightenment.org/D7687
---
src/lib/ecore_con/efl_net_dialer.eo | 2 +-
src/lib/ecore_con/efl_net_socket.eo | 2 +-
src/lib/efl/interfaces/efl_canvas_pointer.eo | 2 +-
src/lib/efl/interfaces/efl_canvas_scene.eo | 6 +++---
src/lib/efl/interfaces/efl_config.eo | 2 +-
src/lib/efl/interfaces/efl_gfx_buffer.eo | 2 +-
src/lib/efl/interfaces/efl_gfx_gradient_linear.eo| 2 +-
src/lib/efl/interfaces/efl_gfx_gradient_radial.eo| 2 +-
src/lib/efl/interfaces/efl_gfx_image.eo | 8
src/lib/efl/interfaces/efl_gfx_image_animation_controller.eo | 2 +-
src/lib/efl/interfaces/efl_gfx_image_load_controller.eo | 2 +-
src/lib/efl/interfaces/efl_interpolator.eo | 2 +-
src/lib/efl/interfaces/efl_model.eo | 2 +-
src/lib/efl/interfaces/efl_pack.eo | 2 +-
src/lib/efl/interfaces/efl_pack_layout.eo| 2 +-
src/lib/efl/interfaces/efl_pack_linear.eo| 2 +-
src/lib/efl/interfaces/efl_pack_table.eo | 2 +-
src/lib/efl/interfaces/efl_text_markup.eo| 2 +-
src/lib/efl/interfaces/efl_ui_clickable.eo | 2 +-
src/lib/efl/interfaces/efl_ui_draggable.eo | 2 +-
src/lib/efl/interfaces/efl_ui_factory.eo | 2 +-
src/lib/efl/interfaces/efl_ui_multi_selectable.eo| 2 +-
src/lib/efl/interfaces/efl_ui_scrollable.eo | 2 +-
src/lib/efl/interfaces/efl_ui_scrollable_interactive.eo | 2 +-
src/lib/efl/interfaces/efl_ui_scrollbar.eo | 2 +-
src/lib/efl/interfaces/efl_ui_selectable.eo | 2 +-
src/lib/efl/interfaces/efl_ui_view.eo| 2 +-
src/lib/efl/interfaces/efl_ui_zoom.eo| 2 +-
src/lib/elementary/efl_access_editable_text.eo | 2 +-
src/lib/elementary/efl_access_selection.eo | 2 +-
src/lib/elementary/efl_access_text.eo| 2 +-
src/lib/elementary/efl_access_value.eo | 2 +-
src/lib/elementary/efl_access_window.eo | 2 +-
src/lib/elementary/efl_text_interactive.eo | 4 ++--
src/lib/elementary/efl_ui_cursor.eo | 2 +-
src/lib/elementary/efl_ui_legacy.eo | 2 +-
src/lib/elementary/efl_ui_list_view_model.eo | 2 +-
src/lib/elementary/efl_ui_list_view_relayout.eo | 2 +-
src/lib/elementary/elm_interface_fileselector.eo | 2 +-
src/lib/evas/canvas/efl_canvas_text_factory.eo | 2 +-
src/lib/evas/canvas/efl_input_interface.eo | 2 +-
src/lib/evas/canvas/efl_input_state.eo | 2 +-
src/tests/efl_mono/dummy_another_iface.eo| 2 +-
src/tests/efl_mono/dummy_test_iface.eo | 2 +-
44 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/src/lib/ecore_con/efl_net_dialer.eo
b/src/lib/ecore_con/efl_net_dialer.eo
index b1f2afe80c..1b7b2e9c16 100644
--- a/src/lib/ecore_con/efl_net_dialer.eo
+++ b/src/lib/ecore_con/efl_net_dialer.eo
@@ -2,7 +2,7 @@ var Efl.Net.Dialer_Error.COULDNT_CONNECT: Eina.Error; [[The
dialer could not con
var Efl.Net.Dialer_Error.COULDNT_RESOLVE_PROXY: Eina.Error; [[The dialer could
not resolve the given proxy server]]
var Efl.Net.Dialer_Error.PROXY_AUTHENTICATION_FAILED: Eina.Error; [[The dialer
failed to authenticate against the proxy server]]
-interface Efl.Net.Dialer (Efl.Net.Socket) {
+interface Efl.Net.Dialer extends Efl.Net.Socket {
[[Creates a client socket to reach a remote peer.
The connection process starts when @.dial is executed. This
diff --git a/src/lib/ecore_con/efl_net_socket.eo
b/src/lib/ecore_con/efl_net_socket.eo
index 00394119d1..f8741226ad 100644
--- a/src/lib/ecore_con/efl_net_socket.eo
+++ b/src/lib/ecore_con/efl_net_socket.eo
@@ -1,4 +1,4 @@
-interface Efl.Net.Socket (Efl.Io.Reader, Efl.Io.Writer, Efl.Io.Closer) {
+interface Efl.Net.Socket extends Efl.Io.Reader, Efl.Io.Writer, Efl.Io.Closer {
[[The basic socket interface.
This is built upon the three core Input/Output interfaces:
diff --git a/src/lib/efl/interfaces/efl_canvas_pointer.eo
b/src/lib/efl/interfaces/efl_canvas_pointer.eo
index bb6596500f..45e34f7849 100644
---
[EGIT] [core/efl] master 03/05: efl: convert all abstracts to the new eolian syntax
bu5hm4n pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=3b6a9152c1361c590dd7054949c1af5db1f2ed59
commit 3b6a9152c1361c590dd7054949c1af5db1f2ed59
Author: Marcel Hollerbach
Date: Fri Jan 18 14:34:04 2019 +0100
efl: convert all abstracts to the new eolian syntax
ref T7459
Reviewed-by: Daniel Kolesa
Reviewed-by: Xavi Artigas
Differential Revision: https://phab.enlightenment.org/D7686
---
src/lib/ecore/efl_loop_consumer.eo| 4 ++--
src/lib/ecore/efl_task.eo | 2 +-
src/lib/ecore_audio/ecore_audio.eo| 2 +-
src/lib/ecore_con/efl_net_server_fd.eo| 2 +-
src/lib/ector/cairo/ector_renderer_cairo.eo | 2 +-
src/lib/ector/ector_renderer.eo | 2 +-
src/lib/ector/gl/ector_renderer_gl.eo | 2 +-
src/lib/ector/software/ector_renderer_software.eo | 2 +-
src/lib/elementary/efl_ui_grid_item.eo| 2 +-
src/lib/elementary/efl_ui_item.eo | 2 +-
src/lib/elementary/efl_ui_list_item.eo| 2 +-
src/lib/elementary/efl_ui_widget.eo | 4 ++--
src/lib/elementary/elm_web.eo | 2 +-
src/lib/evas/canvas/efl_canvas_animation.eo | 2 +-
src/lib/evas/canvas/efl_canvas_animation_group.eo | 2 +-
src/lib/evas/canvas/efl_canvas_image_internal.eo | 4 ++--
src/lib/evas/canvas/efl_canvas_object.eo | 6 +++---
src/lib/evas/canvas/efl_canvas_surface.eo | 2 +-
src/lib/evas/canvas/efl_canvas_vg_gradient.eo | 2 +-
src/lib/evas/canvas/efl_canvas_vg_node.eo | 2 +-
src/lib/evas/canvas/evas_canvas3d_object.eo | 2 +-
src/lib/evas/gesture/efl_canvas_gesture.eo| 2 +-
src/lib/evas/gesture/efl_canvas_gesture_recognizer.eo | 2 +-
23 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/src/lib/ecore/efl_loop_consumer.eo
b/src/lib/ecore/efl_loop_consumer.eo
index 62534536b4..def99ef035 100644
--- a/src/lib/ecore/efl_loop_consumer.eo
+++ b/src/lib/ecore/efl_loop_consumer.eo
@@ -1,4 +1,4 @@
-abstract Efl.Loop_Consumer (Efl.Object)
+abstract Efl.Loop_Consumer extends Efl.Object
{
[[An Efl.Loop_Consumer is a class which requires one of the parents to
provide
an Efl.Loop interface when performing provider_find. It will enforce this
by
@@ -25,7 +25,7 @@ abstract Efl.Loop_Consumer (Efl.Object)
params {
result: any_value; [[The value to be delivered.
-Note that the value contents must survive this function scope,
that is, do
+Note that the value contents must survive this function scope,
that is, do
not use stack allocated blobs, arrays, structures or types that
keep
references to memory you give. Values will be automatically
cleaned up using
\@ref eina_value_flush() once they are unused (no more future or
futures returned a new value)]]
diff --git a/src/lib/ecore/efl_task.eo b/src/lib/ecore/efl_task.eo
index 8670299de4..0a425d9f94 100644
--- a/src/lib/ecore/efl_task.eo
+++ b/src/lib/ecore/efl_task.eo
@@ -15,7 +15,7 @@ enum Efl.Task_Flags {
no_exit_code_error = 4,
}
-abstract Efl.Task (Efl.Object, Efl.Io.Reader, Efl.Io.Writer, Efl.Io.Closer)
+abstract Efl.Task extends Efl.Object implements Efl.Io.Reader, Efl.Io.Writer,
Efl.Io.Closer
{
[[ ]]
methods {
diff --git a/src/lib/ecore_audio/ecore_audio.eo
b/src/lib/ecore_audio/ecore_audio.eo
index e2c9fb8f5f..c93726f800 100644
--- a/src/lib/ecore_audio/ecore_audio.eo
+++ b/src/lib/ecore_audio/ecore_audio.eo
@@ -12,7 +12,7 @@ enum Ecore.Audio.Format {
last [[Sentinel value to indicate last enum field during iteration]]
}
-abstract Ecore.Audio (Efl.Object)
+abstract Ecore.Audio extends Efl.Object
{
[[Convenience audio class.]]
diff --git a/src/lib/ecore_con/efl_net_server_fd.eo
b/src/lib/ecore_con/efl_net_server_fd.eo
index bbb25a58bf..4758be1634 100644
--- a/src/lib/ecore_con/efl_net_server_fd.eo
+++ b/src/lib/ecore_con/efl_net_server_fd.eo
@@ -1,4 +1,4 @@
-abstract Efl.Net.Server_Fd (Efl.Loop_Fd, Efl.Net.Server) {
+abstract Efl.Net.Server_Fd extends Efl.Loop_Fd implements Efl.Net.Server {
[[A generic server based on file descriptors.
@since 1.19
diff --git a/src/lib/ector/cairo/ector_renderer_cairo.eo
b/src/lib/ector/cairo/ector_renderer_cairo.eo
index 02431e0b25..f28efe9e96 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo.eo
+++ b/src/lib/ector/cairo/ector_renderer_cairo.eo
@@ -1,4 +1,4 @@
-abstract Ector.Renderer.Cairo (Ector.Renderer)
+abstract Ector.Renderer.Cairo extends Ector.Renderer
{
[[Ector cairo renderer abstract class]]
methods {
diff --git a/src/lib/ector/ector_renderer.eo b/src/lib/ector/ector_renderer.eo
index 844ec1adaa..46bd9df9c6 100644
--- a/src/lib/ector/ector_renderer.eo
+++ b/src/lib/ector/ector_renderer.eo
@@ -1,6 +1,6 @@
import
[EGIT] [core/efl] master 05/05: eolian: remove the old inheritance syntax
bu5hm4n pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=2d7cbeb5aeceeebe287742e4888fb931af1aff68
commit 2d7cbeb5aeceeebe287742e4888fb931af1aff68
Author: Marcel Hollerbach
Date: Fri Jan 18 14:32:24 2019 +0100
eolian: remove the old inheritance syntax
fixes T7459
Reviewed-by: Daniel Kolesa
Differential Revision: https://phab.enlightenment.org/D7688
---
src/lib/eolian/eo_parser.c | 13 -
1 file changed, 13 deletions(-)
diff --git a/src/lib/eolian/eo_parser.c b/src/lib/eolian/eo_parser.c
index 0ea2944ea4..356c4ab56a 100644
--- a/src/lib/eolian/eo_parser.c
+++ b/src/lib/eolian/eo_parser.c
@@ -2090,8 +2090,6 @@ parse_class(Eo_Lexer *ls, Eolian_Class_Type type)
do
_requires_add(ls, ibuf);
while (test_next(ls, ','));
- if (ls->t.token == '{')
- goto inherit_done;
}
if (ls->t.kw == KW_extends || (is_reg && (ls->t.kw == KW_implements)))
@@ -2114,17 +2112,6 @@ parse_class(Eo_Lexer *ls, Eolian_Class_Type type)
_inherit_dep(ls, ibuf, EINA_FALSE);
while (test_next(ls, ','));
}
-else
- {
- check_next(ls, '(');
- if (ls->t.token != ')')
- {
- _inherit_dep(ls, ibuf, is_reg);
- while (test_next(ls, ','))
- _inherit_dep(ls, ibuf, EINA_FALSE);
- }
- check_match(ls, ')', '(', line, col);
- }
eo_lexer_dtor_pop(ls);
}
inherit_done:
--
[EGIT] [core/efl] master 02/05: efl: convert all mixins to new eolian syntax
bu5hm4n pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=4fc83c9cbb7a5973c4176fdf0519443d6f0f09a5
commit 4fc83c9cbb7a5973c4176fdf0519443d6f0f09a5
Author: Marcel Hollerbach
Date: Fri Jan 18 14:26:45 2019 +0100
efl: convert all mixins to new eolian syntax
ref T7459
Reviewed-by: Daniel Kolesa
Reviewed-by: Xavi Artigas
Differential Revision: https://phab.enlightenment.org/D7685
---
src/lib/ecore/efl_io_positioner_fd.eo| 2 +-
src/lib/ecore/efl_io_reader_fd.eo| 2 +-
src/lib/ecore/efl_io_sizer_fd.eo | 2 +-
src/lib/ecore/efl_io_writer_fd.eo| 2 +-
src/lib/ector/ector_renderer_gradient_linear.eo | 2 +-
src/lib/ector/ector_renderer_gradient_radial.eo | 2 +-
src/lib/ector/ector_surface.eo | 2 +-
src/lib/ector/software/ector_software_buffer_base.eo | 2 +-
src/lib/efl/interfaces/efl_gfx_shape.eo | 2 +-
src/lib/elementary/efl_access_action.eo | 2 +-
src/lib/elementary/efl_access_component.eo | 2 +-
src/lib/elementary/efl_access_widget_action.eo | 2 +-
12 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/lib/ecore/efl_io_positioner_fd.eo
b/src/lib/ecore/efl_io_positioner_fd.eo
index 83ccc4727f..ed9cd22f15 100644
--- a/src/lib/ecore/efl_io_positioner_fd.eo
+++ b/src/lib/ecore/efl_io_positioner_fd.eo
@@ -1,4 +1,4 @@
-mixin Efl.Io.Positioner_Fd (Efl.Io.Positioner) {
+mixin Efl.Io.Positioner_Fd extends Efl.Io.Positioner {
[[Positions fd using lseek(2).
@since 1.19
diff --git a/src/lib/ecore/efl_io_reader_fd.eo
b/src/lib/ecore/efl_io_reader_fd.eo
index 1e4d79f2da..30b95b31ef 100644
--- a/src/lib/ecore/efl_io_reader_fd.eo
+++ b/src/lib/ecore/efl_io_reader_fd.eo
@@ -1,4 +1,4 @@
-mixin Efl.Io.Reader_Fd (Efl.Io.Reader) {
+mixin Efl.Io.Reader_Fd extends Efl.Io.Reader {
[[Reads fd using read(2).
@since 1.19
diff --git a/src/lib/ecore/efl_io_sizer_fd.eo b/src/lib/ecore/efl_io_sizer_fd.eo
index 09edd062c8..9320324447 100644
--- a/src/lib/ecore/efl_io_sizer_fd.eo
+++ b/src/lib/ecore/efl_io_sizer_fd.eo
@@ -1,4 +1,4 @@
-mixin Efl.Io.Sizer_Fd (Efl.Io.Sizer) {
+mixin Efl.Io.Sizer_Fd extends Efl.Io.Sizer {
[[Resizes fd usign ftruncate(2).
@since 1.19
diff --git a/src/lib/ecore/efl_io_writer_fd.eo
b/src/lib/ecore/efl_io_writer_fd.eo
index 018f286980..b43b8b1d0d 100644
--- a/src/lib/ecore/efl_io_writer_fd.eo
+++ b/src/lib/ecore/efl_io_writer_fd.eo
@@ -1,4 +1,4 @@
-mixin Efl.Io.Writer_Fd (Efl.Io.Writer) {
+mixin Efl.Io.Writer_Fd extends Efl.Io.Writer {
[[Writes fd using write(2).
@since 1.19
diff --git a/src/lib/ector/ector_renderer_gradient_linear.eo
b/src/lib/ector/ector_renderer_gradient_linear.eo
index d147faec2b..6158e13eb4 100644
--- a/src/lib/ector/ector_renderer_gradient_linear.eo
+++ b/src/lib/ector/ector_renderer_gradient_linear.eo
@@ -1,4 +1,4 @@
-mixin Ector.Renderer.Gradient.Linear (Efl.Gfx.Gradient_Linear)
+mixin Ector.Renderer.Gradient.Linear extends Efl.Gfx.Gradient_Linear
{
[[Ector gradient linear renderer mixin]]
eo_prefix: ector_renderer_gradient_linear;
diff --git a/src/lib/ector/ector_renderer_gradient_radial.eo
b/src/lib/ector/ector_renderer_gradient_radial.eo
index c2c8542871..5cf56c95be 100644
--- a/src/lib/ector/ector_renderer_gradient_radial.eo
+++ b/src/lib/ector/ector_renderer_gradient_radial.eo
@@ -1,4 +1,4 @@
-mixin Ector.Renderer.Gradient.Radial (Efl.Gfx.Gradient_Radial)
+mixin Ector.Renderer.Gradient.Radial extends Efl.Gfx.Gradient_Radial
{
[[Ector gradient radial renderer mixin]]
eo_prefix: ector_renderer_gradient_radial;
diff --git a/src/lib/ector/ector_surface.eo b/src/lib/ector/ector_surface.eo
index 13922ca202..9655c06bd5 100644
--- a/src/lib/ector/ector_surface.eo
+++ b/src/lib/ector/ector_surface.eo
@@ -1,4 +1,4 @@
-mixin Ector.Surface (Ector.Buffer)
+mixin Ector.Surface extends Ector.Buffer
{
[[Surface interface for Ector]]
diff --git a/src/lib/ector/software/ector_software_buffer_base.eo
b/src/lib/ector/software/ector_software_buffer_base.eo
index 2a3b63ee67..e139bc7d09 100644
--- a/src/lib/ector/software/ector_software_buffer_base.eo
+++ b/src/lib/ector/software/ector_software_buffer_base.eo
@@ -1,4 +1,4 @@
-mixin Ector.Software.Buffer.Base (Ector.Buffer)
+mixin Ector.Software.Buffer.Base extends Ector.Buffer
{
[[A buffer in Ector Software is a readable & optionally writable image]]
eo_prefix: ector_software_buffer;
diff --git a/src/lib/efl/interfaces/efl_gfx_shape.eo
b/src/lib/efl/interfaces/efl_gfx_shape.eo
index 10f55a0eef..2dfb554e81 100644
--- a/src/lib/efl/interfaces/efl_gfx_shape.eo
+++ b/src/lib/efl/interfaces/efl_gfx_shape.eo
@@ -1,6 +1,6 @@
import efl_gfx_types;
-mixin Efl.Gfx.Shape (Efl.Gfx.Path)
+mixin Efl.Gfx.Shape extends Efl.Gfx.Path
{
[[EFL graphics shape object interface]]
methods {
diff --git
[EGIT] [core/efl] master 01/01: efl-mono: Fix calling non-static methods with garbage collectable NativeInherits
bu5hm4n pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=50c41b1100d2dce33518e59ebaadc5cfcc63c69e
commit 50c41b1100d2dce33518e59ebaadc5cfcc63c69e
Author: Felipe Magno de Almeida
Date: Fri Jan 18 09:37:26 2019 +
efl-mono: Fix calling non-static methods with garbage collectable
NativeInherits
This fixes intermittent errors in C# classes with inheritance from Eo,
just like a lot of unit tests.
Reviewed-by: Xavi Artigas
Differential Revision: https://phab.enlightenment.org/D7683
---
src/bin/eolian_mono/eolian/mono/function_definition.hh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/bin/eolian_mono/eolian/mono/function_definition.hh
b/src/bin/eolian_mono/eolian/mono/function_definition.hh
index 6917870074..5a78bc735f 100644
--- a/src/bin/eolian_mono/eolian/mono/function_definition.hh
+++ b/src/bin/eolian_mono/eolian/mono/function_definition.hh
@@ -79,7 +79,7 @@ struct native_function_definition_generator
if(!as_generator
(scope_tab
-<< " private "
+<< " private static "
<< eolian_mono::marshall_type(true) << " "
<< string
<< "(System.IntPtr obj, System.IntPtr pd"
@@ -102,7 +102,7 @@ struct native_function_definition_generator
<< eolian_mono::native_function_definition_epilogue(*klass)
<< scope_tab << scope_tab << "} else {\n"
<< scope_tab << scope_tab << scope_tab << (return_type != " void" ?
"return " : "") << string
-<< "(Efl.Eo.Globals.efl_super(obj, " << "GetEflClass())" << *(", " <<
argument) << ");\n"
+<< "(Efl.Eo.Globals.efl_super(obj, " <<
"Efl.Eo.Globals.efl_class_get(obj))" << *(", " << argument) << ");\n"
<< scope_tab << scope_tab << "}\n"
<< scope_tab << "}\n"
)
--
[EGIT] [tools/examples] master 01/01: Adapt examples translation API changes
xartigas pushed a commit to branch master. http://git.enlightenment.org/tools/examples.git/commit/?id=9751e2ed828c24807b73272efdbf576cf0c3c2d1 commit 9751e2ed828c24807b73272efdbf576cf0c3c2d1 Author: Xavi Artigas Date: Fri Jan 18 13:35:35 2019 +0100 Adapt examples translation API changes translatable -> l10n --- reference/c/ui/src/ui_translation.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/reference/c/ui/src/ui_translation.c b/reference/c/ui/src/ui_translation.c index b8aa9884..02ba9a1a 100644 --- a/reference/c/ui/src/ui_translation.c +++ b/reference/c/ui/src/ui_translation.c @@ -45,15 +45,15 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED) efl_content_set(win, efl_added)); efl_add(EFL_UI_BUTTON_CLASS, win, - efl_ui_translatable_text_set(efl_added, "Translations", _TEXT_DOMAIN), + efl_ui_l10n_text_set(efl_added, "Translations", _TEXT_DOMAIN), efl_pack_end(box, efl_added)); efl_add(EFL_UI_BUTTON_CLASS, win, - efl_ui_translatable_text_set(efl_added, "Help", _TEXT_DOMAIN), + efl_ui_l10n_text_set(efl_added, "Help", _TEXT_DOMAIN), efl_pack_end(box, efl_added)); efl_add(EFL_UI_BUTTON_CLASS, win, - efl_ui_translatable_text_set(efl_added, "Quit", _TEXT_DOMAIN), + efl_ui_l10n_text_set(efl_added, "Quit", _TEXT_DOMAIN), efl_pack_end(box, efl_added), efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(100, 100)), efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, --
