Re: [E-devel] Character '<' display issue when using edje_object_part_text_set
+ chenjing...@126.com 2019년 10월 17일 (목) 오후 12:28, cnook 님이 작성: > Hi. You could use for <. I found it from > > > https://www.webstandards.org/learn/reference/charts/entities/markup_entities/index.html > > 2019년 10월 17일 (목) 오전 11:49, Jing 님이 작성: > >> Hi Carsten, >> So there is no way I can display character '<' in a TEXTBLOCK part ?? >> Is there any other way I can display character '<' in my UI ? >> >> >> Thanks. >> >> >> >> At 2019-10-17 01:22:50, "Carsten Haitzler (The Rasterman)" < >> ras...@rasterman.com> wrote: >> >On Wed, 16 Oct 2019 18:05:30 +0800 (CST) Jing >> said: >> > >> >> Hi all, >> >> I failed to display '<' by using edje_object_part_text_set(layout, >> >> "part_name", "<") . Text display is empty. Please help to advise how >> to fix >> >> this issue, thanks. ___ >> >> enlightenment-devel mailing list >> enlightenment-devel@lists.sourceforge.net >> >> https://lists.sourceforge.net/lists/listinfo/enlightenment-devel >> > >> >if that is a part that is a TEXTBLOCK part then that is a tag like html >> - or >> >the start of one, and thus you need to escape it. >> > >> > >> >-- >> >- Codito, ergo sum - "I code, therefore I am" -- >> >Carsten Haitzler - ras...@rasterman.com >> >> ___ >> enlightenment-devel mailing list >> enlightenment-devel@lists.sourceforge.net >> https://lists.sourceforge.net/lists/listinfo/enlightenment-devel >> > ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Character '<' display issue when using edje_object_part_text_set
Hi. You could use for <. I found it from https://www.webstandards.org/learn/reference/charts/entities/markup_entities/index.html 2019년 10월 17일 (목) 오전 11:49, Jing 님이 작성: > Hi Carsten, > So there is no way I can display character '<' in a TEXTBLOCK part ?? > Is there any other way I can display character '<' in my UI ? > > > Thanks. > > > > At 2019-10-17 01:22:50, "Carsten Haitzler (The Rasterman)" < > ras...@rasterman.com> wrote: > >On Wed, 16 Oct 2019 18:05:30 +0800 (CST) Jing said: > > > >> Hi all, > >> I failed to display '<' by using edje_object_part_text_set(layout, > >> "part_name", "<") . Text display is empty. Please help to advise how to > fix > >> this issue, thanks. ___ > >> enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > >> https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > > > >if that is a part that is a TEXTBLOCK part then that is a tag like html - > or > >the start of one, and thus you need to escape it. > > > > > >-- > >- Codito, ergo sum - "I code, therefore I am" -- > >Carsten Haitzler - ras...@rasterman.com > > ___ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Character '<' display issue when using edje_object_part_text_set
Hi Carsten, So there is no way I can display character '<' in a TEXTBLOCK part ?? Is there any other way I can display character '<' in my UI ? Thanks. At 2019-10-17 01:22:50, "Carsten Haitzler (The Rasterman)" wrote: >On Wed, 16 Oct 2019 18:05:30 +0800 (CST) Jing said: > >> Hi all, >> I failed to display '<' by using edje_object_part_text_set(layout, >> "part_name", "<") . Text display is empty. Please help to advise how to fix >> this issue, thanks. ___ >> enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net >> https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > >if that is a part that is a TEXTBLOCK part then that is a tag like html - or >the start of one, and thus you need to escape it. > > >-- >- Codito, ergo sum - "I code, therefore I am" -- >Carsten Haitzler - ras...@rasterman.com ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [apps/terminology] master 01/01: Merge branch 'terminology-1.5'
billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=688a45dc150e295a084b86d17d59dcd30ca54205 commit 688a45dc150e295a084b86d17d59dcd30ca54205 Merge: 951b415 fd2212a Author: Boris Faure Date: Thu Oct 17 00:11:13 2019 +0200 Merge branch 'terminology-1.5' Conflicts: src/bin/options_font.c src/bin/options_font.c | 50 -- 1 file changed, 24 insertions(+), 26 deletions(-) diff --cc src/bin/options_font.c index d90e7e9,f9f54ce..3945f6e --- a/src/bin/options_font.c +++ b/src/bin/options_font.c @@@ -358,14 -361,16 +361,16 @@@ _cb_term_resize(void *data } static void - _cb_font_del(void *data, - Evas *_e EINA_UNUSED, - Evas_Object *_obj EINA_UNUSED, - void *_event EINA_UNUSED) + _cb_font_bolditalic(void *data, + Evas_Object *obj, + void *_event EINA_UNUSED) { Font_Ctx *ctx = data; -evas_object_event_callback_del_full(ctx->term, EVAS_CALLBACK_RESIZE, -_cb_term_resize, ctx); +Config *config = ctx->config; + +config->font.bolditalic = elm_check_state_get(obj); +termio_config_update(ctx->term); - config_save(config, NULL); ++ config_save(config); } static void --
[EGIT] [apps/terminology] terminology-1.5 01/01: options_font: fix use after free
billiob pushed a commit to branch terminology-1.5. http://git.enlightenment.org/apps/terminology.git/commit/?id=fd2212afd8d98c39ff8ad25d86c7209a2a5f commit fd2212afd8d98c39ff8ad25d86c7209a2a5f Author: Boris Faure Date: Thu Oct 17 00:02:38 2019 +0200 options_font: fix use after free --- src/bin/options_font.c | 50 -- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/src/bin/options_font.c b/src/bin/options_font.c index 407694a..f9f54ce 100644 --- a/src/bin/options_font.c +++ b/src/bin/options_font.c @@ -16,10 +16,13 @@ typedef struct _Font_Ctx { + Evas_Object *fr; + Evas_Object *opbox; Evas_Object *op_fontslider; Evas_Object *op_fontlist; Evas_Object *op_fsml; Evas_Object *op_fbig; + Evas_Object *cx; Evas_Object *term; Eina_List *fonts; Eina_Hash *fonthash; @@ -358,14 +361,16 @@ _cb_term_resize(void *data, } static void -_cb_font_del(void *data, - Evas *_e EINA_UNUSED, - Evas_Object *_obj EINA_UNUSED, - void *_event EINA_UNUSED) +_cb_font_bolditalic(void *data, +Evas_Object *obj, +void *_event EINA_UNUSED) { Font_Ctx *ctx = data; - evas_object_event_callback_del_full(ctx->term, EVAS_CALLBACK_RESIZE, - _cb_term_resize, ctx); + Config *config = ctx->config; + + config->font.bolditalic = elm_check_state_get(obj); + termio_config_update(ctx->term); + config_save(config, NULL); } static void @@ -385,26 +390,20 @@ _parent_del_cb(void *data, } eina_hash_free(ctx->fonthash); - free(ctx); -} - -static void -_cb_font_bolditalic(void *data, -Evas_Object *obj, -void *_event EINA_UNUSED) -{ - Font_Ctx *ctx = data; - Config *config = ctx->config; + evas_object_event_callback_del_full(ctx->term, EVAS_CALLBACK_RESIZE, + _cb_term_resize, ctx); + evas_object_smart_callback_del_full(ctx->cx, "changed", + _cb_font_bolditalic, ctx); + evas_object_smart_callback_del_full(ctx->op_fontslider, "delay,changed", + _cb_op_fontsize_sel, ctx); - config->font.bolditalic = elm_check_state_get(obj); - termio_config_update(ctx->term); - config_save(config, NULL); + free(ctx); } void options_font(Evas_Object *opbox, Evas_Object *term) { - Evas_Object *o, *bx, *fr, *bx0; + Evas_Object *o, *bx, *bx0; char buf[4096], *file, *fname; Eina_List *files, *fontlist, *l; Font *f; @@ -418,21 +417,22 @@ options_font(Evas_Object *opbox, Evas_Object *term) ctx->config = config; ctx->term = term; + ctx->opbox = opbox; - fr = o = elm_frame_add(opbox); + ctx->fr = o = elm_frame_add(opbox); evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_object_text_set(o, _("Font")); elm_box_pack_end(opbox, o); evas_object_show(o); - evas_object_event_callback_add(fr, EVAS_CALLBACK_DEL, + evas_object_event_callback_add(ctx->fr, EVAS_CALLBACK_DEL, _parent_del_cb, ctx); bx0 = o = elm_box_add(opbox); evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL); - elm_object_content_set(fr, o); + elm_object_content_set(ctx->fr, o); evas_object_show(o); bx = o = elm_box_add(opbox); @@ -588,7 +588,7 @@ options_font(Evas_Object *opbox, Evas_Object *term) evas_object_size_hint_align_set(opbox, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_show(o); - o = elm_check_add(bx0); + ctx->cx = o = elm_check_add(bx0); evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5); elm_object_text_set(o, _("Display bold and italic in the terminal")); @@ -602,6 +602,4 @@ options_font(Evas_Object *opbox, Evas_Object *term) evas_object_geometry_get(term, NULL, NULL, >tsize_w, >tsize_h); evas_object_event_callback_add(term, EVAS_CALLBACK_RESIZE, _cb_term_resize, ctx); - evas_object_event_callback_add(opbox, EVAS_CALLBACK_DEL, - _cb_font_del, ctx); } --
[EGIT] [core/efl] master 03/03: csharp: Updating eldbus_common docs.
lauromoura pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=4885e0764d6ea0ed542b90f9e02dd1eb5d1fa8d7 commit 4885e0764d6ea0ed542b90f9e02dd1eb5d1fa8d7 Author: Bruno da Silva Belo Date: Wed Oct 16 11:26:03 2019 -0300 csharp: Updating eldbus_common docs. Summary: ref T8361 Reviewers: lauromoura, felipealmeida, segfaultxavi, woohyun Reviewed By: lauromoura Subscribers: cedric, #reviewers, #committers Tags: #efl Maniphest Tasks: T8361 Differential Revision: https://phab.enlightenment.org/D10416 --- src/bindings/mono/eldbus_mono/eldbus_common.cs | 663 - 1 file changed, 661 insertions(+), 2 deletions(-) diff --git a/src/bindings/mono/eldbus_mono/eldbus_common.cs b/src/bindings/mono/eldbus_mono/eldbus_common.cs index 80b1e25c60..99a7aef6e5 100644 --- a/src/bindings/mono/eldbus_mono/eldbus_common.cs +++ b/src/bindings/mono/eldbus_mono/eldbus_common.cs @@ -2,182 +2,466 @@ using System; using System.Runtime.InteropServices; +using System.ComponentModel; using static eldbus.EldbusMessageNativeFunctions; namespace eldbus { - +/// +/// Representation for Timeout flags. +/// Since EFL 1.23. +/// public static class Timeout { +/// +/// Infinite flag. +/// Since EFL 1.23. +/// public const int Infinite = 0x7fff; } +/// +/// The path to an object. +/// Since EFL 1.23. +/// [StructLayout(LayoutKind.Sequential)] public struct ObjectPath { +/// +/// The string of the path. +/// Since EFL 1.23. +/// public string value; +/// +/// Constructor +/// Since EFL 1.23. +/// +/// The string of the path. public ObjectPath(string str) { value = str; } +/// +/// Conversion operator of ObjectPath from string. +/// Since EFL 1.23. +/// +/// The string of the path. public static implicit operator ObjectPath(string str) { return new ObjectPath(str); } +/// +/// Conversion operator of string from ObjectPath. +/// Since EFL 1.23. +/// +/// The ObjectPath to be converted. public static implicit operator string(ObjectPath path) { return path.value; } } +/// +/// String to a signature. +/// Since EFL 1.23. +/// [StructLayout(LayoutKind.Sequential)] public struct SignatureString { +/// +/// The string of the signature. +/// Since EFL 1.23. +/// public string value; +/// +/// Constructor. +/// Since EFL 1.23. +/// +/// The string of the signature. public SignatureString(string str) { value = str; } +/// +/// Conversion operator of SignatureString from string. +/// Since EFL 1.23. +/// +/// The string of the signature. public static implicit operator SignatureString(string str) { return new SignatureString(str); } +/// +/// Conversion operator of string from SignatureString. +/// Since EFL 1.23. +/// +/// The SignatureString to be conversion. public static implicit operator string(SignatureString sig) { return sig.value; } } +/// +/// Representation for Unix file descriptor. +/// Since EFL 1.23. +/// [StructLayout(LayoutKind.Sequential)] public struct UnixFd { +/// +/// The value of the file descriptor. +/// Since EFL 1.23. +/// public Int32 value; +/// +/// Constructor. +/// Since EFL 1.23. +/// +/// The file descriptor. public UnixFd(Int32 fd) { value = fd; } +/// +/// Conversion operator of UnixFd from Int32. +/// Since EFL 1.23. +/// +/// The file descriptor. public static implicit operator UnixFd(Int32 fd) { return new UnixFd(fd); } +/// +/// Conversion operator of Int32 from UnixFd. +/// Since EFL 1.23. +/// +/// The UnixFd to be converted. public static implicit operator Int32(UnixFd unix_fd) { return unix_fd.value; } } - +/// +/// Arguments of EldBus. +/// Since EFL 1.23. +/// public static class Argument { +/// +/// The type of a byte. +/// Since EFL 1.23. +/// public class ByteType { +/// +/// The code of the byte. +/// Since EFL 1.23. +/// public const char Code = 'y'; +/// +/// The signature of the byte. +/// Since EFL 1.23. +/// public const string Signature = "y"; } +/// +/// The type of a boolean +/// Since EFL 1.23. +/// public class BooleanType { +/// +/// The code of the boolean. +/// Since EFL 1.23. +/// public const char Code = 'b'; +/// +/// The signature of the boolean. +/// Since EFL 1.23. +///
[EGIT] [core/efl] master 02/03: csharp: updating eldbus_config docs.
lauromoura pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=2ace33915b61339a8dcf0be046a8243310041241 commit 2ace33915b61339a8dcf0be046a8243310041241 Author: Bruno da Silva Belo Date: Wed Oct 16 11:00:29 2019 -0300 csharp: updating eldbus_config docs. Summary: ref T8361 Reviewers: lauromoura, felipealmeida, segfaultxavi, woohyun Reviewed By: lauromoura Subscribers: cedric, #reviewers, #committers Tags: #efl Maniphest Tasks: T8361 Differential Revision: https://phab.enlightenment.org/D10417 --- src/bindings/mono/eldbus_mono/eldbus_config.cs | 11 +-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/bindings/mono/eldbus_mono/eldbus_config.cs b/src/bindings/mono/eldbus_mono/eldbus_config.cs index b0a0c1fd13..f42452e2fb 100644 --- a/src/bindings/mono/eldbus_mono/eldbus_config.cs +++ b/src/bindings/mono/eldbus_mono/eldbus_config.cs @@ -7,14 +7,17 @@ namespace eldbus { /// Initializes Eldbus. -/// -/// Since EFL 1.23. +/// Since EFL 1.23. /// public static class Config { [DllImport(efl.Libs.Eldbus)] private static extern int eldbus_init(); [DllImport(efl.Libs.Eldbus)] private static extern int eldbus_shutdown(); +/// +/// Initialization of the eldbus. +/// Since EFL 1.23. +/// public static void Init() { if (eldbus_init() == 0) @@ -23,6 +26,10 @@ public static class Config } } +/// +/// Shutdown the eldbus. +/// Since EFL 1.23. +/// public static void Shutdown() { eldbus_shutdown(); --
[EGIT] [core/efl] master 01/03: csharp: updating eldbus_connection docs.
lauromoura pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=e6bffe1e2b65eb4625a16c32fee0d37b2c2aafc8 commit e6bffe1e2b65eb4625a16c32fee0d37b2c2aafc8 Author: Bruno da Silva Belo Date: Wed Oct 16 10:50:10 2019 -0300 csharp: updating eldbus_connection docs. Summary: ref T8361 Reviewers: lauromoura, felipealmeida, segfaultxavi, woohyun Reviewed By: lauromoura Subscribers: cedric, #reviewers, #committers Tags: #efl Maniphest Tasks: T8361 Differential Revision: https://phab.enlightenment.org/D10418 --- src/bindings/mono/eldbus_mono/eldbus_connection.cs | 151 - 1 file changed, 147 insertions(+), 4 deletions(-) diff --git a/src/bindings/mono/eldbus_mono/eldbus_connection.cs b/src/bindings/mono/eldbus_mono/eldbus_connection.cs index 18ec10f32a..6a75bb97ee 100644 --- a/src/bindings/mono/eldbus_mono/eldbus_connection.cs +++ b/src/bindings/mono/eldbus_mono/eldbus_connection.cs @@ -2,12 +2,14 @@ using System; using System.Runtime.InteropServices; +using System.ComponentModel; using static eldbus.EldbusConnectionNativeFunctions; namespace eldbus { +[EditorBrowsable(EditorBrowsableState.Never)] public static class EldbusConnectionNativeFunctions { [DllImport(efl.Libs.Eldbus)] public static extern IntPtr @@ -89,22 +91,55 @@ public static class EldbusConnectionNativeFunctions } /// Represents a DBus connection. -/// -/// Since EFL 1.23. +/// Since EFL 1.23. /// public class Connection : IDisposable { +/// +/// The type of the Connection. +/// Since EFL 1.23. +/// public enum Type { +/// +/// Unknown type. +/// It's a sentinel. +/// Since EFL 1.23. +/// Unknown = 0, // sentinel, not a real type +/// +/// Session type. +/// Since EFL 1.23. +/// Session, +/// +/// System type. +/// Since EFL 1.23. +/// System, +/// +/// Starter type. +/// Since EFL 1.23. +/// Starter, +/// +/// Address type. +/// Since EFL 1.23. +/// Address, +/// +/// Last type. +/// It's a sentinel. +/// Since EFL 1.23. +/// Last // sentinel, not a real type }; +[EditorBrowsable(EditorBrowsableState.Never)] public IntPtr Handle {get;set;} = IntPtr.Zero; +/// Whether this wrapper owns the native handle. +/// Since EFL 1.23. +/// public bool Own {get;set;} = true; private void InitNew(IntPtr handle, bool own) @@ -122,38 +157,67 @@ public class Connection : IDisposable } } +[EditorBrowsable(EditorBrowsableState.Never)] public Connection(IntPtr handle, bool own) { InitNew(handle, own); } - +/// +/// Constructor. +/// Since EFL 1.23. +/// +/// The type of the connection. public Connection(eldbus.Connection.Type type) { InitNew(eldbus_connection_get(type), true); } +/// +/// Constructor. +/// Since EFL 1.23. +/// +/// The address of the connection. public Connection(string address) { InitNew(eldbus_address_connection_get(address), true); } +/// +/// Gets a Connection with a type. +/// Since EFL 1.23. +/// +/// +/// A Connection with the type. public static eldbus.Connection GetPrivate(eldbus.Connection.Type type) { return new eldbus.Connection(eldbus_private_connection_get(type), true); } +/// +/// Gets a Connection with a address. +/// Since EFL 1.23. +/// +/// The address of the connection. public static eldbus.Connection GetPrivate(string address) { return new eldbus.Connection(eldbus_private_address_connection_get(address), true); } - +/// +/// Finalizer to be called from the Garbage Collector. +/// Since EFL 1.23. +/// ~Connection() { Dispose(false); } +/// Disposes of this wrapper, releasing the native array if owned. +/// Since EFL 1.23. +/// +/// True if this was called from public method. False if +/// called from the C# finalizer. protected virtual void Dispose(bool disposing) { IntPtr h = Handle; @@ -176,17 +240,28 @@ public class Connection : IDisposable } } +/// Releases the native resources held by this instance. +/// Since EFL 1.23. +/// public void Dispose() { Dispose(true); GC.SuppressFinalize(this); } +/// Releases the native resources held by this instance. +/// Since EFL 1.23. +/// public void Free() { Dispose(); } +/// +/// Releases the native handler. +/// Since EFL 1.23. +/// +/// The
Re: [E-devel] Character '<' display issue when using edje_object_part_text_set
On Wed, 16 Oct 2019 18:05:30 +0800 (CST) Jing said: > Hi all, > I failed to display '<' by using edje_object_part_text_set(layout, > "part_name", "<") . Text display is empty. Please help to advise how to fix > this issue, thanks. ___ > enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel if that is a part that is a TEXTBLOCK part then that is a tag like html - or the start of one, and thus you need to escape it. -- - Codito, ergo sum - "I code, therefore I am" -- Carsten Haitzler - ras...@rasterman.com ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [website/www-content] master 01/01: Wiki page remote_debugging changed with summary [Fix typos] by Carla Sensa
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=afeff43cc3d4324fe6e0eccca7e205d5d3bc1da9 commit afeff43cc3d4324fe6e0eccca7e205d5d3bc1da9 Author: Carla Sensa Date: Wed Oct 16 07:43:38 2019 -0700 Wiki page remote_debugging changed with summary [Fix typos] by Carla Sensa --- pages/develop/remote_debugging.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pages/develop/remote_debugging.txt b/pages/develop/remote_debugging.txt index 227f1dcad..3adc2bb9c 100644 --- a/pages/develop/remote_debugging.txt +++ b/pages/develop/remote_debugging.txt @@ -11,7 +11,7 @@ This tutorial aims at providing approaches to remote debugging. Remote debugging through ssh was not detailed but approached in [[/contrib/enlightenment-debug.md|Enlightenment Debugging]] section. In -this section, it is more convenience to use ssh for debugging enlightenment +this section, it is more convenient to use ssh for debugging enlightenment because X is not available. The version of SSH that you will want to use on Linux is called OpenSSH. @@ -156,7 +156,7 @@ $ Program received signal SIGSEGV, Segmentation fault. $ 0x00400b71 in ?? () -You can now use ''gdb'' as it is explaines in [[apps_efl_debugging#Segfault in +You can now use ''gdb'' as it is explained in [[apps_efl_debugging#Segfault in callback function]], for example print the backtrace: --
[EGIT] [core/efl] master 02/02: mono: make public static field const or readonly
lauromoura pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=ee33f93743b41c82543f8857e72e38e60a5cd67f commit ee33f93743b41c82543f8857e72e38e60a5cd67f Author: Yeongjong Lee Date: Wed Oct 16 10:39:52 2019 -0300 mono: make public static field const or readonly Summary: This patch will fix CA2211 compiler warnings. Test Plan: meson setup -Dbindings=mono,cxx -Dmono-beta=true Reviewers: lauromoura, Jaehyun_Cho Reviewed By: lauromoura Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D10423 --- .../eolian_mono/eolian/mono/function_definition.hh | 2 +- src/bindings/mono/efl_mono/efl_libs.cs.in | 24 +++--- src/bindings/mono/eina_mono/eina_array.cs | 2 +- src/bindings/mono/eina_mono/eina_error.cs | 10 - src/bindings/mono/eina_mono/eina_inarray.cs| 2 +- src/bindings/mono/eina_mono/eina_log.cs| 24 +++--- src/bindings/mono/eina_mono/eina_value.cs | 2 +- src/bindings/mono/eldbus_mono/eldbus_common.cs | 2 +- src/bindings/mono/eo_mono/iwrapper.cs | 8 9 files changed, 38 insertions(+), 38 deletions(-) diff --git a/src/bin/eolian_mono/eolian/mono/function_definition.hh b/src/bin/eolian_mono/eolian/mono/function_definition.hh index 301f5417f3..d17ac564ea 100644 --- a/src/bin/eolian_mono/eolian/mono/function_definition.hh +++ b/src/bin/eolian_mono/eolian/mono/function_definition.hh @@ -76,7 +76,7 @@ struct native_function_definition_generator // Delegate holder (so it can't be collected). if(!as_generator - (indent << "public static Efl.Eo.FunctionWrapper<" << string << "_api_delegate> " << string << "_ptr = new Efl.Eo.FunctionWrapper<" + (indent << "public static readonly Efl.Eo.FunctionWrapper<" << string << "_api_delegate> " << string << "_ptr = new Efl.Eo.FunctionWrapper<" << string << "_api_delegate>(Module, \"" << string << "\");\n\n") .generate(sink, std::make_tuple(f.c_name, f.c_name, f.c_name, f.c_name), context)) return false; diff --git a/src/bindings/mono/efl_mono/efl_libs.cs.in b/src/bindings/mono/efl_mono/efl_libs.cs.in index 0aa56908ff..87aee83a1e 100644 --- a/src/bindings/mono/efl_mono/efl_libs.cs.in +++ b/src/bindings/mono/efl_mono/efl_libs.cs.in @@ -21,18 +21,18 @@ public class Libs { public const string Libdl = "libdl.so"; public const string Kernel32 = "kernel32.dll"; -public static Efl.Eo.NativeModule EflModule = new Efl.Eo.NativeModule(Efl); -public static Efl.Eo.NativeModule CoreModule = new Efl.Eo.NativeModule(Ecore); -public static Efl.Eo.NativeModule EinaModule = new Efl.Eo.NativeModule(Eina); -public static Efl.Eo.NativeModule EoModule = new Efl.Eo.NativeModule(Eo); -public static Efl.Eo.NativeModule EvasModule = new Efl.Eo.NativeModule(Evas); -public static Efl.Eo.NativeModule EvilModule = new Efl.Eo.NativeModule(Evil); -public static Efl.Eo.NativeModule EdjeModule = new Efl.Eo.NativeModule(Edje); -public static Efl.Eo.NativeModule ElementaryModule = new Efl.Eo.NativeModule(Elementary); -public static Efl.Eo.NativeModule EldbusModule = new Efl.Eo.NativeModule(Eldbus); -public static Efl.Eo.NativeModule CustomExportsModule = new Efl.Eo.NativeModule(CustomExports); -public static Efl.Eo.NativeModule LibdlModule = new Efl.Eo.NativeModule(Libdl); -public static Efl.Eo.NativeModule Kernel32Module = new Efl.Eo.NativeModule(Kernel32); +public static readonly Efl.Eo.NativeModule EflModule = new Efl.Eo.NativeModule(Efl); +public static readonly Efl.Eo.NativeModule CoreModule = new Efl.Eo.NativeModule(Ecore); +public static readonly Efl.Eo.NativeModule EinaModule = new Efl.Eo.NativeModule(Eina); +public static readonly Efl.Eo.NativeModule EoModule = new Efl.Eo.NativeModule(Eo); +public static readonly Efl.Eo.NativeModule EvasModule = new Efl.Eo.NativeModule(Evas); +public static readonly Efl.Eo.NativeModule EvilModule = new Efl.Eo.NativeModule(Evil); +public static readonly Efl.Eo.NativeModule EdjeModule = new Efl.Eo.NativeModule(Edje); +public static readonly Efl.Eo.NativeModule ElementaryModule = new Efl.Eo.NativeModule(Elementary); +public static readonly Efl.Eo.NativeModule EldbusModule = new Efl.Eo.NativeModule(Eldbus); +public static readonly Efl.Eo.NativeModule CustomExportsModule = new Efl.Eo.NativeModule(CustomExports); +public static readonly Efl.Eo.NativeModule LibdlModule = new Efl.Eo.NativeModule(Libdl); +public static readonly Efl.Eo.NativeModule Kernel32Module = new Efl.Eo.NativeModule(Kernel32); } } diff --git a/src/bindings/mono/eina_mono/eina_array.cs b/src/bindings/mono/eina_mono/eina_array.cs index 617664b34e..17a3ee2e34 100644 --- a/src/bindings/mono/eina_mono/eina_array.cs +++
[EGIT] [core/efl] master 01/02: csharp: rename Factory.cs to ItemFactory.cs
lauromoura pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=50d318ab13a68ede5934eb4e1799be62dcb4 commit 50d318ab13a68ede5934eb4e1799be62dcb4 Author: Jaehyun Cho Date: Wed Oct 16 10:31:22 2019 -0300 csharp: rename Factory.cs to ItemFactory.cs Summary: Since current Factory.cs contains class ItemFactory, Factory.cs is renamed to ItemFactory.cs. Reviewers: lauromoura, YOhoho, SanghyeonLee Reviewed By: lauromoura Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D10424 --- src/bindings/mono/efl_mono/{Factory.cs => ItemFactory.cs} | 0 src/bindings/mono/efl_mono/meson.build| 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bindings/mono/efl_mono/Factory.cs b/src/bindings/mono/efl_mono/ItemFactory.cs similarity index 100% rename from src/bindings/mono/efl_mono/Factory.cs rename to src/bindings/mono/efl_mono/ItemFactory.cs diff --git a/src/bindings/mono/efl_mono/meson.build b/src/bindings/mono/efl_mono/meson.build index fb2b2c0431..cfe53ee153 100644 --- a/src/bindings/mono/efl_mono/meson.build +++ b/src/bindings/mono/efl_mono/meson.build @@ -3,7 +3,7 @@ mono_files += files( 'efl_csharp_application.cs', 'UserModel.cs', 'GenericModel.cs', - 'Factory.cs', + 'ItemFactory.cs', 'Bind.cs' ) --
[E-devel] Character '<' display issue when using edje_object_part_text_set
Hi all, I failed to display '<' by using edje_object_part_text_set(layout, "part_name", "<") . Text display is empty. Please help to advise how to fix this issue, thanks. ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/efl] master 01/01: efl_canvas_vg : Propagates the alpha color of the parent
jsuya pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=59419006b89cd304fa697627c968d6ea03482f60 commit 59419006b89cd304fa697627c968d6ea03482f60 Author: JunsuChoi Date: Wed Oct 16 15:12:13 2019 +0900 efl_canvas_vg : Propagates the alpha color of the parent Summary: The current color is affected by the parent's opacity. If p_opacity is set, it will be applied to the current color. Test Plan: N/A Reviewers: Hermet, smohanty, kimcinoo Reviewed By: Hermet Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D10399 --- src/lib/evas/canvas/efl_canvas_vg_container.c | 12 src/lib/evas/canvas/efl_canvas_vg_gradient_linear.c | 4 +++- src/lib/evas/canvas/efl_canvas_vg_gradient_radial.c | 4 +++- src/lib/evas/canvas/efl_canvas_vg_image.c | 10 -- src/lib/evas/canvas/efl_canvas_vg_object.c | 4 ++-- src/lib/evas/canvas/efl_canvas_vg_shape.c | 10 ++ src/lib/evas/canvas/evas_vg_private.h | 19 +-- 7 files changed, 43 insertions(+), 20 deletions(-) diff --git a/src/lib/evas/canvas/efl_canvas_vg_container.c b/src/lib/evas/canvas/efl_canvas_vg_container.c index f4bf4d7637..471ea3dd6c 100644 --- a/src/lib/evas/canvas/efl_canvas_vg_container.c +++ b/src/lib/evas/canvas/efl_canvas_vg_container.c @@ -54,6 +54,8 @@ _prepare_comp(Evas_Object_Protected_Data *obj, //vector object Ector_Surface *surface, Eina_Matrix3 *ptransform, Eina_Matrix3 *ctransform, + int p_opacity, + int c_opacity, Ector_Buffer *comp, Efl_Gfx_Vg_Composite_Method comp_method) { @@ -127,7 +129,7 @@ _prepare_comp(Evas_Object_Protected_Data *obj, //vector object src_pd = efl_data_scope_get(eina_list_nth(target_pd->comp.src, 0), MY_CLASS); _evas_vg_render_pre(obj, comp_target, engine, output, context, surface, - ctransform, comp, src_pd->comp.method); + ctransform, c_opacity, comp, src_pd->comp.method); } } @@ -135,7 +137,7 @@ _prepare_comp(Evas_Object_Protected_Data *obj, //vector object _evas_vg_render_pre(obj, comp_target, engine, output, context, surface, - ptransform, comp, comp_method); + ptransform, p_opacity, comp, comp_method); //4. Generating Composite Image. ector_buffer_pixels_set(surface, pd->comp.pixels, size.w, size.h, pd->comp.stride, @@ -153,6 +155,7 @@ _efl_canvas_vg_container_render_pre(Evas_Object_Protected_Data *vg_pd, void *engine, void *output, void *context, Ector_Surface *surface, Eina_Matrix3 *ptransform, +int p_opacity, Ector_Buffer *comp, Efl_Gfx_Vg_Composite_Method comp_method, void *data) @@ -168,6 +171,7 @@ _efl_canvas_vg_container_render_pre(Evas_Object_Protected_Data *vg_pd, nd->flags = EFL_GFX_CHANGE_FLAG_NONE; EFL_CANVAS_VG_COMPUTE_MATRIX(ctransform, ptransform, nd); + EFL_CANVAS_VG_COMPUTE_ALPHA(c_r, c_g, c_b, c_a, p_opacity, nd); //Container may have composite target. //FIXME : _prepare_comp() should only work in cases with matte or masking. @@ -179,7 +183,7 @@ _efl_canvas_vg_container_render_pre(Evas_Object_Protected_Data *vg_pd, comp_method = pd->comp.method; comp = _prepare_comp(vg_pd, pd->comp_target, engine, output, context, surface, - ptransform, ctransform, comp, comp_method); + ptransform, ctransform, p_opacity, c_a, comp, comp_method); } EINA_LIST_FOREACH(pd->children, l, child) @@ -204,7 +208,7 @@ _efl_canvas_vg_container_render_pre(Evas_Object_Protected_Data *vg_pd, _evas_vg_render_pre(vg_pd, child, engine, output, context, surface, -ctransform, comp, comp_method); +ctransform, c_a, comp, comp_method); } } diff --git a/src/lib/evas/canvas/efl_canvas_vg_gradient_linear.c b/src/lib/evas/canvas/efl_canvas_vg_gradient_linear.c index 1d4eb6a154..2781ce9d11 100644 --- a/src/lib/evas/canvas/efl_canvas_vg_gradient_linear.c +++ b/src/lib/evas/canvas/efl_canvas_vg_gradient_linear.c @@ -64,6 +64,7 @@ _efl_canvas_vg_gradient_linear_render_pre(Evas_Object_Protected_Data *vg_pd EINA void *context EINA_UNUSED,