[EGIT] [core/enlightenment] enlightenment-0.19 01/05: md5: fix wrong sizeof argument (SIZEOF_MISMATCH)

[Amitesh Singh]

discomfitor pushed a commit to branch enlightenment-0.19.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=f1c3a0a54042ddbfb2c482e97091aee3a8efc8d8

commit f1c3a0a54042ddbfb2c482e97091aee3a8efc8d8
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Thu Oct 1 16:20:23 2015 -0400

md5: fix wrong sizeof argument (SIZEOF_MISMATCH)

Summary: fixes CID: 222382

Reviewers: raster, zmike, cedric, devilhorns

Reviewed By: devilhorns

Subscribers: cedric, seoz, sachin.dev

Differential Revision: https://phab.enlightenment.org/D3125
---
 src/modules/everything/md5.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/everything/md5.c b/src/modules/everything/md5.c
index 3e5185c..fdc44cd 100644
--- a/src/modules/everything/md5.c
+++ b/src/modules/everything/md5.c
@@ -156,7 +156,7 @@ MD5Final(unsigned char digest[16], MD5_CTX *ctx)
MD5Transform(ctx->buf, (uint32_t *)ctx->in);
byteReverse((unsigned char *)ctx->buf, 4);
memcpy(digest, ctx->buf, 16);
-   memset((char *)ctx, 0, sizeof(ctx)); /* In case it's sensitive */
+   memset((char *)ctx, 0, sizeof(*ctx)); /* In case it's sensitive */
 }
 
 /* The four core functions - F1 is optimized somewhat */

-- 

[EGIT] [core/elementary] elementary-1.15 03/03: gengrid: rename function _elm_gengrid_item_focus_raise to _elm_gengrid_item_focus_update

[Amitesh Singh]

ami pushed a commit to branch elementary-1.15.

http://git.enlightenment.org/core/elementary.git/commit/?id=b47a332cd2599f84334c3408676ec704a9361029

commit b47a332cd2599f84334c3408676ec704a9361029
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Sep 23 12:45:56 2015 +0530

gengrid: rename function _elm_gengrid_item_focus_raise to 
_elm_gengrid_item_focus_update

In function _elm_gengrid_item_focus_raise, we are doing more than just 
focus_raise.
Rename it to something more meaningful.
---
 src/lib/elm_gengrid.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c
index 89d2b3a..70f4f3f 100644
--- a/src/lib/elm_gengrid.c
+++ b/src/lib/elm_gengrid.c
@@ -1286,7 +1286,7 @@ _access_widget_item_register(Elm_Gen_Item *it)
 }
 
 static void
-_elm_gengrid_item_focus_raise(Elm_Gen_Item *it)
+_elm_gengrid_item_focus_update(Elm_Gen_Item *it)
 {
const char *focus_raise;
Evas_Object *obj = WIDGET(it);
@@ -1402,7 +1402,7 @@ _item_realize(Elm_Gen_Item *it)
 
if (eo_it == sd->focused_item)
  {
-_elm_gengrid_item_focus_raise(it);
+_elm_gengrid_item_focus_update(it);
 _elm_widget_item_highlight_in_theme(WIDGET(it), EO_OBJ(it));
 _elm_widget_highlight_in_theme_update(WIDGET(it));
 _elm_widget_focus_highlight_start(WIDGET(it));
@@ -2023,7 +2023,7 @@ _elm_gengrid_item_focused(Elm_Object_Item *eo_it)
/* If item is not realized state, widget couldn't get focus_highlight data. 
*/
if (it->realized)
  {
-_elm_gengrid_item_focus_raise(it);
+_elm_gengrid_item_focus_update(it);
 _elm_widget_item_highlight_in_theme(obj, eo_it);
 _elm_widget_highlight_in_theme_update(obj);
 _elm_widget_focus_highlight_start(obj);

-- 

[EGIT] [core/elementary] elementary-1.15 01/03: gengrid: fix duplicate edje signal (elm, state, focused) to item on focus

[Amitesh Singh]

ami pushed a commit to branch elementary-1.15.

http://git.enlightenment.org/core/elementary.git/commit/?id=ae5489b059c1fac44d6ad397b04f54c80e132ac7

commit ae5489b059c1fac44d6ad397b04f54c80e132ac7
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Sep 23 12:20:05 2015 +0530

gengrid: fix duplicate edje signal (elm,state,focused) to item on focus

@fix
---
 src/lib/elm_gengrid.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c
index b519c25..ef8b040 100644
--- a/src/lib/elm_gengrid.c
+++ b/src/lib/elm_gengrid.c
@@ -2020,7 +2020,6 @@ _elm_gengrid_item_focused(Elm_Object_Item *eo_it)
 
sd->focused_item = eo_it;
 
-   if (it->realized) _elm_gengrid_item_focus_raise(it);
eo_do(obj, eo_event_callback_call(ELM_GENGRID_EVENT_ITEM_FOCUSED, eo_it));
if (_elm_config->atspi_mode)
  elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, 
ELM_ATSPI_STATE_FOCUSED, EINA_TRUE);

-- 

[EGIT] [core/elementary] elementary-1.15 02/03: gengrid: move item focus related code to internal _elm_gengrid_item_focused()

[Amitesh Singh]

ami pushed a commit to branch elementary-1.15.

http://git.enlightenment.org/core/elementary.git/commit/?id=3cd14dd129da96b8920addc5c9cee452bf4e0e29

commit 3cd14dd129da96b8920addc5c9cee452bf4e0e29
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Sep 23 12:36:15 2015 +0530

gengrid: move item focus related code to internal 
_elm_gengrid_item_focused()
---
 src/lib/elm_gengrid.c | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c
index ef8b040..89d2b3a 100644
--- a/src/lib/elm_gengrid.c
+++ b/src/lib/elm_gengrid.c
@@ -2020,6 +2020,15 @@ _elm_gengrid_item_focused(Elm_Object_Item *eo_it)
 
sd->focused_item = eo_it;
 
+   /* If item is not realized state, widget couldn't get focus_highlight data. 
*/
+   if (it->realized)
+ {
+_elm_gengrid_item_focus_raise(it);
+_elm_widget_item_highlight_in_theme(obj, eo_it);
+_elm_widget_highlight_in_theme_update(obj);
+_elm_widget_focus_highlight_start(obj);
+ }
+
eo_do(obj, eo_event_callback_call(ELM_GENGRID_EVENT_ITEM_FOCUSED, eo_it));
if (_elm_config->atspi_mode)
  elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, 
ELM_ATSPI_STATE_FOCUSED, EINA_TRUE);
@@ -3867,15 +3876,6 @@ _elm_gengrid_item_elm_widget_item_focus_set(Eo *eo_it, 
Elm_Gen_Item *it, Eina_Bo
  if (sd->focused_item)
_elm_gengrid_item_unfocused(sd->focused_item);
  _elm_gengrid_item_focused(eo_it);
-
- /* If item is not realized state, widget couldn't get 
focus_highlight data. */
- if (it->realized)
-   {
-  _elm_gengrid_item_focus_raise(it);
-  _elm_widget_item_highlight_in_theme(obj, eo_it);
-  _elm_widget_highlight_in_theme_update(obj);
-  _elm_widget_focus_highlight_start(obj);
-   }
   }
  }
else

-- 

[EGIT] [core/elementary] master 01/01: genlist: refractor item focus update code

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=284109bc7ea8d3a4051d8221287d28d0a6790122

commit 284109bc7ea8d3a4051d8221287d28d0a6790122
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Mon Sep 28 13:34:02 2015 +0530

genlist: refractor item focus update code

Add duplicate code into a new local function _elm_genlist_item_focus_update
---
 src/lib/elm_genlist.c | 59 +++
 1 file changed, 26 insertions(+), 33 deletions(-)

diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index 92e4705..a0d5cd7 100644
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -1689,6 +1689,30 @@ _access_widget_item_register(Elm_Gen_Item *it)
 }
 
 static void
+_elm_genlist_item_focus_update(Elm_Gen_Item *it)
+{
+   const char *focus_raise;
+   Evas_Object *obj = WIDGET(it);
+   ELM_GENLIST_DATA_GET(obj, sd);
+
+   if (elm_widget_focus_highlight_enabled_get(obj))
+ edje_object_signal_emit(VIEW(it), SIGNAL_FOCUSED, "elm");
+
+   focus_raise = edje_object_data_get(VIEW(it), "focusraise");
+   if ((focus_raise) && (!strcmp(focus_raise, "on")))
+ {
+Elm_Gen_Item *git;
+Eina_List *l;
+
+evas_object_raise(VIEW(it));
+EINA_LIST_FOREACH(sd->group_items, l, git)
+  {
+ if (git->realized) evas_object_raise(VIEW(git));
+  }
+ }
+}
+
+static void
 _item_realize(Elm_Gen_Item *it,
   int in,
   Eina_Bool calc)
@@ -1771,22 +1795,7 @@ _item_realize(Elm_Gen_Item *it,
 
 if (EO_OBJ(it) == sd->focused_item)
   {
- const char *focus_raise;
- if (elm_widget_focus_highlight_enabled_get(WIDGET(it)) || 
_elm_config->win_auto_focus_enable)
-   edje_object_signal_emit(VIEW(it), SIGNAL_FOCUSED, "elm");
-
- focus_raise = edje_object_data_get(VIEW(it), "focusraise");
- if ((focus_raise) && (!strcmp(focus_raise, "on")))
-   {
-  Elm_Gen_Item *git;
-  Eina_List *l;
-  evas_object_raise(VIEW(it));
-  EINA_LIST_FOREACH(sd->group_items, l, git)
-{
-   if (git->realized) evas_object_raise(VIEW(git));
-}
-   }
-
+ _elm_genlist_item_focus_update(it);
  _elm_widget_item_highlight_in_theme(WIDGET(it), EO_OBJ(it));
  _elm_widget_highlight_in_theme_update(WIDGET(it));
  _elm_widget_focus_highlight_start(WIDGET(it));
@@ -2617,7 +2626,6 @@ _elm_genlist_item_focused(Elm_Object_Item *eo_it)
ELM_GENLIST_ITEM_DATA_GET(eo_it, it);
Evas_Object *obj = WIDGET(it);
ELM_GENLIST_DATA_GET(obj, sd);
-   const char *focus_raise;
Eina_Bool tmp;
 
if (_is_no_select(it) ||
@@ -2642,22 +2650,7 @@ _elm_genlist_item_focused(Elm_Object_Item *eo_it)
sd->focused_item = eo_it;
 
if (it->realized)
- {
-if (elm_widget_focus_highlight_enabled_get(obj))
-  edje_object_signal_emit(VIEW(it), SIGNAL_FOCUSED, "elm");
-
-focus_raise = edje_object_data_get(VIEW(it), "focusraise");
-if ((focus_raise) && (!strcmp(focus_raise, "on")))
-  {
- Elm_Gen_Item *git;
- Eina_List *l;
- evas_object_raise(VIEW(it));
- EINA_LIST_FOREACH(sd->group_items, l, git)
-   {
-  if (git->realized) evas_object_raise(VIEW(git));
-   }
-  }
- }
+ _elm_genlist_item_focus_update(it);
eo_do(obj, eo_event_callback_call(ELM_GENLIST_EVENT_ITEM_FOCUSED, eo_it));
if (_elm_config->atspi_mode)
  elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, 
ELM_ATSPI_STATE_FOCUSED, EINA_TRUE);

-- 

[EGIT] [core/efl] master 01/01: edje: fix typos in documentation

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=139d452efeb846f7684f93e9bd7733969d8048b7

commit 139d452efeb846f7684f93e9bd7733969d8048b7
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Mon Sep 28 15:42:51 2015 +0530

edje: fix typos in documentation
---
 src/lib/edje/Edje_Common.h |  2 +-
 src/lib/edje/Edje_Edit.h   | 56 +++---
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/lib/edje/Edje_Common.h b/src/lib/edje/Edje_Common.h
index 468b163..8d03684 100644
--- a/src/lib/edje/Edje_Common.h
+++ b/src/lib/edje/Edje_Common.h
@@ -914,7 +914,7 @@ EAPI double   edje_scale_get  (void);
  *
  * In Edje it's possible to use a text part as a entry so the user is
  * able to make inputs of text. To do so, the text part must be set
- * with a input panel taht will work as a virtual keyboard.
+ * with a input panel that will work as a virtual keyboard.
  *
  * Some of effects can be applied to the entered text and also plenty
  * actions can be performed after any input.
diff --git a/src/lib/edje/Edje_Edit.h b/src/lib/edje/Edje_Edit.h
index 54f9cdc..8f7ad5f 100644
--- a/src/lib/edje/Edje_Edit.h
+++ b/src/lib/edje/Edje_Edit.h
@@ -277,7 +277,7 @@ EAPI Eina_Bool edje_edit_clean_save_as(Evas_Object *obj, 
const char* new_file_na
  * because this function DOES NOT generate source code for groups.
  *
  * @note With using this function all source code will be erased. And DOES NOT
- * generated new code. In attempt to decompile edj file, wich was saved with
+ * generated new code. In attempt to decompile edj file, which was saved with
  * using this functions will unpacked only resources(like fonts, images, 
sounds).
  * If needed saving source code into file, please use  @see edje_edit_save() or
  * @see edje_edit_save_all().
@@ -368,7 +368,7 @@ EAPI Eina_Bool edje_edit_group_copy(Evas_Object *obj, const 
char *group_name, co
  * references the next time is loaded.
  * @see edje_edit_save_all(), edje_edit_without_source_save().
  *
- * @attention be carefull, if you deleting group, it will delete all it's 
aliases also,
+ * @attention be careful, if you deleting group, it will delete all it's 
aliases also,
  * if you deleting alias, then it will delete alias only.
  *
  */
@@ -1255,7 +1255,7 @@ EAPI const char * edje_edit_part_source_get(Evas_Object 
*obj, const char *part);
 /** Set the source of part.
  *
  * If setting source of the part will lead to recursive reference
- * (when A source to B, and B is going to be source to A because of this 
funciton),
+ * (when A source to B, and B is going to be source to A because of this 
function),
  * then it will return EINA_FALSE.
  *
  * @param obj Object being edited.
@@ -2603,7 +2603,7 @@ EAPI int edje_edit_part_item_spread_w_get(Evas_Object 
*obj, const char *part, co
 
 /** Set the spread width value of a part's item.
  *
- * @attention be carefull, if you set up huge number (like 10 or 100). width 
and height of
+ * @attention be careful, if you set up huge number (like 10 or 100). width 
and height of
  * spread is being multiplied and you will get huge number of objects that may 
"eat"
  * all of your processor performance at once... Or if you want, you may
  * get some coffee and wait until it will recalculate all of those objects :)
@@ -2620,7 +2620,7 @@ EAPI Eina_Bool 
edje_edit_part_item_spread_w_set(Evas_Object *obj, const char *pa
 
 /** Get the spread height value of a part's item.
  *
- * @attention be carefull, if you set up huge number (like 10 or 100). width 
and height of
+ * @attention be careful, if you set up huge number (like 10 or 100). width 
and height of
  * spread is being multiplied and you will get huge number of objects that may 
"eat"
  * all of your processor performance at once... Or if you want, you may
  * get some coffee and wait until it will recalculate all of those objects :)
@@ -2740,7 +2740,7 @@ EAPI double edje_edit_part_item_weight_x_get(Evas_Object 
*obj, const char *part,
  * @param item The name of the item to set horizontal weight value.
  * @param weight_x New value of the horizontal weight.
  *
- * @return @c EINA_TRUE If successfull, @c EINA_FALSE otherwise.
+ * @return @c EINA_TRUE If successful, @c EINA_FALSE otherwise.
  * @since 1.11
  */
 EAPI Eina_Bool edje_edit_part_item_weight_x_set(Evas_Object *obj, const char 
*part, const char *item, double weight_x);
@@ -2763,7 +2763,7 @@ EAPI double edje_edit_part_item_weight_y_get(Evas_Object 
*obj, const char *part,
  * @param item The name of the item to set vertical weight value.
  * @param weight_y New value of the vertical weight.
  *
- * @return @c EINA_TRUE If successfull, @c EINA_FALSE otherwise.
+ * @return @c EINA_TRUE If successful, @c EINA_FALSE otherwise.
  * @since 1.11
  */
 EAPI Eina_Bool edje_edit_part_item_weight_y_set(Evas_Object *obj, const char 
*part, const char *item, double weight_y);
@@ -2779,7

[EGIT] [core/elementary] master 01/01: fix typos in APIs doc

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=57248eb13c239174792ef8782c31206c442affc5

commit 57248eb13c239174792ef8782c31206c442affc5
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Mon Sep 28 15:06:21 2015 +0530

fix typos in APIs doc
---
 src/lib/elc_popup.h  | 2 +-
 src/lib/elm_calendar.h   | 2 +-
 src/lib/elm_config.h | 2 +-
 src/lib/elm_helper.h | 2 +-
 src/lib/elm_icon.h   | 2 +-
 src/lib/elm_interface_atspi_accessible.h | 2 +-
 src/lib/elm_map_common.h | 2 +-
 src/lib/elm_prefs.h  | 2 +-
 src/lib/elm_radio.h  | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/lib/elc_popup.h b/src/lib/elc_popup.h
index b58af5a..d672db2 100644
--- a/src/lib/elc_popup.h
+++ b/src/lib/elc_popup.h
@@ -78,7 +78,7 @@
  * @li @c "focused" - When the popup has received focus. (since 1.8)
  * @li @c "unfocused" - When the popup has lost focus. (since 1.8)
  * @li "language,changed" - the program's language changed (since 1.8)
- * @li "item,focused" - When the popup item has recieved focus. (since 1.10)
+ * @li "item,focused" - When the popup item has received focus. (since 1.10)
  * @li "item,unfocused" - When the popup item has lost focus. (since 1.10)
  *
  * Styles available for Popup
diff --git a/src/lib/elm_calendar.h b/src/lib/elm_calendar.h
index 4f1e00e..b1a334f 100644
--- a/src/lib/elm_calendar.h
+++ b/src/lib/elm_calendar.h
@@ -6,7 +6,7 @@
  * @image latex calendar_inheritance_tree.eps
  *
  * This is a calendar widget. It helps applications to flexibly
- * display a calender with day of the week, date, year and
+ * display a calendar with day of the week, date, year and
  * month. Applications are able to set specific dates to be reported
  * back, when selected, in the smart callbacks of the calendar
  * widget. The API of this widget lets the applications perform other
diff --git a/src/lib/elm_config.h b/src/lib/elm_config.h
index 8719d65..350fdd3 100644
--- a/src/lib/elm_config.h
+++ b/src/lib/elm_config.h
@@ -1013,7 +1013,7 @@ EAPI const char *elm_config_accel_preference_get(void);
  * Accepted values for depth are for instance "depth", "depth16", "depth24".
  * Accepted values for stencil are "stencil", "stencil1", "stencil8".
  * For MSAA, only predefined strings are accepted: "msaa", "msaa_low",
- * "msaa_mid" and "msaa_high". The selected configuration is not garanteed
+ * "msaa_mid" and "msaa_high". The selected configuration is not guaranteed
  * and is only valid in case of GL acceleration. Only the base acceleration
  * string will be saved (e.g. "gl" or "hw").
  *
diff --git a/src/lib/elm_helper.h b/src/lib/elm_helper.h
index adfbb40..ec92500 100644
--- a/src/lib/elm_helper.h
+++ b/src/lib/elm_helper.h
@@ -41,7 +41,7 @@ typedef enum
  * General designed for validate inputed entry text.
  *
  * @param pattern The regex pattern
- * @param signal The part of signal name, which will be emited to style
+ * @param signal The part of signal name, which will be emitted to style
  * @return The regex validator
  *
  * @see elm_validator_regexp_del()
diff --git a/src/lib/elm_icon.h b/src/lib/elm_icon.h
index 67ed57b..3420fbd 100644
--- a/src/lib/elm_icon.h
+++ b/src/lib/elm_icon.h
@@ -134,7 +134,7 @@
  * @li elm_object_signal_emit()
  * @li elm_object_signal_callback_add()
  * @li elm_object_signal_callback_del()
- * for emmiting and listening to signals on the object, when the
+ * for emitting and listening to signals on the object, when the
  * internal image comes from an Edje object. This behavior was added
  * unintentionally, though, and is @b deprecated. Expect it to be
  * dropped on future releases.
diff --git a/src/lib/elm_interface_atspi_accessible.h 
b/src/lib/elm_interface_atspi_accessible.h
index acd152e..7ce9d80 100644
--- a/src/lib/elm_interface_atspi_accessible.h
+++ b/src/lib/elm_interface_atspi_accessible.h
@@ -140,7 +140,7 @@ typedef enum _Elm_Atspi_Role Elm_Atspi_Role;
 
 /**
  * @enum _Elm_Atspi_State_Type
- * Describes a possible states of an object visibile to AT-SPI clients.
+ * Describes a possible states of an object visible to AT-SPI clients.
  */
 enum _Elm_Atspi_State_Type
 {
diff --git a/src/lib/elm_map_common.h b/src/lib/elm_map_common.h
index 41d98c5..8e08526 100644
--- a/src/lib/elm_map_common.h
+++ b/src/lib/elm_map_common.h
@@ -527,7 +527,7 @@ EAPI int   
elm_map_overlay_class_zoom_max_get(const Elm_Map_Over
  *
  * @return The list of group overlay members.
  *
- * The group overlays are virtualy overlays. Those are shown and hidden 
dynamically.
+ * The group overlays are virtually overlays. Those are shown and hid

[EGIT] [core/elementary] master 01/01: fix typo in elm_map_overlay_group_members_get API doc

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=8f3760ec1c34b3fc24d3a78962715c066dd8837c

commit 8f3760ec1c34b3fc24d3a78962715c066dd8837c
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Mon Sep 28 15:21:07 2015 +0530

fix typo in elm_map_overlay_group_members_get API doc
---
 src/lib/elm_map_common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/elm_map_common.h b/src/lib/elm_map_common.h
index 8e08526..5de92eb 100644
--- a/src/lib/elm_map_common.h
+++ b/src/lib/elm_map_common.h
@@ -527,7 +527,7 @@ EAPI int   
elm_map_overlay_class_zoom_max_get(const Elm_Map_Over
  *
  * @return The list of group overlay members.
  *
- * The group overlays are virtually overlays. Those are shown and hidden 
dynamically.
+ * The group overlays are virtual overlays. Those are shown and hidden 
dynamically.
  * You can add callback to the class overlay. If one of the group overlays in 
this class
  * is clicked, callback will be called and return a virtual group overlays.
  *

-- 

[EGIT] [core/efl] master 01/01: edje_edit: fix typo in error message

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=27f313c2fe66d4ef4438739fdd9fee8e29760113

commit 27f313c2fe66d4ef4438739fdd9fee8e29760113
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Mon Sep 28 15:45:44 2015 +0530

edje_edit: fix typo in error message
---
 src/lib/edje/edje_edit.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c
index 601c4ba..4cedfee 100644
--- a/src/lib/edje/edje_edit.c
+++ b/src/lib/edje/edje_edit.c
@@ -12568,7 +12568,7 @@ edje_edit_clean_save_as(Evas_Object *obj, const char 
*new_file_name)
 
if (ecore_file_exists(new_file_name))
  {
-ERR("Error. file \"%s\" allready exists",
+ERR("Error. file \"%s\" already exists",
 new_file_name);
 return EINA_FALSE;
  }

-- 

[EGIT] [core/efl] master 01/01: ecore: fix typos in documentation

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=5f74afe4f79f660022cae07f6d113b07bfaa23a7

commit 5f74afe4f79f660022cae07f6d113b07bfaa23a7
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Mon Sep 28 15:49:11 2015 +0530

ecore: fix typos in documentation
---
 src/lib/ecore/Ecore_Common.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lib/ecore/Ecore_Common.h b/src/lib/ecore/Ecore_Common.h
index 07bd187..cc514bb 100644
--- a/src/lib/ecore/Ecore_Common.h
+++ b/src/lib/ecore/Ecore_Common.h
@@ -953,7 +953,7 @@ typedef enum _Ecore_Exe_Flags Ecore_Exe_Flags;
 
 /**
  * @enum _Ecore_Exe_Win32_Priority
- * Defines the priority of the proccess.
+ * Defines the priority of the process.
  */
 enum _Ecore_Exe_Win32_Priority
 {
@@ -1053,7 +1053,7 @@ EAPI void ecore_exe_run_priority_set(int pri);
 /**
  * Gets the priority at which to launch processes
  *
- * This gets ths priority of launched processes. See
+ * This gets the priority of launched processes. See
  * ecore_exe_run_priority_set() for details. This just returns the value set
  * by this call.
  *
@@ -2481,7 +2481,7 @@ EAPI void ecore_app_args_set(int argc, const char **argv);
  * @param argc A pointer to the return value to hold argc
  * @param argv A pointer to the return value to hold argv
  *
- * When called, this funciton returns the arguments for the program stored by
+ * When called, this function returns the arguments for the program stored by
  * ecore_app_args_set(). The integer pointed to by @p argc will be filled, if
  * the pointer is not NULL, and the string array pointer @p argv will be filled
  * also if the pointer is not NULL. The values they are filled with will be the

-- 

[EGIT] [core/elementary] master 01/01: test_genlist: fix compilation warnings

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=88270e93d8c565211143aeaa700d76f935c3a567

commit 88270e93d8c565211143aeaa700d76f935c3a567
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Sep 23 22:21:39 2015 +0530

test_genlist: fix compilation warnings
---
 src/bin/test_genlist.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/bin/test_genlist.c b/src/bin/test_genlist.c
index cc3958f..0ecd43b 100644
--- a/src/bin/test_genlist.c
+++ b/src/bin/test_genlist.c
@@ -4867,7 +4867,9 @@ gl_filter_get(void *data, Evas_Object *obj EINA_UNUSED, 
void *key)
 }
 
 static void
-_gl_filter_finished_cb(void *data, Evas_Object *obj EINA_UNUSED, void 
*event_info)
+_gl_filter_finished_cb(void *data EINA_UNUSED,
+   Evas_Object *obj EINA_UNUSED,
+   void *event_info EINA_UNUSED)
 {
printf("Filter finished\n");
 }

-- 

[EGIT] [core/elementary] master 01/01: gengrid: move item focus related code to internal _elm_gengrid_item_focused()

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=138ee71589bb610cd4d6f4eb5f40619fc9e8fcdf

commit 138ee71589bb610cd4d6f4eb5f40619fc9e8fcdf
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Sep 23 12:36:15 2015 +0530

gengrid: move item focus related code to internal 
_elm_gengrid_item_focused()
---
 src/lib/elm_gengrid.c | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c
index 50d901c..d9cf9b3 100644
--- a/src/lib/elm_gengrid.c
+++ b/src/lib/elm_gengrid.c
@@ -2020,6 +2020,15 @@ _elm_gengrid_item_focused(Elm_Object_Item *eo_it)
 
sd->focused_item = eo_it;
 
+   /* If item is not realized state, widget couldn't get focus_highlight data. 
*/
+   if (it->realized)
+ {
+_elm_gengrid_item_focus_raise(it);
+_elm_widget_item_highlight_in_theme(obj, eo_it);
+_elm_widget_highlight_in_theme_update(obj);
+_elm_widget_focus_highlight_start(obj);
+ }
+
eo_do(obj, eo_event_callback_call(ELM_GENGRID_EVENT_ITEM_FOCUSED, eo_it));
if (_elm_config->atspi_mode)
  elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, 
ELM_ATSPI_STATE_FOCUSED, EINA_TRUE);
@@ -4012,15 +4021,6 @@ _elm_gengrid_item_elm_widget_item_focus_set(Eo *eo_it, 
Elm_Gen_Item *it, Eina_Bo
  if (sd->focused_item)
_elm_gengrid_item_unfocused(sd->focused_item);
  _elm_gengrid_item_focused(eo_it);
-
- /* If item is not realized state, widget couldn't get 
focus_highlight data. */
- if (it->realized)
-   {
-  _elm_gengrid_item_focus_raise(it);
-  _elm_widget_item_highlight_in_theme(obj, eo_it);
-  _elm_widget_highlight_in_theme_update(obj);
-  _elm_widget_focus_highlight_start(obj);
-   }
   }
  }
else

-- 

[EGIT] [core/elementary] master 01/01: gengrid: rename function _elm_gengrid_item_focus_raise to _elm_gengrid_item_focus_update

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=5c45fb0a054b8884330f23a7f9d37d05b1e9b157

commit 5c45fb0a054b8884330f23a7f9d37d05b1e9b157
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Sep 23 12:45:56 2015 +0530

gengrid: rename function _elm_gengrid_item_focus_raise to 
_elm_gengrid_item_focus_update

In function _elm_gengrid_item_focus_raise, we are doing more than just 
focus_raise.
Rename it to something more meaningful.
---
 src/lib/elm_gengrid.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c
index d9cf9b3..d5983e4 100644
--- a/src/lib/elm_gengrid.c
+++ b/src/lib/elm_gengrid.c
@@ -1286,7 +1286,7 @@ _access_widget_item_register(Elm_Gen_Item *it)
 }
 
 static void
-_elm_gengrid_item_focus_raise(Elm_Gen_Item *it)
+_elm_gengrid_item_focus_update(Elm_Gen_Item *it)
 {
const char *focus_raise;
Evas_Object *obj = WIDGET(it);
@@ -1402,7 +1402,7 @@ _item_realize(Elm_Gen_Item *it)
 
if (eo_it == sd->focused_item)
  {
-_elm_gengrid_item_focus_raise(it);
+_elm_gengrid_item_focus_update(it);
 _elm_widget_item_highlight_in_theme(WIDGET(it), EO_OBJ(it));
 _elm_widget_highlight_in_theme_update(WIDGET(it));
 _elm_widget_focus_highlight_start(WIDGET(it));
@@ -2023,7 +2023,7 @@ _elm_gengrid_item_focused(Elm_Object_Item *eo_it)
/* If item is not realized state, widget couldn't get focus_highlight data. 
*/
if (it->realized)
  {
-_elm_gengrid_item_focus_raise(it);
+_elm_gengrid_item_focus_update(it);
 _elm_widget_item_highlight_in_theme(obj, eo_it);
 _elm_widget_highlight_in_theme_update(obj);
 _elm_widget_focus_highlight_start(obj);

-- 

[EGIT] [core/elementary] master 01/01: gengrid: fix duplicate edje signal (elm, state, focused) to item on focus

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=544d2a078ddd59a750aa28fff7768dc31d006cfe

commit 544d2a078ddd59a750aa28fff7768dc31d006cfe
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Sep 23 12:20:05 2015 +0530

gengrid: fix duplicate edje signal (elm,state,focused) to item on focus

@fix
---
 src/lib/elm_gengrid.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c
index c55fd3f..50d901c 100644
--- a/src/lib/elm_gengrid.c
+++ b/src/lib/elm_gengrid.c
@@ -2020,7 +2020,6 @@ _elm_gengrid_item_focused(Elm_Object_Item *eo_it)
 
sd->focused_item = eo_it;
 
-   if (it->realized) _elm_gengrid_item_focus_raise(it);
eo_do(obj, eo_event_callback_call(ELM_GENGRID_EVENT_ITEM_FOCUSED, eo_it));
if (_elm_config->atspi_mode)
  elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, 
ELM_ATSPI_STATE_FOCUSED, EINA_TRUE);

-- 

[EGIT] [core/elementary] master 01/01: fix typos in APIs doc

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=5db028a32de71ce167851e75b221499593d7cd89

commit 5db028a32de71ce167851e75b221499593d7cd89
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Sat Sep 19 09:13:09 2015 +0530

fix typos in APIs doc
---
 src/lib/elm_app_server.eo  | 2 +-
 src/lib/elm_widget_item.eo | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lib/elm_app_server.eo b/src/lib/elm_app_server.eo
index 4cd82ea..fe82edc 100644
--- a/src/lib/elm_app_server.eo
+++ b/src/lib/elm_app_server.eo
@@ -53,7 +53,7 @@ class Elm_App_Server (Eo.Base)
  legacy: null;
  params {
 @in packageid: const(char)*; [[package of application]]
-@in create_view_cb: Elm_App_Server_Create_View_Cb; [[callback to 
be called when user whants to open some application view]]
+@in create_view_cb: Elm_App_Server_Create_View_Cb; [[callback to 
be called when user wants to open some application view]]
  }
   }
   close_all {
diff --git a/src/lib/elm_widget_item.eo b/src/lib/elm_widget_item.eo
index 1f61b96..48f4e44 100644
--- a/src/lib/elm_widget_item.eo
+++ b/src/lib/elm_widget_item.eo
@@ -385,7 +385,7 @@ class Elm.Widget_Item(Eo.Base, 
Elm_Interface_Atspi_Accessible,
 [[This returns track object of the item.
 
   Note: This gets a rectangle object that represents the 
object item's internal
-  object. If you wanna check the geometry, visibility of the 
item, you
+  object. If you want to check the geometry, visibility of the 
item, you
   can call the evas apis such as evas_object_geometry_get(),
   evas_object_visible_get() to the track object. Note that all 
of the
   widget items may/may not have the internal object so this 
api may
@@ -424,7 +424,7 @@ class Elm.Widget_Item(Eo.Base, 
Elm_Interface_Atspi_Accessible,
 
   Note: This gets the reference count for the track object. 
Whenever you call
   the @.track, the reference count will be increased by
-  one. Likely the referece count will be decreased again when 
you call
+  one. Likely the reference count will be decreased again when 
you call
   the @.untrack. Unless the reference count reaches to
   zero, the track object won't be deleted. So please be sure 
to call
   @.untrack() paired to the elm_object_item_track call

-- 

[EGIT] [core/efl] master 01/01: fix typos in API doc

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=86993e172a0c8407aa2d2381fc5cf08d32eaa5bd

commit 86993e172a0c8407aa2d2381fc5cf08d32eaa5bd
Author: Amitesh Singh <singh.amit...@gmail.com>
Date:   Sat Sep 19 09:24:58 2015 +0530

fix typos in API doc
---
 src/lib/edje/edje_object.eo| 2 +-
 src/lib/efl/interfaces/efl_file.eo | 4 ++--
 src/lib/efl/interfaces/efl_gfx_shape.eo| 2 +-
 src/lib/eo/eo_base.eo  | 4 ++--
 src/lib/evas/canvas/evas_canvas3d_material.eo  | 2 +-
 src/lib/evas/canvas/evas_canvas3d_mesh.eo  | 2 +-
 src/lib/evas/canvas/evas_canvas3d_primitive.eo | 8 
 src/lib/evas/canvas/evas_textgrid.eo   | 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/lib/edje/edje_object.eo b/src/lib/edje/edje_object.eo
index 2641ea8..31e4aff 100644
--- a/src/lib/edje/edje_object.eo
+++ b/src/lib/edje/edje_object.eo
@@ -1259,7 +1259,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
   part_text_unescaped_set {
  [[Sets the raw (non escaped) text for an object part.
 
-   This funciton will not do escape for you if it is a TEXTBLOCK part, 
that is,
+   This function will not do escape for you if it is a TEXTBLOCK part, 
that is,
if text contain tags, these tags will not be interpreted/parsed by 
TEXTBLOCK.
 
See also @.part_text_unescaped_get().]]
diff --git a/src/lib/efl/interfaces/efl_file.eo 
b/src/lib/efl/interfaces/efl_file.eo
index bac1722..517c5d6 100644
--- a/src/lib/efl/interfaces/efl_file.eo
+++ b/src/lib/efl/interfaces/efl_file.eo
@@ -127,11 +127,11 @@ interface Efl.File {
  [[Block and wait until all asynchronous operations are completed. 
Unless
the async flag was set on this object, this method has no effect.]]
 
- return: bool;[[$false if an error occured, else $true]]
+ return: bool;[[$false if an error occurred, else $true]]
   }
}
events {
   async,opened; [[The file was successfully opened asynchronously]]
-  async,error; [[Error occured in asynchronous file operation]]
+  async,error; [[Error occurred in asynchronous file operation]]
}
 }
diff --git a/src/lib/efl/interfaces/efl_gfx_shape.eo 
b/src/lib/efl/interfaces/efl_gfx_shape.eo
index d8a926c..959b413 100644
--- a/src/lib/efl/interfaces/efl_gfx_shape.eo
+++ b/src/lib/efl/interfaces/efl_gfx_shape.eo
@@ -107,7 +107,7 @@ mixin Efl.Gfx.Shape
  set {
 [[Sets the join style to be used for stroking the path.
   The join style will be used for joining the two line segment
-  while stroking teh path.
+  while stroking the path.
 
   See also \@ref Efl_Gfx_Join.
 
diff --git a/src/lib/eo/eo_base.eo b/src/lib/eo/eo_base.eo
index d0b919c..73223e6 100644
--- a/src/lib/eo/eo_base.eo
+++ b/src/lib/eo/eo_base.eo
@@ -258,7 +258,7 @@ abstract Eo.Base ()
params {
 @in comp_obj: Eo.Base *; [[the object that will be used to 
composite the parent.]]
}
-   return: bool; [[$true if successfull. $false otherwise.]]
+   return: bool; [[$true if successful. $false otherwise.]]
   }
   composite_detach @beta {
[[Detach a composite object from another object.
@@ -270,7 +270,7 @@ abstract Eo.Base ()
params {
 @in comp_obj: Eo.Base *; [[the object that will be removed 
from the parent.]]
}
-   return: bool; [[$true if successfull. $false otherwise.]]
+   return: bool; [[$true if successful. $false otherwise.]]
   }
   composite_part_is @beta {
[[Check if an object is part of a composite object.
diff --git a/src/lib/evas/canvas/evas_canvas3d_material.eo 
b/src/lib/evas/canvas/evas_canvas3d_material.eo
index 839da7e..9d072c0 100644
--- a/src/lib/evas/canvas/evas_canvas3d_material.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_material.eo
@@ -7,7 +7,7 @@ class Evas.Canvas3D.Material (Evas.Canvas3D.Object, 
Evas.Common_Interface)
  [[Set the material attribute color of the given material.
 
Material color is used also when texture map is enabled. The colors
-   will be modulated (multiplied). To controll the color contribution
+   will be modulated (multiplied). To control the color contribution
of a material attribute, use gray color. Setting color value for
normal attribute has no effect.
 
diff --git a/src/lib/evas/canvas/evas_canvas3d_mesh.eo 
b/src/lib/evas/canvas/evas_canvas3d_mesh.eo
index 0196736..d0faf59 100644
--- a/src/lib/evas/canvas/evas_canvas3d_mesh.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_mesh.eo
@@ -105,7 +105,7 @@ class Evas.Canvas3D.Mesh (Evas.Canvas3D.Object, 
Evas.Common_Interface, Efl.File)
buffer.
 
This function allocates internal index buffer any copy data from
-   the

[EGIT] [core/efl] master 01/01: edje: fix edje RTL description in case of custom state of a part

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=59681c331139e4d5424e77ff1614dc47fa8ddd8e

commit 59681c331139e4d5424e77ff1614dc47fa8ddd8e
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Thu Dec 3 11:26:10 2015 +0530

edje: fix edje RTL description in case of custom state of a part

Summary:
In case of RTL, the "custom" state properties does not apply. It happened 
because we don't copy the latest src to
dst in set_state(PART:.., "custom", 0.0); in case of dst is already 
populated.
We should copy the updated src to dst whenever we set the new custom 
description.

@fix

Reviewers: cedric, raster, jpeg, zmike, jaehwan

Subscribers: kimcinoo, seoz, jpeg

Differential Revision: https://phab.enlightenment.org/D3394
---
 src/lib/edje/edje_calc.c | 50 ++--
 1 file changed, 48 insertions(+), 2 deletions(-)

diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index 763c67b..3eae7e0 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -271,6 +271,52 @@ _edje_part_make_rtl(Edje_Part_Description_Common *desc)
desc->rel2.id_x = i;
 }
 
+static Edje_Part_Description_Common *
+_edje_get_custom_description_by_orientation(Edje *ed, 
Edje_Part_Description_Common *src, Edje_Part_Description_Common **dst, unsigned 
char type)
+{
+   Edje_Part_Description_Common *ret;
+   size_t memsize = 0;
+
+   if (!(*dst))
+ {
+ret = _edje_get_description_by_orientation(ed, src, dst, type);
+return ret;
+ }
+
+#define POPULATE_MEMSIZE_RTL(Short, Type)\
+case EDJE_PART_TYPE_##Short:  \
+{ \
+   memsize = sizeof(Edje_Part_Description_##Type);\
+   break; \
+}
+
+   switch (type)
+ {
+POPULATE_MEMSIZE_RTL(RECTANGLE, Common);
+POPULATE_MEMSIZE_RTL(SNAPSHOT, Snapshot);
+POPULATE_MEMSIZE_RTL(SWALLOW, Common);
+POPULATE_MEMSIZE_RTL(GROUP, Common);
+POPULATE_MEMSIZE_RTL(SPACER, Common);
+POPULATE_MEMSIZE_RTL(TEXT, Text);
+POPULATE_MEMSIZE_RTL(TEXTBLOCK, Text);
+POPULATE_MEMSIZE_RTL(IMAGE, Image);
+POPULATE_MEMSIZE_RTL(PROXY, Proxy);
+POPULATE_MEMSIZE_RTL(BOX, Box);
+POPULATE_MEMSIZE_RTL(TABLE, Table);
+POPULATE_MEMSIZE_RTL(EXTERNAL, External);
+POPULATE_MEMSIZE_RTL(CAMERA, Camera);
+POPULATE_MEMSIZE_RTL(LIGHT, Light);
+POPULATE_MEMSIZE_RTL(MESH_NODE, Mesh_Node);
+ }
+#undef POPULATE_MEMSIZE_RTL
+
+   ret = *dst;
+   memcpy(ret, src, memsize);
+   _edje_part_make_rtl(ret);
+
+   return ret;
+}
+
 /**
  * Returns part description
  *
@@ -398,8 +444,8 @@ _edje_part_description_find(Edje *ed, Edje_Real_Part *rp, 
const char *state_name
 
if (!strcmp(state_name, "custom"))
  return rp->custom ?
-_edje_get_description_by_orientation(ed, rp->custom->description,
- >custom->description_rtl, 
ep->type) : NULL;
+_edje_get_custom_description_by_orientation(ed, 
rp->custom->description,
+   
>custom->description_rtl, ep->type) : NULL;
 
if (!strcmp(state_name, "default") && approximate)
  {

-- 

[EGIT] [core/efl] efl-1.16 01/01: edje: fix edje RTL description in case of custom state of a part

[Amitesh Singh]

ami pushed a commit to branch efl-1.16.

http://git.enlightenment.org/core/efl.git/commit/?id=54afdec666e279fcd8aa8f37d6c6b0195f64e55b

commit 54afdec666e279fcd8aa8f37d6c6b0195f64e55b
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Thu Dec 3 11:26:10 2015 +0530

edje: fix edje RTL description in case of custom state of a part

Summary:
In case of RTL, the "custom" state properties does not apply. It happened 
because we don't copy the latest src to
dst in set_state(PART:.., "custom", 0.0); in case of dst is already 
populated.
We should copy the updated src to dst whenever we set the new custom 
description.

@fix

Reviewers: cedric, raster, jpeg, zmike, jaehwan

Subscribers: kimcinoo, seoz, jpeg

Differential Revision: https://phab.enlightenment.org/D3394
---
 src/lib/edje/edje_calc.c | 50 ++--
 1 file changed, 48 insertions(+), 2 deletions(-)

diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index 763c67b..3eae7e0 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -271,6 +271,52 @@ _edje_part_make_rtl(Edje_Part_Description_Common *desc)
desc->rel2.id_x = i;
 }
 
+static Edje_Part_Description_Common *
+_edje_get_custom_description_by_orientation(Edje *ed, 
Edje_Part_Description_Common *src, Edje_Part_Description_Common **dst, unsigned 
char type)
+{
+   Edje_Part_Description_Common *ret;
+   size_t memsize = 0;
+
+   if (!(*dst))
+ {
+ret = _edje_get_description_by_orientation(ed, src, dst, type);
+return ret;
+ }
+
+#define POPULATE_MEMSIZE_RTL(Short, Type)\
+case EDJE_PART_TYPE_##Short:  \
+{ \
+   memsize = sizeof(Edje_Part_Description_##Type);\
+   break; \
+}
+
+   switch (type)
+ {
+POPULATE_MEMSIZE_RTL(RECTANGLE, Common);
+POPULATE_MEMSIZE_RTL(SNAPSHOT, Snapshot);
+POPULATE_MEMSIZE_RTL(SWALLOW, Common);
+POPULATE_MEMSIZE_RTL(GROUP, Common);
+POPULATE_MEMSIZE_RTL(SPACER, Common);
+POPULATE_MEMSIZE_RTL(TEXT, Text);
+POPULATE_MEMSIZE_RTL(TEXTBLOCK, Text);
+POPULATE_MEMSIZE_RTL(IMAGE, Image);
+POPULATE_MEMSIZE_RTL(PROXY, Proxy);
+POPULATE_MEMSIZE_RTL(BOX, Box);
+POPULATE_MEMSIZE_RTL(TABLE, Table);
+POPULATE_MEMSIZE_RTL(EXTERNAL, External);
+POPULATE_MEMSIZE_RTL(CAMERA, Camera);
+POPULATE_MEMSIZE_RTL(LIGHT, Light);
+POPULATE_MEMSIZE_RTL(MESH_NODE, Mesh_Node);
+ }
+#undef POPULATE_MEMSIZE_RTL
+
+   ret = *dst;
+   memcpy(ret, src, memsize);
+   _edje_part_make_rtl(ret);
+
+   return ret;
+}
+
 /**
  * Returns part description
  *
@@ -398,8 +444,8 @@ _edje_part_description_find(Edje *ed, Edje_Real_Part *rp, 
const char *state_name
 
if (!strcmp(state_name, "custom"))
  return rp->custom ?
-_edje_get_description_by_orientation(ed, rp->custom->description,
- >custom->description_rtl, 
ep->type) : NULL;
+_edje_get_custom_description_by_orientation(ed, 
rp->custom->description,
+   
>custom->description_rtl, ep->type) : NULL;
 
if (!strcmp(state_name, "default") && approximate)
  {

-- 

[EGIT] [core/efl] master 01/01: edje: calc - remove pointer comparison while finding part desc

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=c892a1cb714fed496cbf5568c4d43880b6fb67b2

commit c892a1cb714fed496cbf5568c4d43880b6fb67b2
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Dec 9 15:46:41 2015 +0530

edje: calc - remove pointer comparison while finding part desc

Only strcmp comparision is realiable.
@fix
---
 src/lib/edje/edje_calc.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index b0742cf..c06e3ac 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -460,8 +460,7 @@ _edje_part_description_find(Edje *ed, Edje_Real_Part *rp, 
const char *state_name
  {
 d = ep->other.desc[i];
 
-if (d->state.name && (d->state.name == state_name ||
-  !strcmp(d->state.name, state_name)))
+if (d->state.name && (!strcmp(d->state.name, state_name)))
   {
  if (!approximate)
{

-- 

[EGIT] [core/efl] master 01/01: edje: calc - add curly braces to avoid ambiguous 'if'

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=4cebfc526fb845ea1484763f190bd99786722232

commit 4cebfc526fb845ea1484763f190bd99786722232
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Dec 9 15:55:59 2015 +0530

edje: calc - add curly braces to avoid ambiguous 'if'

merge two if conditions into one also.
---
 src/lib/edje/edje_calc.c | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index c06e3ac..ff2146d 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -432,11 +432,12 @@ _edje_part_description_find(Edje *ed, Edje_Real_Part *rp, 
const char *state_name
unsigned int i;
 
/* RTL flag is set, return RTL description */
-   if (edje_object_mirrored_get(ed->obj))
- if (!ep->other.desc_rtl)
-   ep->other.desc_rtl = (Edje_Part_Description_Common **)
- calloc(ep->other.desc_count,
-sizeof (Edje_Part_Description_Common *));
+   if (edje_object_mirrored_get(ed->obj) && !ep->other.desc_rtl)
+ {
+ep->other.desc_rtl = (Edje_Part_Description_Common **)
+   calloc(ep->other.desc_count,
+  sizeof (Edje_Part_Description_Common *));
+ }
 
if (!strcmp(state_name, "default") && state_val == 0.0)
  return _edje_get_description_by_orientation(ed,

-- 

[EGIT] [core/efl] master 01/01: Revert "edje: calc - remove pointer comparison while finding part desc"

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=18b66a319211e47265094c9466eda4c816db38e5

commit 18b66a319211e47265094c9466eda4c816db38e5
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Dec 9 21:29:42 2015 +0530

Revert "edje: calc - remove pointer comparison while finding part desc"

This reverts commit c892a1cb714fed496cbf5568c4d43880b6fb67b2.
---
 src/lib/edje/edje_calc.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index ff2146d..0505580 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -461,7 +461,8 @@ _edje_part_description_find(Edje *ed, Edje_Real_Part *rp, 
const char *state_name
  {
 d = ep->other.desc[i];
 
-if (d->state.name && (!strcmp(d->state.name, state_name)))
+if (d->state.name && (d->state.name == state_name ||
+  !strcmp(d->state.name, state_name)))
   {
  if (!approximate)
{

-- 

[EGIT] [core/efl] master 01/01: evas_gl_shader: refractor shader/program compile check code.

[Amitesh Singh]

jpeg pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=cb227cb5fb2c5faba171e923df6c40e5d186c5ec

commit cb227cb5fb2c5faba171e923df6c40e5d186c5ec
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Dec 2 16:47:27 2015 +0900

evas_gl_shader: refractor shader/program compile check code.

Summary:
Call respective shader/program functions on shader/program target only.

Reviewers: cedric, raster, wonsik, spacegrapher, jpeg

Reviewed By: jpeg

Subscribers: alok25, sachin.dev, cedric, seoz

Differential Revision: https://phab.enlightenment.org/D3388
---
 .../evas/engines/gl_common/evas_gl_shader.c| 33 +-
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/src/modules/evas/engines/gl_common/evas_gl_shader.c 
b/src/modules/evas/engines/gl_common/evas_gl_shader.c
index 3b7986d..53f045b 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_shader.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_shader.c
@@ -66,32 +66,25 @@ static const char *_shader_flags[SHADER_FLAG_COUNT] = {
 static Eina_Bool compiler_released = EINA_FALSE;
 
 static void
-gl_compile_link_error(GLuint target, const char *action)
+gl_compile_link_error(GLuint target, const char *action, Eina_Bool is_shader)
 {
int loglen = 0, chars = 0;
char *logtxt;
 
-   /* Shader info log */
-   glGetShaderiv(target, GL_INFO_LOG_LENGTH, );
-   if (loglen > 0)
- {
-logtxt = calloc(loglen, sizeof(char));
-if (logtxt)
-  {
- glGetShaderInfoLog(target, loglen, , logtxt);
- ERR("Failed to %s: %s", action, logtxt);
- free(logtxt);
-  }
- }
+   if (is_shader)
+ /* Shader info log */
+ glGetShaderiv(target, GL_INFO_LOG_LENGTH, );
+   else
+ /* Program info log */
+ glGetProgramiv(target, GL_INFO_LOG_LENGTH, );
 
-   /* Program info log */
-   glGetProgramiv(target, GL_INFO_LOG_LENGTH, );
if (loglen > 0)
  {
 logtxt = calloc(loglen, sizeof(char));
 if (logtxt)
   {
- glGetProgramInfoLog(target, loglen, , logtxt);
+ if (is_shader) glGetShaderInfoLog(target, loglen, , logtxt);
+ else glGetProgramInfoLog(target, loglen, , logtxt);
  ERR("Failed to %s: %s", action, logtxt);
  free(logtxt);
   }
@@ -155,7 +148,7 @@ _evas_gl_common_shader_program_binary_load(Eet_File *ef, 
unsigned int flags)
glGetProgramiv(prg, GL_LINK_STATUS, );
if (!ok)
  {
-gl_compile_link_error(prg, "load a program object");
+gl_compile_link_error(prg, "load a program object", EINA_FALSE);
 ERR("Abort load of program (%s)", pname);
 glDeleteProgram(prg);
 glDeleteShader(vtx);
@@ -381,7 +374,7 @@ evas_gl_common_shader_compile(unsigned int flags, const 
char *vertex,
glGetShaderiv(vtx, GL_COMPILE_STATUS, );
if (!ok)
  {
-gl_compile_link_error(vtx, "compile vertex shader");
+gl_compile_link_error(vtx, "compile vertex shader", EINA_TRUE);
 ERR("Abort compile of vertex shader:\n%s", vertex);
 glDeleteShader(vtx);
 return NULL;
@@ -393,7 +386,7 @@ evas_gl_common_shader_compile(unsigned int flags, const 
char *vertex,
glGetShaderiv(frg, GL_COMPILE_STATUS, );
if (!ok)
  {
-gl_compile_link_error(frg, "compile fragment shader");
+gl_compile_link_error(frg, "compile fragment shader", EINA_TRUE);
 ERR("Abort compile of fragment shader:\n%s", fragment);
 glDeleteShader(vtx);
 glDeleteShader(frg);
@@ -423,7 +416,7 @@ evas_gl_common_shader_compile(unsigned int flags, const 
char *vertex,
glGetProgramiv(prg, GL_LINK_STATUS, );
if (!ok)
  {
-gl_compile_link_error(prg, "link fragment and vertex shaders");
+gl_compile_link_error(prg, "link fragment and vertex shaders", 
EINA_FALSE);
 ERR("Abort compile of shader (flags: %08x)", flags);
 glDeleteShader(vtx);
 glDeleteShader(frg);

-- 

[EGIT] [core/elementary] elementary-1.16 01/01: notify: fix hide animation

[Amitesh Singh]

ami pushed a commit to branch elementary-1.16.

http://git.enlightenment.org/core/elementary.git/commit/?id=112abbf507561363a70541d416310b287c138a74

commit 112abbf507561363a70541d416310b287c138a74
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Fri Nov 20 16:41:30 2015 +0530

notify: fix hide animation

This feature has been added long time ago but it never worked before.
I delayed the parent object hide call when hide signal is present
in theme.

Test:
1. elementary_test -to notify
2. Click Left and wait for timer to expire
3. Click Left and click "close" button on notify. Now hide animation
happens when notify hides.

@fix
---
 src/lib/elm_notify.c | 16 +++-
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/lib/elm_notify.c b/src/lib/elm_notify.c
index 3e78ad9..cec6104 100644
--- a/src/lib/elm_notify.c
+++ b/src/lib/elm_notify.c
@@ -247,7 +247,6 @@ _elm_notify_evas_object_smart_move(Eo *obj, Elm_Notify_Data 
*sd EINA_UNUSED, Eva
 static Eina_Bool
 _timer_cb(void *data)
 {
-   const char *hide_signal;
Evas_Object *obj = data;
 
ELM_NOTIFY_DATA_GET(obj, sd);
@@ -255,16 +254,7 @@ _timer_cb(void *data)
sd->timer = NULL;
if (!evas_object_visible_get(obj)) goto end;
 
-   hide_signal = edje_object_data_get(sd->notify, "hide_finished_signal");
-   if ((hide_signal) && (!strcmp(hide_signal, "on")))
- {
-sd->in_timeout = EINA_TRUE;
-edje_object_signal_emit(sd->notify, "elm,state,hide", "elm");
- }
-   else //for backport supporting: edc without emitting hide finished signal
- {
-evas_object_hide(obj);
- }
+   evas_object_hide(obj);
eo_do(obj, eo_event_callback_call(ELM_NOTIFY_EVENT_TIMEOUT, NULL));
 
 end:
@@ -302,7 +292,6 @@ _elm_notify_evas_object_smart_hide(Eo *obj, Elm_Notify_Data 
*sd)
 
if (sd->had_hidden && !sd->in_timeout)
  return;
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_hide());
 
hide_signal = edje_object_data_get(sd->notify, "hide_finished_signal");
if ((hide_signal) && (!strcmp(hide_signal, "on")))
@@ -312,6 +301,7 @@ _elm_notify_evas_object_smart_hide(Eo *obj, Elm_Notify_Data 
*sd)
  }
else //for backport supporting: edc without emitting hide finished signal
  {
+eo_do_super(obj, MY_CLASS, evas_obj_smart_hide());
 evas_object_hide(sd->notify);
 if (sd->allow_events) evas_object_hide(sd->block_events);
  }
@@ -431,7 +421,7 @@ _hide_finished_cb(void *data,
sd->had_hidden = EINA_TRUE;
evas_object_hide(sd->notify);
if (!sd->allow_events) evas_object_hide(sd->block_events);
-   evas_object_hide(data);
+   eo_do_super(data, MY_CLASS, evas_obj_smart_hide());
 }
 
 EOLIAN static void

-- 

[EGIT] [core/elementary] master 01/01: notify: fix broken timeout feature in elm_notify

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=e14c12ca6b838622c1607d5a9ed56c94f8d7a8ca

commit e14c12ca6b838622c1607d5a9ed56c94f8d7a8ca
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Fri Nov 20 14:26:36 2015 +0530

notify: fix broken timeout feature in elm_notify

Add missing signal "elm,action,hide,finished" in notify theme
and hide the notify object when hide is finished.

fixes T2853
@fix
---
 data/themes/edc/elm/notify.edc | 4 
 src/lib/elm_notify.c   | 1 +
 2 files changed, 5 insertions(+)

diff --git a/data/themes/edc/elm/notify.edc b/data/themes/edc/elm/notify.edc
index 533ecc7..3c8448b 100644
--- a/data/themes/edc/elm/notify.edc
+++ b/data/themes/edc/elm/notify.edc
@@ -71,6 +71,10 @@ group { name: "elm/notify/top/default";
  target: "clip";
  target: "base";
  transition: DECELERATE 0.5;
+ after: "hide_finish";
+  }
+  program { name: "hide_finish";
+ action: SIGNAL_EMIT "elm,action,hide,finished" "elm";
   }
}
 }
diff --git a/src/lib/elm_notify.c b/src/lib/elm_notify.c
index 82f98d3..3e78ad9 100644
--- a/src/lib/elm_notify.c
+++ b/src/lib/elm_notify.c
@@ -431,6 +431,7 @@ _hide_finished_cb(void *data,
sd->had_hidden = EINA_TRUE;
evas_object_hide(sd->notify);
if (!sd->allow_events) evas_object_hide(sd->block_events);
+   evas_object_hide(data);
 }
 
 EOLIAN static void

-- 

[EGIT] [core/elementary] elementary-1.16 01/01: notify: fix broken timeout feature in elm_notify

[Amitesh Singh]

ami pushed a commit to branch elementary-1.16.

http://git.enlightenment.org/core/elementary.git/commit/?id=81b5ee7e16c37f96e2ac11d13893720bdd637e5c

commit 81b5ee7e16c37f96e2ac11d13893720bdd637e5c
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Fri Nov 20 14:26:36 2015 +0530

notify: fix broken timeout feature in elm_notify

Add missing signal "elm,action,hide,finished" in notify theme
and hide the notify object when hide is finished.

fixes T2853
@fix
---
 data/themes/edc/elm/notify.edc | 4 
 src/lib/elm_notify.c   | 1 +
 2 files changed, 5 insertions(+)

diff --git a/data/themes/edc/elm/notify.edc b/data/themes/edc/elm/notify.edc
index 533ecc7..3c8448b 100644
--- a/data/themes/edc/elm/notify.edc
+++ b/data/themes/edc/elm/notify.edc
@@ -71,6 +71,10 @@ group { name: "elm/notify/top/default";
  target: "clip";
  target: "base";
  transition: DECELERATE 0.5;
+ after: "hide_finish";
+  }
+  program { name: "hide_finish";
+ action: SIGNAL_EMIT "elm,action,hide,finished" "elm";
   }
}
 }
diff --git a/src/lib/elm_notify.c b/src/lib/elm_notify.c
index 82f98d3..3e78ad9 100644
--- a/src/lib/elm_notify.c
+++ b/src/lib/elm_notify.c
@@ -431,6 +431,7 @@ _hide_finished_cb(void *data,
sd->had_hidden = EINA_TRUE;
evas_object_hide(sd->notify);
if (!sd->allow_events) evas_object_hide(sd->block_events);
+   evas_object_hide(data);
 }
 
 EOLIAN static void

-- 

[EGIT] [core/elementary] master 01/01: notify: remove duplicate call of _sizing_eval.

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=8eff7ce777b30097e5d135efe5d96ce822d80dfe

commit 8eff7ce777b30097e5d135efe5d96ce822d80dfe
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Tue Nov 24 16:28:01 2015 +0530

notify: remove duplicate call of _sizing_eval.

we are already calling _sizing_eval() inside _calc().
---
 src/lib/elm_notify.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/lib/elm_notify.c b/src/lib/elm_notify.c
index cec6104..5014585 100644
--- a/src/lib/elm_notify.c
+++ b/src/lib/elm_notify.c
@@ -382,7 +382,6 @@ _elm_notify_elm_container_content_set(Eo *obj, 
Elm_Notify_Data *sd, const char *
 edje_object_part_swallow(sd->notify, "elm.swallow.content", content);
  }
 
-   _sizing_eval(obj);
_calc(obj);
 
return EINA_TRUE;
@@ -515,7 +514,6 @@ _elm_notify_elm_widget_parent_set(Eo *obj, Elm_Notify_Data 
*sd, Evas_Object *par
   (parent, EVAS_CALLBACK_DEL, _parent_del_cb, obj);
 evas_object_event_callback_add
   (parent, EVAS_CALLBACK_HIDE, _parent_hide_cb, obj);
-_sizing_eval(obj);
  }
 
_calc(obj);

-- 

[EGIT] [core/elementary] master 01/01: slider: fix segfault in case of obj is deleted before wheel timeout timer expires

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=ecca117da466be2d0b80b50a879ac41082ce15aa

commit ecca117da466be2d0b80b50a879ac41082ce15aa
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Fri Jan 15 17:41:27 2016 +0530

slider: fix segfault in case of obj is deleted before wheel timeout timer 
expires

Issue:
1. elementary_test -> slider
2. move mousewheel on slider and popup gets shown.
3. close the slider window very fast or increase the wheel_timeout to 4 
seconds
4. observe crash
---
 src/lib/elm_slider.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/lib/elm_slider.c b/src/lib/elm_slider.c
index 6db74da..b445b5f 100644
--- a/src/lib/elm_slider.c
+++ b/src/lib/elm_slider.c
@@ -930,6 +930,7 @@ _elm_slider_evas_object_smart_del(Eo *obj, Elm_Slider_Data 
*sd)
eina_stringshare_del(sd->indicator);
eina_stringshare_del(sd->units);
ecore_timer_del(sd->delay);
+   ecore_timer_del(sd->wheel_indicator_timer);
evas_object_del(sd->popup);
 
eo_do_super(obj, MY_CLASS, evas_obj_smart_del());

-- 

[EGIT] [core/elementary] master 01/01: genlist: update all realized items in a single job

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=c2fce0d10b143f7805c4df2eba7f2034863ca7fd

commit c2fce0d10b143f7805c4df2eba7f2034863ca7fd
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Thu Feb 4 23:44:19 2016 +0530

genlist: update all realized items in a single job

Summary:
Its really weird to call same job for each item and deletes that job in
next iteration. Since item_update() deletes the old update_job ecore job
again so basically we call update job only for the last realized item in 
the list.

 @fix

Reviewers: raster, jpeg, cedric, SanghyeonLee, tasn

Reviewed By: SanghyeonLee

Subscribers: seoz

Projects: #elementary

Differential Revision: https://phab.enlightenment.org/D3644
---
 src/lib/elm_genlist.c | 22 +-
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index 914bb1c..03d6c9a 100644
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -6972,6 +6972,14 @@ _elm_genlist_item_all_contents_unset(Eo *eo_item 
EINA_UNUSED, Elm_Gen_Item *it,
  }
 }
 
+static void
+_mark_item_update(Elm_Gen_Item *it)
+{
+   it->item->mincalcd = EINA_FALSE;
+   it->item->updateme = EINA_TRUE;
+   it->item->block->updateme = EINA_TRUE;
+}
+
 EOLIAN static void
 _elm_genlist_item_update(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *it)
 {
@@ -6979,9 +6987,7 @@ _elm_genlist_item_update(Eo *eo_item EINA_UNUSED, 
Elm_Gen_Item *it)
ELM_GENLIST_DATA_GET_FROM_ITEM(it, sd);
 
if (!it->item->block) return;
-   it->item->mincalcd = EINA_FALSE;
-   it->item->updateme = EINA_TRUE;
-   it->item->block->updateme = EINA_TRUE;
+   _mark_item_update(it);
ecore_job_del(sd->update_job);
sd->update_job = ecore_job_add(_update_job, sd->obj);
 }
@@ -7695,14 +7701,20 @@ _elm_genlist_elm_interface_scrollable_policy_get(Eo 
*obj, Elm_Genlist_Data *sd E
 }
 
 EOLIAN static void
-_elm_genlist_realized_items_update(Eo *obj, Elm_Genlist_Data *_pd EINA_UNUSED)
+_elm_genlist_realized_items_update(Eo *obj, Elm_Genlist_Data *_pd)
 {
Eina_List *list;
Elm_Object_Item *it;
 
list = elm_genlist_realized_items_get(obj);
EINA_LIST_FREE(list, it)
- elm_genlist_item_update(it);
+ {
+ELM_GENLIST_ITEM_DATA_GET(it, it2);
+if (!it2->item->block) continue;
+_mark_item_update(it2);
+ }
+   ecore_job_del(_pd->update_job);
+   _pd->update_job = ecore_job_add(_update_job, obj);
 }
 
 EOLIAN static void

-- 

[EGIT] [core/elementary] master 01/01: entry: send focus/unfocus signals to scroller interface

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=d6525a9c0ea58915a21362c2bce67117280151a5

commit d6525a9c0ea58915a21362c2bce67117280151a5
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Fri Feb 26 19:55:31 2016 +0530

entry: send focus/unfocus signals to scroller interface

In case of scrollable entry, send focus/unfocus signals to scroller
interface edje.
---
 src/lib/elm_entry.c | 11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index 3165847..e22fe46 100644
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -858,7 +858,11 @@ _elm_entry_elm_widget_theme_apply(Eo *obj, Elm_Entry_Data 
*sd)
evas_object_ref(obj);
 
if (elm_widget_focus_get(obj))
- edje_object_signal_emit(sd->entry_edje, "elm,action,focus", "elm");
+ {
+edje_object_signal_emit(sd->entry_edje, "elm,action,focus", "elm");
+if (sd->scroll)
+  edje_object_signal_emit(sd->scr_edje, "elm,action,focus", "elm");
+ }
 
edje_object_message_signal_process(sd->entry_edje);
 
@@ -1179,6 +1183,9 @@ _elm_entry_elm_widget_on_focus(Eo *obj, Elm_Entry_Data 
*sd, Elm_Object_Item *ite
  {
 evas_object_focus_set(sd->entry_edje, EINA_TRUE);
 edje_object_signal_emit(sd->entry_edje, "elm,action,focus", "elm");
+if (sd->scroll)
+  edje_object_signal_emit(sd->scr_edje, "elm,action,focus", "elm");
+
 if (top && top_is_win && sd->input_panel_enable && 
!sd->input_panel_show_on_demand &&
 !edje_object_part_text_imf_context_get(sd->entry_edje, "elm.text"))
   elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_ON);
@@ -1191,6 +1198,8 @@ _elm_entry_elm_widget_on_focus(Eo *obj, Elm_Entry_Data 
*sd, Elm_Object_Item *ite
else
  {
 edje_object_signal_emit(sd->entry_edje, "elm,action,unfocus", "elm");
+if (sd->scroll)
+  edje_object_signal_emit(sd->scr_edje, "elm,action,unfocus", "elm");
 evas_object_focus_set(sd->entry_edje, EINA_FALSE);
 if (top && top_is_win && sd->input_panel_enable &&
 !edje_object_part_text_imf_context_get(sd->entry_edje, "elm.text"))

-- 

[EGIT] [core/elementary] master 01/01: view list: free style in base destructor.

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=1018bcca27dafb04b5002da8094d5704396e5d2d

commit 1018bcca27dafb04b5002da8094d5704396e5d2d
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Fri Feb 26 19:34:20 2016 +0530

view list: free style in base destructor.

typecast const char * to void * and pass ptr to free() since it doesn't 
modify the value pointed to,
either conceptually or in practice, it merely looks up the memory block 
using the pointer and deallocates it.

@fix
---
 src/lib/elm_view_list.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/lib/elm_view_list.c b/src/lib/elm_view_list.c
index 0f3d1a2..271a242 100644
--- a/src/lib/elm_view_list.c
+++ b/src/lib/elm_view_list.c
@@ -375,6 +375,7 @@ _elm_view_list_eo_base_destructor(Eo *obj, 
Elm_View_List_Data *priv)
  eo_event_callback_array_del(model_callbacks(), priv->rootdata));
 
eo_do(priv->genlist, elm_obj_genlist_clear());
+   free((void *)priv->itc->item_style);
elm_genlist_item_class_free(priv->itc);
 
eina_hash_free(priv->prop_con);

-- 

[EGIT] [website/www-content] master 01/01: Wiki page start changed with summary [] by Amitesh Singh

[Amitesh Singh]

WWW-www.enlightenment.org pushed a commit to branch master.

http://git.enlightenment.org/website/www-content.git/commit/?id=6860212c36b97bc73fa1725115c879ca771585c1

commit 6860212c36b97bc73fa1725115c879ca771585c1
Author: Amitesh Singh <singh.amit...@gmail.com>
Date:   Wed Apr 6 02:34:22 2016 -0700

Wiki page start changed with summary [] by Amitesh Singh
---
 pages/docs/efl/start.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/docs/efl/start.txt b/pages/docs/efl/start.txt
index a27daa7..2537600 100644
--- a/pages/docs/efl/start.txt
+++ b/pages/docs/efl/start.txt
@@ -270,7 +270,7 @@ too. Also never call any EFL functions after elm_shutdown().
 int
 main(int argc, char **argv)
 {
-   if (!elm_init()) return -1;
+   if (!elm_init(argc, argv)) return -1;
 
elm_run();
 

-- 

[EGIT] [core/efl] master 01/01: doc: add widget_preview_nstate.c to noinst_PROGRAMS

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=410cdd1501c0f733da72350ba177120d77506952

commit 410cdd1501c0f733da72350ba177120d77506952
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Fri Apr 8 09:47:55 2016 +0530

doc: add widget_preview_nstate.c to noinst_PROGRAMS
---
 doc/widgets/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/widgets/Makefile.am b/doc/widgets/Makefile.am
index c056084..21ed385 100644
--- a/doc/widgets/Makefile.am
+++ b/doc/widgets/Makefile.am
@@ -78,6 +78,7 @@ widget_preview_map \
 widget_preview_mapbuf \
 widget_preview_menu \
 widget_preview_notify \
+widget_preview_nstate.c \
 widget_preview_panel \
 widget_preview_panes \
 widget_preview_photocam \

-- 

[EGIT] [core/efl] master 01/01: doc: fix typo in 410cdd1501c0f7

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=4cd002fc7d44245d38fb598a439d9e80cd8274da

commit 4cd002fc7d44245d38fb598a439d9e80cd8274da
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Fri Apr 8 10:14:15 2016 +0530

doc: fix typo in 410cdd1501c0f7
---
 doc/widgets/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/widgets/Makefile.am b/doc/widgets/Makefile.am
index 21ed385..e2e75b5 100644
--- a/doc/widgets/Makefile.am
+++ b/doc/widgets/Makefile.am
@@ -78,7 +78,7 @@ widget_preview_map \
 widget_preview_mapbuf \
 widget_preview_menu \
 widget_preview_notify \
-widget_preview_nstate.c \
+widget_preview_nstate \
 widget_preview_panel \
 widget_preview_panes \
 widget_preview_photocam \

-- 

[EGIT] [core/efl] master 01/02: doc: add elm nstate preview

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=4cf98237eec434592e6eccbcc8519ba1a2393e86

commit 4cf98237eec434592e6eccbcc8519ba1a2393e86
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Fri Apr 8 09:09:59 2016 +0530

doc: add elm nstate preview
---
 doc/widgets/Makefile.am |  1 +
 doc/widgets/widget_preview_nstate.c | 10 ++
 2 files changed, 11 insertions(+)

diff --git a/doc/widgets/Makefile.am b/doc/widgets/Makefile.am
index 5002c8a..c056084 100644
--- a/doc/widgets/Makefile.am
+++ b/doc/widgets/Makefile.am
@@ -176,6 +176,7 @@ EXTRA_DIST = \
widget_preview_progressbar.c \
widget_preview_box.c \
widget_preview_notify.c \
+   widget_preview_nstate.c \
widget_preview_slideshow.c \
widget_preview_photocam.c \
widget_preview_inwin1.c \
diff --git a/doc/widgets/widget_preview_nstate.c 
b/doc/widgets/widget_preview_nstate.c
new file mode 100644
index 000..b53e998
--- /dev/null
+++ b/doc/widgets/widget_preview_nstate.c
@@ -0,0 +1,10 @@
+#include "widget_preview_tmpl_head.c"
+
+Evas_Object *o = eo_add(ELM_NSTATE_CLASS, win);
+evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+elm_win_resize_object_add(win, o);
+evas_object_show(o);
+
+elm_object_text_set(o, "Nstate");
+
+#include "widget_preview_tmpl_foot.c"

-- 

[EGIT] [core/efl] master 02/02: theme: add nstate.edc in Makefile.am

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=ea6027b3c8333dfc357ac36a62c571d08c133891

commit ea6027b3c8333dfc357ac36a62c571d08c133891
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Fri Apr 8 09:19:02 2016 +0530

theme: add nstate.edc in Makefile.am

fixes make dist
---
 data/elementary/themes/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

diff --git a/data/elementary/themes/Makefile.am 
b/data/elementary/themes/Makefile.am
index aff951a..1bca7c0 100644
--- a/data/elementary/themes/Makefile.am
+++ b/data/elementary/themes/Makefile.am
@@ -114,6 +114,7 @@ elementary/themes/edc/elm/menu.edc \
 elementary/themes/edc/elm/multibuttonentry.edc \
 elementary/themes/edc/elm/naviframe.edc \
 elementary/themes/edc/elm/notify.edc \
+elementary/themes/edc/elm/nstate.edc \
 elementary/themes/edc/elm/panel.edc \
 elementary/themes/edc/elm/panes.edc \
 elementary/themes/edc/elm/photocam.edc \

-- 

[EGIT] [core/elementary] master 01/01: hoversel: remove EINA_UNUSED since data is getting used

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=fb5228b4d2ba01cb2683298069744b7940c70a47

commit fb5228b4d2ba01cb2683298069744b7940c70a47
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Fri Mar 4 11:14:20 2016 +0530

hoversel: remove EINA_UNUSED since data is getting used
---
 src/lib/elc_hoversel.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/elc_hoversel.c b/src/lib/elc_hoversel.c
index 7d9817f..e14e0e6 100644
--- a/src/lib/elc_hoversel.c
+++ b/src/lib/elc_hoversel.c
@@ -440,7 +440,7 @@ _activate(Evas_Object *obj)
 }
 
 static Eina_Bool
-_on_clicked(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED)
+_on_clicked(void *data, const Eo_Event *event EINA_UNUSED)
 {
_activate(data);
 

-- 

[EGIT] [core/elementary] master 01/01: combobox: store eo_constructor() return value into obj

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=e90e85cedc072f00b6b9561f45bd7190c29242a2

commit e90e85cedc072f00b6b9561f45bd7190c29242a2
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Fri Mar 4 14:57:39 2016 +0530

combobox: store eo_constructor() return value into obj

This is what we do in every widget's base constructor.

@fix
---
 src/lib/elc_combobox.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/elc_combobox.c b/src/lib/elc_combobox.c
index 408b590..af79c72 100644
--- a/src/lib/elc_combobox.c
+++ b/src/lib/elc_combobox.c
@@ -320,7 +320,7 @@ _elm_combobox_eo_base_constructor(Eo *obj, 
Elm_Combobox_Data *sd)
Evas_Object *entry;
char buf[128];
 
-   eo_constructor(eo_super(obj, MY_CLASS));
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
 
sd->first_filter = EINA_TRUE;
 

-- 

[EGIT] [core/elementary] master 01/01: radio: inherit from elm check

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=b9c912f7213dc4026e41d3f99e2f4a5fc78269db

commit b9c912f7213dc4026e41d3f99e2f4a5fc78269db
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Thu Mar 3 11:58:21 2016 +0530

radio: inherit from elm check

Summary: Radio inherits from Check now and remove the duplicate codes

Reviewers: yashu21985, cedric, tasn, raster

Reviewed By: raster

Subscribers: seoz

Differential Revision: https://phab.enlightenment.org/D3747
---
 src/lib/elm_radio.c  | 109 +--
 src/lib/elm_radio.eo |   8 +---
 2 files changed, 20 insertions(+), 97 deletions(-)

diff --git a/src/lib/elm_radio.c b/src/lib/elm_radio.c
index 4c6f5fa..3d40990 100644
--- a/src/lib/elm_radio.c
+++ b/src/lib/elm_radio.c
@@ -16,12 +16,6 @@
 #define MY_CLASS_NAME "Elm_Radio"
 #define MY_CLASS_NAME_LEGACY "elm_radio"
 
-static const Elm_Layout_Part_Alias_Description _content_aliases[] =
-{
-   {"icon", "elm.swallow.content"},
-   {NULL, NULL}
-};
-
 static const Elm_Layout_Part_Alias_Description _text_aliases[] =
 {
{"default", "elm.text"},
@@ -129,56 +123,6 @@ _activate(Evas_Object *obj)
  }
 }
 
-/* FIXME: replicated from elm_layout just because radio's icon spot
- * is elm.swallow.content, not elm.swallow.icon. Fix that whenever we
- * can changed the theme API */
-static void
-_icon_signal_emit(Evas_Object *obj)
-{
-   ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
-   char buf[64];
-
-   snprintf(buf, sizeof(buf), "elm,state,icon,%s",
-elm_layout_content_get(obj, "icon") ? "visible" : "hidden");
-
-   elm_layout_signal_emit(obj, buf, "elm");
-   edje_object_message_signal_process(wd->resize_obj);
-}
-
-/* FIXME: replicated from elm_layout just because radio's icon spot
- * is elm.swallow.content, not elm.swallow.icon. Fix that whenever we
- * can changed the theme API */
-EOLIAN static Eina_Bool
-_elm_radio_elm_widget_sub_object_del(Eo *obj, Elm_Radio_Data *_pd EINA_UNUSED, 
Evas_Object *sobj)
-{
-   Eina_Bool int_ret = EINA_FALSE;
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_sub_object_del(sobj));
-   if (!int_ret) return EINA_FALSE;
-
-   _icon_signal_emit(obj);
-
-   eo_do(obj, elm_obj_layout_sizing_eval());
-
-   return EINA_TRUE;
-}
-
-/* FIXME: replicated from elm_layout just because radio's icon spot
- * is elm.swallow.content, not elm.swallow.icon. Fix that whenever we
- * can changed the theme API */
-EOLIAN static Eina_Bool
-_elm_radio_elm_container_content_set(Eo *obj, Elm_Radio_Data *_pd EINA_UNUSED, 
const char *part, Evas_Object *content)
-{
-   Eina_Bool int_ret = EINA_FALSE;
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_container_content_set(part, 
content));
-   if (!int_ret) return EINA_FALSE;
-
-   _icon_signal_emit(obj);
-
-   eo_do(obj, elm_obj_layout_sizing_eval());
-
-   return EINA_TRUE;
-}
-
 static Eina_Bool
 _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED)
 {
@@ -202,12 +146,28 @@ _elm_radio_elm_widget_event(Eo *obj, Elm_Radio_Data *_pd 
EINA_UNUSED, Evas_Objec
return EINA_TRUE;
 }
 
+/* FIXME: replicated from elm_layout just because radio's icon spot
+ * is elm.swallow.content, not elm.swallow.icon. Fix that whenever we
+ * can changed the theme API */
+static void
+_icon_signal_emit(Evas_Object *obj)
+{
+   ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
+   char buf[64];
+
+   snprintf(buf, sizeof(buf), "elm,state,icon,%s",
+elm_layout_content_get(obj, "icon") ? "visible" : "hidden");
+
+   elm_layout_signal_emit(obj, buf, "elm");
+   edje_object_message_signal_process(wd->resize_obj);
+}
+
 EOLIAN static Eina_Bool
 _elm_radio_elm_widget_theme_apply(Eo *obj, Elm_Radio_Data *sd)
 {
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
Eina_Bool int_ret = EINA_FALSE;
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_theme_apply());
+   eo_do_super(obj, ELM_CHECK_CLASS, int_ret = elm_obj_widget_theme_apply());
if (!int_ret) return EINA_FALSE;
 
if (sd->state) elm_layout_signal_emit(obj, "elm,state,radio,on", "elm");
@@ -227,19 +187,6 @@ _elm_radio_elm_widget_theme_apply(Eo *obj, Elm_Radio_Data 
*sd)
return EINA_TRUE;
 }
 
-EOLIAN static void
-_elm_radio_elm_layout_sizing_eval(Eo *obj, Elm_Radio_Data *_pd EINA_UNUSED)
-{
-   Evas_Coord minw = -1, minh = -1;
-   ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
-
-   elm_coords_finger_size_adjust(1, , 1, );
-   edje_object_size_min_restricted_calc
- (wd->resize_obj, , , minw, minh);
-   evas_object_size_hint_min_set(obj, minw, minh);
-   evas_object_size_hint_max_set(obj, -1, -1);
-}
-
 static void
 _radio_on_cb(void *data,
  Evas_Object *obj EINA_UNUSED,
@@ -276,7 +223,7 @@ _elm_radio_evas_object_sma

[EGIT] [core/elementary] master 01/01: atspi intf: image - fix compilation warnings after eo4 migration changes

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=b613a3d63ac510679c6383308f672c4a993b2fea

commit b613a3d63ac510679c6383308f672c4a993b2fea
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Sat Mar 5 06:50:34 2016 +0530

atspi intf: image - fix compilation warnings after eo4 migration changes

 ==
  CC   libelementary_la-elm_interface_atspi_value.lo
  elm_interface_atspi_image.c: In function 
'_elm_interface_atspi_image_description_set':
  elm_interface_atspi_image.c:36:9: warning: 'old_descr' may be used 
uninitialized in this function [-Wmaybe-uninitialized]
   eina_stringshare_del(old_descr);
^
==
---
 src/lib/elm_interface_atspi_image.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/elm_interface_atspi_image.c 
b/src/lib/elm_interface_atspi_image.c
index a9a253d..7ee1e97 100644
--- a/src/lib/elm_interface_atspi_image.c
+++ b/src/lib/elm_interface_atspi_image.c
@@ -30,8 +30,8 @@ _elm_interface_atspi_image_description_set(Eo *obj, void *sd 
EINA_UNUSED, const
 {
const char *key = "atspi_image_description";
const char *descr = eina_stringshare_add(description);
-   char *old_descr;
-   if (eo_key_data_get(obj, key))
+   char *old_descr = eo_key_data_get(obj, key);
+   if (old_descr)
  {
 eina_stringshare_del(old_descr);
 eo_event_callback_del(obj, EO_BASE_EVENT_DEL, _free_desc_cb, 
old_descr);

-- 

[EGIT] [core/efl] master 02/02: slider: Add range support

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=92296545710fbea3eab112978eb4823addc5f227

commit 92296545710fbea3eab112978eb4823addc5f227
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Mon Mar 28 14:05:51 2016 +0530

slider: Add range support

Slider can have two indicators if enabled and user can select
range values.

phab: https://phab.enlightenment.org/D3822
Test Plan: elementary_test -to slider

@feature

Change-Id: If4ca74de6f5a94531ebd21750d52704b2b02afee
---
 src/bin/elementary/test_slider.c   | 220 -
 src/lib/elementary/elm_slider.c| 345 +
 src/lib/elementary/elm_slider.eo   |  23 +++
 src/lib/elementary/elm_widget_slider.h |   5 +-
 4 files changed, 554 insertions(+), 39 deletions(-)

diff --git a/src/bin/elementary/test_slider.c b/src/bin/elementary/test_slider.c
index c613da6..9956a9b 100644
--- a/src/bin/elementary/test_slider.c
+++ b/src/bin/elementary/test_slider.c
@@ -58,10 +58,20 @@ _step_size_calculate(double min, double max)
return step;
 }
 
+static void
+_change_range_print_cb(void *data EINA_UNUSED, Evas_Object *obj, void 
*event_info EINA_UNUSED)
+{
+   double from, to;
+
+   elm_slider_range_get(obj, , );
+
+   printf("range values:- from: %f, to: %f\n", from, to);
+}
+
 void
 test_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void 
*event_info EINA_UNUSED)
 {
-   Evas_Object *win, *fr, *bx, *sl, *ic, *sl1, *bx2, *bt;
+   Evas_Object *win, *fr, *bx, *sl, *ic, *sl1, *bx2, *bx3, *bx4, *bt;
double step;
char buf[PATH_MAX];
 
@@ -264,7 +274,6 @@ test_slider(void *data EINA_UNUSED, Evas_Object *obj 
EINA_UNUSED, void *event_in
elm_slider_span_size_set(sl, 60);
evas_object_size_hint_align_set(sl, 0.5, EVAS_HINT_FILL);
evas_object_size_hint_weight_set(sl, 0.0, EVAS_HINT_EXPAND);
-   elm_slider_indicator_show_set(sl, EINA_FALSE);
elm_slider_value_set(sl, 0.2);
elm_object_scale_set(sl, 1.0);
elm_slider_horizontal_set(sl, EINA_FALSE);
@@ -303,5 +312,212 @@ test_slider(void *data EINA_UNUSED, Evas_Object *obj 
EINA_UNUSED, void *event_in
evas_object_show(bt);
elm_box_pack_end(bx2, bt);
 
+   fr = elm_frame_add(bx);
+   elm_object_text_set(fr, "Range");
+   evas_object_size_hint_weight_set(fr, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   elm_box_pack_end(bx, fr);
+   evas_object_show(fr);
+
+   bx3 = elm_box_add(fr);
+   evas_object_size_hint_weight_set(bx3, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_show(bx3);
+   elm_object_content_set(fr, bx3);
+
+   //Disabled
+   sl = elm_slider_add(bx3);
+   elm_object_text_set(sl, "Disabled");
+   elm_slider_unit_format_set(sl, "%1.1f units");
+   elm_slider_span_size_set(sl, 120);
+   elm_slider_min_max_set(sl, 50, 150);
+   evas_object_size_hint_align_set(sl, EVAS_HINT_FILL, 0.5);
+   evas_object_size_hint_weight_set(sl, EVAS_HINT_EXPAND, 0.0);
+   elm_object_disabled_set(sl, EINA_TRUE);
+   elm_slider_range_enabled_set(sl, EINA_TRUE);
+   elm_slider_range_set(sl, 20, 100);
+   elm_box_pack_end(bx3, sl);
+   evas_object_show(sl);
+
+   // horizontal slider with range
+   sl = elm_slider_add(bx3);
+   evas_object_size_hint_weight_set(sl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   elm_slider_indicator_show_set(sl, EINA_TRUE);
+   elm_object_text_set(sl, "Horizontal");
+   elm_slider_unit_format_set(sl, "%1.5f units");
+   elm_slider_indicator_format_set(sl, "%1.5f");
+   elm_slider_span_size_set(sl, 160);
+   elm_slider_range_enabled_set(sl, EINA_TRUE);
+   elm_slider_range_set(sl, 0.4, 0.9);
+   elm_box_pack_end(bx3, sl);
+   evas_object_show(sl);
+
+   sl = elm_slider_add(bx3);
+   elm_slider_unit_format_set(sl, "%1.0f units");
+   elm_slider_indicator_format_set(sl, "%1.0f");
+   elm_slider_span_size_set(sl, 120);
+   elm_slider_min_max_set(sl, 0, 9);
+   elm_object_text_set(sl, "Manual step");
+   step = _step_size_calculate(0, 9);
+   elm_slider_step_set(sl, step);
+   evas_object_size_hint_align_set(sl, EVAS_HINT_FILL, 0.5);
+   evas_object_size_hint_weight_set(sl, EVAS_HINT_EXPAND, 0.0);
+   elm_slider_range_enabled_set(sl, EINA_TRUE);
+   elm_box_pack_end(bx3, sl);
+   evas_object_show(sl);
+
+   sl = elm_slider_add(bx3);
+   elm_slider_unit_format_set(sl, "%1.0f units");
+   elm_slider_indicator_format_set(sl, "%1.0f");
+   elm_slider_span_size_set(sl, 120);
+   elm_slider_min_max_set(sl, 0, 100);
+   elm_object_text_set(sl, "Show Indicator on Focus: ");
+   step = _step_size_calculate(0, 9);
+   elm_slider_step_set(sl, step);
+   elm_slider_indicator_show_on_focus_set(sl, EINA_TRUE);
+   evas_object_size_hint_align_set(sl, EVAS_HINT_FILL, 0.5);
+   evas_object_size_hint_weight_set(sl, EVAS_HINT_EXPAND, 0.0);
+   elm_slider_range_enabled_set(sl, EINA_TRUE);
+   elm_box_pack_end(bx3

[EGIT] [core/efl] master 01/01: elm_cnp: comment the debug macro

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=6a237f3cca3c62b1c05035e532a7abbc790b7cbb

commit 6a237f3cca3c62b1c05035e532a7abbc790b7cbb
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed May 4 16:28:56 2016 +0530

elm_cnp: comment the debug macro

It was accidently enabled in 1bc9483a82bf18be3
---
 src/lib/elementary/elm_cnp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/elementary/elm_cnp.c b/src/lib/elementary/elm_cnp.c
index 56c34d5..9cce31c 100644
--- a/src/lib/elementary/elm_cnp.c
+++ b/src/lib/elementary/elm_cnp.c
@@ -8,7 +8,7 @@
 # include 
 #endif
 
-#define DEBUGON 1
+//#define DEBUGON 1
 #ifdef DEBUGON
 # define cnp_debug(fmt, args...) fprintf(stderr, __FILE__":%s/%d : " fmt , 
__FUNCTION__, __LINE__, ##args)
 #else

-- 

[EGIT] [core/efl] master 01/01: efl intf: Add format interface

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=0088143ccbe78c51b5daabd6cf78eb763f546b25

commit 0088143ccbe78c51b5daabd6cf78eb763f546b25
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Mon Oct 16 15:24:06 2017 +0900

efl intf: Add format interface

Ref T6204
---
 src/Makefile_Efl.am  |  1 +
 src/lib/efl/Efl.h|  1 +
 src/lib/efl/interfaces/efl_interfaces_main.c |  1 +
 src/lib/efl/interfaces/efl_ui_format.eo  | 44 
 4 files changed, 47 insertions(+)

diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am
index dff5d3cef8..c7233047bc 100644
--- a/src/Makefile_Efl.am
+++ b/src/Makefile_Efl.am
@@ -75,6 +75,7 @@ efl_eolian_files = \
   lib/efl/interfaces/efl_ui_item.eo \
   lib/efl/interfaces/efl_ui_menu.eo \
   lib/efl/interfaces/efl_ui_autorepeat.eo \
+  lib/efl/interfaces/efl_ui_format.eo \
   $(efl_eolian_legacy_files) \
   $(NULL)
 
diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h
index 1b5a9bcfe7..e4c76495fe 100644
--- a/src/lib/efl/Efl.h
+++ b/src/lib/efl/Efl.h
@@ -135,6 +135,7 @@ typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command;
 #include "interfaces/efl_ui_model_connect.eo.h"
 #include "interfaces/efl_ui_factory.eo.h"
 #include "interfaces/efl_ui_model_factory_connect.eo.h"
+#include "interfaces/efl_ui_format.eo.h"
 
 /* Observable interface */
 #include "interfaces/efl_observer.eo.h"
diff --git a/src/lib/efl/interfaces/efl_interfaces_main.c 
b/src/lib/efl/interfaces/efl_interfaces_main.c
index 778108e699..eb85ef2773 100644
--- a/src/lib/efl/interfaces/efl_interfaces_main.c
+++ b/src/lib/efl/interfaces/efl_interfaces_main.c
@@ -68,6 +68,7 @@
 #include "interfaces/efl_ui_scrollable.eo.c"
 #include "interfaces/efl_ui_selectable.eo.c"
 #include "interfaces/efl_ui_zoom.eo.c"
+#include "interfaces/efl_ui_format.eo.c"
 
 EAPI void
 __efl_internal_init(void)
diff --git a/src/lib/efl/interfaces/efl_ui_format.eo 
b/src/lib/efl/interfaces/efl_ui_format.eo
new file mode 100644
index 00..74d6249127
--- /dev/null
+++ b/src/lib/efl/interfaces/efl_ui_format.eo
@@ -0,0 +1,44 @@
+import eina_types;
+
+function Efl.Ui.Format_Func_Cb {
+   [[Function pointer for format function hook]]
+   params {
+  @in str: ptr(Eina.Strbuf);
+  @in value: Eina.Value;
+   }
+};
+
+interface Efl.Ui.Format
+{
+   [[interface class for format_func]]
+   methods {
+  @property func_cb @protected {
+ set {
+[[Set the format function pointer to format the indicator string.
+]]
+ }
+ values {
+func: Efl.Ui.Format_Func_Cb @nullable; [[The format function 
callback]]
+ }
+  }
+  @property unit @protected {
+ [[Control the format string for a given units label
+
+   If $NULL is passed on $format, it will make $obj's units
+   area to be hidden completely. If not, it'll set the format
+   string for the units label's text. The units label is
+   provided a floating point value, so the units text is up display
+   at most one floating point value. Note that the units label is
+   optional. Use a format string such as "%1.2f meters" for example.
+
+   Note: The default format string is an integer percentage,
+   as in $"%.0f %%".
+ ]]
+ set {
+ }
+ values {
+units: string @nullable; [[The format string for $obj's units 
label.]]
+ }
+  }
+   }
+}

-- 

[EGIT] [core/efl] master 01/01: slider/progressbar: implement format_string of Efl.Ui.Format

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=85d4a618a7cefad115cd569d45a3383c6dba56a2

commit 85d4a618a7cefad115cd569d45a3383c6dba56a2
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Tue Oct 17 15:45:50 2017 +0900

slider/progressbar: implement format_string of Efl.Ui.Format

remove the unit_format from Efl.Ui.Range.
---
 src/bin/elementary/test_ui_slider_interval.c | 10 ++--
 src/lib/efl/interfaces/efl_ui_format.eo  |  6 +--
 src/lib/efl/interfaces/efl_ui_range.eo   | 21 -
 src/lib/elementary/efl_ui_progressbar.c  |  8 ++--
 src/lib/elementary/efl_ui_progressbar.eo |  4 +-
 src/lib/elementary/efl_ui_slider.c   | 70 ++--
 src/lib/elementary/efl_ui_slider.eo  |  4 +-
 7 files changed, 50 insertions(+), 73 deletions(-)

diff --git a/src/bin/elementary/test_ui_slider_interval.c 
b/src/bin/elementary/test_ui_slider_interval.c
index cee02ff657..518528e813 100644
--- a/src/bin/elementary/test_ui_slider_interval.c
+++ b/src/bin/elementary/test_ui_slider_interval.c
@@ -52,7 +52,7 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj 
EINA_UNUSED, void
efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, bx,
efl_text_set(efl_added, "Manual step"),
efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(120, 0)),
-   efl_ui_range_unit_format_set(efl_added, "%1.1f units"),
+   efl_ui_format_string_set(efl_added, "%1.1f units"),
efl_ui_slider_indicator_format_set(efl_added, "%1.1f"),
efl_ui_slider_interval_value_set(efl_added, 0.4, 0.9),
efl_ui_slider_step_set(efl_added, step),
@@ -61,7 +61,7 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj 
EINA_UNUSED, void
efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, bx,
efl_text_set(efl_added, "Disabled"),
efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(120, 0)),
-   efl_ui_range_unit_format_set(efl_added, "%1.0f units"),
+   efl_ui_format_string_set(efl_added, "%1.0f units"),
efl_ui_slider_indicator_format_set(efl_added, "%1.0f"),
efl_ui_range_min_max_set(efl_added, 10, 145),
efl_ui_slider_interval_value_set(efl_added, 50, 100),
@@ -76,7 +76,7 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj 
EINA_UNUSED, void
efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, hbx,
efl_text_set(efl_added, "Vertical"),
efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(0, 160)),
-   efl_ui_range_unit_format_set(efl_added, "%1.0f units"),
+   efl_ui_format_string_set(efl_added, "%1.0f units"),
efl_ui_slider_indicator_format_set(efl_added, "%1.0f"),
efl_ui_range_min_max_set(efl_added, 10, 145),
efl_ui_slider_interval_value_set(efl_added, 50, 100),
@@ -87,7 +87,7 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj 
EINA_UNUSED, void
efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, hbx,
efl_text_set(efl_added, "Disabled"),
efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(0, 160)),
-   efl_ui_range_unit_format_set(efl_added, "%1.0f units"),
+   efl_ui_format_string_set(efl_added, "%1.0f units"),
efl_ui_slider_indicator_format_set(efl_added, "%1.0f"),
efl_ui_range_min_max_set(efl_added, 10, 145),
efl_ui_slider_interval_value_set(efl_added, 50, 100),
@@ -100,7 +100,7 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object 
*obj EINA_UNUSED, void
efl_text_set(efl_added, "Limited (100-500)"),
efl_ui_slider_indicator_visible_mode_set(efl_added, 
EFL_UI_SLIDER_INDICATOR_VISIBLE_MODE_ON_FOCUS),
efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(260, 0)),
-   efl_ui_range_unit_format_set(efl_added, "%1.0f units"),
+   efl_ui_format_string_set(efl_added, "%1.0f units"),
efl_ui_slider_indicator_format_set(efl_added, "%1.0f"),
efl_ui_range_min_max_set(efl_added, 0, 600),
efl_ui_slider_interval_value_set(efl_added, 100, 500),
diff --git a/src/lib/efl/interfaces/efl_ui_format.eo 
b/src/lib/efl/interfaces/efl_ui_format.eo
index 4d02d30a7e..38d51c18bd 100644
--- a/src/lib/efl/interfaces/efl_ui_format.eo
+++ b/src/lib/efl/interfaces/efl_ui_format.eo
@@ -12,7 +12,7 @@ interface Efl.Ui.Format
 {
[[interface class for format_func]]
methods {
-  @property format_cb @protected {
+  @property format_cb {
  set {
 [[Set the format function pointer to format the string.
 ]]
@@ -21,7 +21,7 @@ interface Efl.Ui.Format
 func: Efl.Ui.Format_Func_Cb @nullable; [[The format function 
callback]]
  }
   }
-  @property f

[EGIT] [core/efl] master 01/01: efl_ui_format: fix the namings and docs

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=329dcfccd79e6b31657c60bdacf797c7d2c8f0d3

commit 329dcfccd79e6b31657c60bdacf797c7d2c8f0d3
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Tue Oct 17 13:37:26 2017 +0900

efl_ui_format: fix the namings and docs

it is based on review comments by Gustavo and JP.
---
 src/lib/efl/interfaces/efl_ui_format.eo | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/lib/efl/interfaces/efl_ui_format.eo 
b/src/lib/efl/interfaces/efl_ui_format.eo
index 74d6249127..a140135ec1 100644
--- a/src/lib/efl/interfaces/efl_ui_format.eo
+++ b/src/lib/efl/interfaces/efl_ui_format.eo
@@ -3,8 +3,8 @@ import eina_types;
 function Efl.Ui.Format_Func_Cb {
[[Function pointer for format function hook]]
params {
-  @in str: ptr(Eina.Strbuf);
-  @in value: Eina.Value;
+  @out str: Eina.Strbuf; [[the formated string to be appended by user.]]
+  @in value: const(any_value); [[The Eina.Value passed by $obj.]]
}
 };
 
@@ -12,16 +12,16 @@ interface Efl.Ui.Format
 {
[[interface class for format_func]]
methods {
-  @property func_cb @protected {
+  @property format_cb @protected {
  set {
-[[Set the format function pointer to format the indicator string.
+[[Set the format function pointer to format the string.
 ]]
  }
  values {
 func: Efl.Ui.Format_Func_Cb @nullable; [[The format function 
callback]]
  }
   }
-  @property unit @protected {
+  @property format_string @protected {
  [[Control the format string for a given units label
 
If $NULL is passed on $format, it will make $obj's units

-- 

[EGIT] [core/efl] master 01/01: efl_ui_format: change Eina.Strbug to @in type

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=2d477f5672e7748838fb9dd8d0d9d7d46799d7eb

commit 2d477f5672e7748838fb9dd8d0d9d7d46799d7eb
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Tue Oct 17 14:03:36 2017 +0900

efl_ui_format: change Eina.Strbug to @in type
---
 src/lib/efl/interfaces/efl_ui_format.eo | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/efl/interfaces/efl_ui_format.eo 
b/src/lib/efl/interfaces/efl_ui_format.eo
index a140135ec1..4d02d30a7e 100644
--- a/src/lib/efl/interfaces/efl_ui_format.eo
+++ b/src/lib/efl/interfaces/efl_ui_format.eo
@@ -3,7 +3,7 @@ import eina_types;
 function Efl.Ui.Format_Func_Cb {
[[Function pointer for format function hook]]
params {
-  @out str: Eina.Strbuf; [[the formated string to be appended by user.]]
+  @in str: ptr(Eina.Strbuf); [[the formated string to be appended by 
user.]]
   @in value: const(any_value); [[The Eina.Value passed by $obj.]]
}
 };

-- 

[EGIT] [core/efl] master 01/01: eina: strbuf - Add strftime related functions

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=2cf24eb30428fd56e32b1633ab3d795a3fbea5a3

commit 2cf24eb30428fd56e32b1633ab3d795a3fbea5a3
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Fri Oct 13 14:36:31 2017 +0900

eina: strbuf - Add strftime related functions

eina_strbuf_append_strftime()
eina_strbuf_insert_strftime()
eina_strbuf_prepend_strftime() - macro

We need these functions for implementing generic format function
interface especially for calander.

Ref T6204
---
 src/examples/eina/eina_strbuf_02.c | 35 
 src/lib/eina/eina_strbuf.c | 28 
 src/lib/eina/eina_strbuf.h | 68 ++
 src/tests/eina/eina_test_strbuf.c  | 31 +
 4 files changed, 162 insertions(+)

diff --git a/src/examples/eina/eina_strbuf_02.c 
b/src/examples/eina/eina_strbuf_02.c
new file mode 100644
index 00..9282b69ed5
--- /dev/null
+++ b/src/examples/eina/eina_strbuf_02.c
@@ -0,0 +1,35 @@
+//Compile with:
+//gcc -Wall -o eina_strbuf_02 eina_strbuf_02c `pkg-config --cflags --libs eina`
+
+#include 
+#include 
+
+int main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
+{
+   Eina_Strbuf *buf;
+   time_t curr_time;
+   struct tm *info;
+
+   eina_init();
+
+   curr_time = time(NULL);
+   info = localtime(_time);
+
+   buf = eina_strbuf_new();
+   eina_strbuf_append_strftime(buf, "%I:%M%p", info);
+   printf("current time: %s\n", eina_strbuf_string_get(buf));
+   eina_strbuf_reset(buf);
+
+   buf = eina_strbuf_new();
+   eina_strbuf_append(buf, "Hours: Minutes");
+   //insert hour at ^Hours: Minutes where ^ is the position
+   eina_strbuf_prepend_strftime(buf, "%I ", info);
+   //insert hour at hhhHours: ^Minutes where ^ is the position
+   eina_strbuf_insert_strftime(buf, "%M ", info, 10);
+   printf("%s\n", eina_strbuf_string_get(buf));
+
+   eina_strbuf_free(buf);
+   eina_shutdown();
+
+   return 0;
+}
diff --git a/src/lib/eina/eina_strbuf.c b/src/lib/eina/eina_strbuf.c
index 586bffb21c..f18408d59e 100644
--- a/src/lib/eina/eina_strbuf.c
+++ b/src/lib/eina/eina_strbuf.c
@@ -220,6 +220,34 @@ eina_strbuf_substr_get(Eina_Strbuf *buf, size_t pos, 
size_t len)
return eina_strbuf_manage_new(str);
 }
 
+EAPI Eina_Bool
+eina_strbuf_append_strftime(Eina_Strbuf *buf, const char *format, const struct 
tm *tm)
+{
+   char *outputbuf;
+
+   outputbuf = eina_strftime(format, tm);
+   if (!outputbuf) return EINA_FALSE;
+
+   eina_strbuf_append(buf, outputbuf);
+   free(outputbuf);
+
+   return EINA_TRUE;
+}
+
+EAPI Eina_Bool
+eina_strbuf_insert_strftime(Eina_Strbuf *buf, const char *format, const struct 
tm *tm, size_t pos)
+{
+   char *outputbuf;
+
+   outputbuf = eina_strftime(format, tm);
+   if (!outputbuf) return EINA_FALSE;
+
+   eina_strbuf_insert_length(buf, outputbuf, strlen(outputbuf), pos);
+   free(outputbuf);
+
+   return EINA_TRUE;
+}
+
 /* Unicode */
 
 #include "eina_strbuf_template_c.x"
diff --git a/src/lib/eina/eina_strbuf.h b/src/lib/eina/eina_strbuf.h
index 7d90ae6324..eeea11c47f 100644
--- a/src/lib/eina/eina_strbuf.h
+++ b/src/lib/eina/eina_strbuf.h
@@ -738,6 +738,74 @@ EAPI Eina_Rw_Slice eina_strbuf_rw_slice_get(const 
Eina_Strbuf *buf) EINA_WARN_UN
 EAPI char* eina_strbuf_release(Eina_Strbuf *buf) EINA_WARN_UNUSED_RESULT 
EINA_ARG_NONNULL(1);
 
 /**
+ * @brief append the given buffer based on strftime output.
+ *
+ * @param tm Pointer to a tm structure needed by strftime.
+ * @param fmt String containing format specifiers needed by strftime.
+ * @return #EINA_TRUE on success, #EINA_FALSE on failure.
+ *
+ * This will add append buffer of exact required size based on strftime output
+ *
+ * Example usage:
+ * @code
+ * time_t curr_time;
+ * struct tm *info;
+ * Eina_Strbuf *buf = eina_strbuf_new();
+ * curr_time = time(NULL);
+ * info = localtime(_time);
+ * eina_strbuf_append_strftime(buf, "%I:%M%p", info);
+ * //after use
+ * eina_strbuf_free(buf);
+ * @endcode #EINA_TRUE on success, #EINA_FALSE on failure.
+ *
+ * @since 1.21
+ */
+EAPI Eina_Bool eina_strbuf_append_strftime(Eina_Strbuf *buf, const char *fmt, 
const struct tm *tm);
+
+/**
+ * @brief insert the given buffer based on strftime output at given position
+ *
+ * @param buf The string buffer to prepend to.
+ * @param fmt String containing format specifiers needed by strftime.
+ * @param tm Pointer to a tm structure needed by strftime.
+ * @return #EINA_TRUE on success, #EINA_FALSE on failure.
+ *
+ * This will add append buffer of exact required size based on strftime output
+ *
+ * Example usage:
+ * @code
+ * time_t curr_time;
+ * struct tm *info;
+ * Eina_Strbuf *buf = eina_strbuf_new();
+ * curr_time = time(NULL);
+ * info = localtime(_time);
+ * eina_strbuf_insert_strftime(buf, "%I:%M%p", info, 2);
+ * //after use
+ * eina_strbuf_free(buf);
+ * @endcode
+ *
+ 

[EGIT] [core/efl] master 01/01: tests: eina strbuf - fix compilation

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=00ba7b1b6fe1f745da5cd2d716988aea6844ae05

commit 00ba7b1b6fe1f745da5cd2d716988aea6844ae05
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Fri Oct 13 16:10:31 2017 +0900

tests: eina strbuf - fix compilation

refer patch 2cf24eb30428fd56
---
 src/tests/eina/eina_test_strbuf.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/tests/eina/eina_test_strbuf.c 
b/src/tests/eina/eina_test_strbuf.c
index 4add7a188e..b4e1cd1d02 100644
--- a/src/tests/eina/eina_test_strbuf.c
+++ b/src/tests/eina/eina_test_strbuf.c
@@ -689,6 +689,7 @@ START_TEST(strbuf_strftime_test)
 
eina_strbuf_free(buf);
 }
+END_TEST
 
 void
 eina_test_strbuf(TCase *tc)

-- 

[EGIT] [core/efl] master 01/01: Efl.Ui.Format: do proper checking for string template.

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=e97d00d5983bf9514c88097fe85e745f0019fe9b

commit e97d00d5983bf9514c88097fe85e745f0019fe9b
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Tue Nov 28 12:12:08 2017 +0900

Efl.Ui.Format: do proper checking for string template.

Add support to take action based on string format specifier.

If string template is '%d' and value type is double, do safe
conversion to int from double.
---
 src/lib/efl/interfaces/efl_ui_format.c | 53 +++---
 1 file changed, 43 insertions(+), 10 deletions(-)

diff --git a/src/lib/efl/interfaces/efl_ui_format.c 
b/src/lib/efl/interfaces/efl_ui_format.c
index 04bf96425e..7fdbc49249 100644
--- a/src/lib/efl/interfaces/efl_ui_format.c
+++ b/src/lib/efl/interfaces/efl_ui_format.c
@@ -8,19 +8,26 @@ typedef struct
const char *template;
 } Efl_Ui_Format_Data;
 
+typedef enum _Format_Type
+{
+   FORMAT_TYPE_INVALID,
+   FORMAT_TYPE_DOUBLE,
+   FORMAT_TYPE_INT
+} Format_Type;
+
 static Eina_Bool
 _is_valid_digit(char x)
 {
return ((x >= '0' && x <= '9') || (x == '.')) ? EINA_TRUE : EINA_FALSE;
 }
 
-static int
+static Format_Type
 _format_string_check(const char *fmt)
 {
const char *itr = NULL;
const char *start = NULL;
Eina_Bool found = EINA_FALSE;
-   int ret_type = 0;
+   Format_Type ret_type = FORMAT_TYPE_INVALID;
 
start = strchr(fmt, '%');
if (!start) return 0;
@@ -29,7 +36,8 @@ _format_string_check(const char *fmt)
  {
 if (found && start[1] != '%')
   {
- return 0;
+ ret_type = FORMAT_TYPE_INVALID;
+ break;
   }
 
 if (start[1] != '%' && !found)
@@ -40,12 +48,12 @@ _format_string_check(const char *fmt)
   if ((*itr == 'd') || (*itr == 'u') || (*itr == 'i') ||
   (*itr == 'o') || (*itr == 'x') || (*itr == 'X'))
 {
-   ret_type = 1; //int
+   ret_type = FORMAT_TYPE_INT;
break;
 }
   else if ((*itr == 'f') || (*itr == 'F'))
 {
-   ret_type = 2; //double
+   ret_type = FORMAT_TYPE_DOUBLE;
break;
 }
   else if (_is_valid_digit(*itr))
@@ -54,7 +62,8 @@ _format_string_check(const char *fmt)
 }
   else
 {
-   return 0;
+   ret_type = FORMAT_TYPE_INVALID;
+   break;
 }
}
   }
@@ -82,24 +91,48 @@ _default_format_cb(void *data, Eina_Strbuf *str, const 
Eina_Value value)
 
format_check_result = _format_string_check(sd->template);
 
-   if (format_check_result == 0)
+   if (format_check_result == FORMAT_TYPE_INVALID)
  {
-ERR("Wrong String Format: %s\n", sd->template);
+ERR("Wrong String Format: %s", sd->template);
 return;
  }
 
-   if (type == EINA_VALUE_TYPE_DOUBLE)
+   if ((format_check_result == FORMAT_TYPE_DOUBLE)
+   && (type == EINA_VALUE_TYPE_DOUBLE))
  {
 double v;
 eina_value_get(, );
 eina_strbuf_append_printf(str, sd->template, v);
  }
-   else if (type == EINA_VALUE_TYPE_INT)
+   else if ((format_check_result == FORMAT_TYPE_INT)
+&& (type == EINA_VALUE_TYPE_INT))
  {
 int v;
 eina_value_get(, );
 eina_strbuf_append_printf(str, sd->template, v);
  }
+   else if ((format_check_result == FORMAT_TYPE_DOUBLE)
+&& (type == EINA_VALUE_TYPE_INT))
+ {
+int v;
+double d_v;
+
+eina_value_get(, );
+
+d_v = v;
+eina_strbuf_append_printf(str, sd->template, d_v);
+ }
+   else if ((format_check_result == FORMAT_TYPE_INT)
+&& (type == EINA_VALUE_TYPE_DOUBLE))
+ {
+double v;
+int i_v;
+
+eina_value_get(, );
+
+i_v = v;
+eina_strbuf_append_printf(str, sd->template, i_v);
+ }
else
  {
 char *v = eina_value_to_string();

-- 

[EGIT] [core/efl] master 01/01: Efl.Ui.Format: add string format checking for user input

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=475ae7ef1bf6b44a5d4c3abba21a4a2fa2d565f5

commit 475ae7ef1bf6b44a5d4c3abba21a4a2fa2d565f5
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Fri Nov 24 14:56:10 2017 +0900

Efl.Ui.Format: add string format checking for user input
---
 src/lib/efl/interfaces/efl_ui_format.c | 76 ++
 1 file changed, 76 insertions(+)

diff --git a/src/lib/efl/interfaces/efl_ui_format.c 
b/src/lib/efl/interfaces/efl_ui_format.c
index b55cda074d..390a45173b 100644
--- a/src/lib/efl/interfaces/efl_ui_format.c
+++ b/src/lib/efl/interfaces/efl_ui_format.c
@@ -1,16 +1,92 @@
 #include "config.h"
 #include "Efl.h"
 
+#define ERR(...) EINA_LOG_DOM_ERR(EINA_LOG_DOMAIN_DEFAULT, __VA_ARGS__)
+
 typedef struct
 {
const char *template;
 } Efl_Ui_Format_Data;
 
+static Eina_Bool
+_is_valid_digit(char x)
+{
+   return ((x >= '0' && x <= '9') || (x == '.')) ? EINA_TRUE : EINA_FALSE;
+}
+
+static int
+_format_string_check(const char *fmt)
+{
+   const char *itr = NULL;
+   const char *start = NULL;
+   Eina_Bool found = EINA_FALSE;
+   int ret_type = 0;
+
+   start = strchr(fmt, '%');
+   if (!start) return 0;
+
+   while (start)
+ {
+if (found && start[1] != '%')
+  {
+ return 0;
+  }
+
+if (start[1] != '%' && !found)
+  {
+ found = EINA_TRUE;
+ for (itr = start + 1; *itr != '\0'; itr++)
+   {
+  if ((*itr == 'd') || (*itr == 'u') || (*itr == 'i') ||
+  (*itr == 'o') || (*itr == 'x') || (*itr == 'X'))
+{
+   ret_type = 1; //int
+   break;
+}
+  else if ((*itr == 'f') || (*itr == 'F'))
+{
+   ret_type = 2; //double
+   break;
+}
+  else if (_is_valid_digit(*itr))
+{
+   continue;
+}
+  else
+{
+   return 0;
+}
+   }
+  }
+start = strchr(start + 2, '%');
+ }
+
+   return ret_type;
+}
+
 static void
 _default_format_cb(void *data, Eina_Strbuf *str, const Eina_Value value)
 {
const Eina_Value_Type *type = eina_value_type_get();
Efl_Ui_Format_Data *sd = data;
+   int format_check_result;
+
+   if (type == EINA_VALUE_TYPE_TM)
+ {
+struct tm v;
+eina_value_get(, );
+eina_strbuf_append_strftime(str, sd->template, );
+
+return;
+ }
+
+   format_check_result = _format_string_check(sd->template);
+
+   if (format_check_result == 0)
+ {
+ERR("Wrong String Format: %s\n", sd->template);
+return;
+ }
 
if (type == EINA_VALUE_TYPE_DOUBLE)
  {

-- 

[EGIT] [core/efl] master 01/01: Efl.Ui.Calendar: fix wrong define - again!

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=92b4ad824b3136f4b66d3ccae62941c7313148c3

commit 92b4ad824b3136f4b66d3ccae62941c7313148c3
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Nov 22 17:14:07 2017 +0900

Efl.Ui.Calendar: fix wrong define - again!
---
 src/lib/elementary/efl_ui_calendar_private.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/elementary/efl_ui_calendar_private.h 
b/src/lib/elementary/efl_ui_calendar_private.h
index 2ca8f3871d..1341dd565e 100644
--- a/src/lib/elementary/efl_ui_calendar_private.h
+++ b/src/lib/elementary/efl_ui_calendar_private.h
@@ -1,5 +1,5 @@
 #ifndef EFL_UI_CALENDAR_PRIVATE_H
-#define ELM_UI_CALENDAR_PRIVATE_H
+#define EFL_UI_CALENDAR_PRIVATE_H
 
 #include "Elementary.h"
 

-- 

[EGIT] [core/efl] master 01/01: focus: fix build break after previous commit.

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=038e492fe1c2ae13fcdb3a2557478d25331300f9

commit 038e492fe1c2ae13fcdb3a2557478d25331300f9
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Nov 29 19:46:04 2017 +0900

focus: fix build break after previous commit.
---
 src/lib/elementary/efl_ui_win.eo | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/elementary/efl_ui_win.eo b/src/lib/elementary/efl_ui_win.eo
index 66a3d47223..989a3ca16f 100644
--- a/src/lib/elementary/efl_ui_win.eo
+++ b/src/lib/elementary/efl_ui_win.eo
@@ -801,7 +801,7 @@ class Efl.Ui.Win (Elm.Widget, Efl.Canvas, Efl.Access.Window,
  that it's not covered by any other window.]]
   Efl.Gfx.Stack.lower; [[This action is ignored by the Window.]]
   Elm.Widget.theme_apply;
-  Elm.Widget.focus { get; }
+  Efl.Ui.Focus.Object.focus { get; }
   Elm.Widget.focus_highlight_style { get; set; }
   Elm.Widget.focus_highlight_enabled { get; set; }
   Elm.Widget.focus_highlight_animate { get; set; }

-- 

[EGIT] [core/efl] master 01/01: focus: remove focus.get{} from widget.eo

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=29b47e0a0776e9cc74ad8b9fc00fa3271c4d5486

commit 29b47e0a0776e9cc74ad8b9fc00fa3271c4d5486
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Nov 29 17:39:42 2017 +0900

focus: remove focus.get{} from widget.eo

This is taking care by focus manager now.
---
 src/lib/elementary/efl_ui_calendar.c |  2 +-
 src/lib/elementary/efl_ui_clock.c|  2 +-
 src/lib/elementary/efl_ui_image_zoomable.c   |  2 +-
 src/lib/elementary/efl_ui_layout.c   |  2 +-
 src/lib/elementary/efl_ui_multibuttonentry.c | 12 ++--
 src/lib/elementary/efl_ui_slider.c   | 14 +++---
 src/lib/elementary/efl_ui_spin_button.c  |  2 +-
 src/lib/elementary/efl_ui_text.c |  6 +++---
 src/lib/elementary/efl_ui_win.c  |  8 
 src/lib/elementary/elc_hoversel.c|  2 +-
 src/lib/elementary/elm_access.c  |  2 +-
 src/lib/elementary/elm_calendar.c|  2 +-
 src/lib/elementary/elm_colorselector.c   |  2 +-
 src/lib/elementary/elm_diskselector.c|  2 +-
 src/lib/elementary/elm_entry.c   |  4 ++--
 src/lib/elementary/elm_gengrid.c |  2 +-
 src/lib/elementary/elm_genlist.c |  8 
 src/lib/elementary/elm_glview.c  |  2 +-
 src/lib/elementary/elm_list.c|  8 
 src/lib/elementary/elm_main.c|  4 ++--
 src/lib/elementary/elm_map.c |  2 +-
 src/lib/elementary/elm_plug.c|  2 +-
 src/lib/elementary/elm_spinner.c |  2 +-
 src/lib/elementary/elm_toolbar.c |  2 +-
 src/lib/elementary/elm_widget.c  | 14 --
 src/lib/elementary/elm_widget.eo | 16 
 src/lib/elementary/elm_widget.h  |  3 +--
 27 files changed, 53 insertions(+), 76 deletions(-)

diff --git a/src/lib/elementary/efl_ui_calendar.c 
b/src/lib/elementary/efl_ui_calendar.c
index df5e9d6a38..8b8a82da9a 100644
--- a/src/lib/elementary/efl_ui_calendar.c
+++ b/src/lib/elementary/efl_ui_calendar.c
@@ -876,7 +876,7 @@ _efl_ui_calendar_elm_widget_on_focus_update(Eo *obj, 
Efl_Ui_Calendar_Data *sd, E
// After arranging focus logic in this widget, we need to make
// focused item which is for indicating direction key input movement
// on the calendar widget.
-   if (elm_widget_focus_get(obj))
+   if (efl_ui_focus_object_focus_get(obj))
  _update_focused_it(obj, sd->selected_it);
else
  _update_unfocused_it(obj, sd->focused_it);
diff --git a/src/lib/elementary/efl_ui_clock.c 
b/src/lib/elementary/efl_ui_clock.c
index bd11bc8d60..969cfd9e41 100644
--- a/src/lib/elementary/efl_ui_clock.c
+++ b/src/lib/elementary/efl_ui_clock.c
@@ -454,7 +454,7 @@ _efl_ui_clock_elm_widget_on_focus_update(Eo *obj, 
Efl_Ui_Clock_Data *sd, Elm_Obj
int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
if (!int_ret) return EINA_FALSE;
 
-   if (!elm_widget_focus_get(obj))
+   if (!efl_ui_focus_object_focus_get(obj))
  {
 if ((dt_mod) && (dt_mod->obj_hide))
   dt_mod->obj_hide(sd->mod_data);
diff --git a/src/lib/elementary/efl_ui_image_zoomable.c 
b/src/lib/elementary/efl_ui_image_zoomable.c
index 5ad22f723a..388235f416 100644
--- a/src/lib/elementary/efl_ui_image_zoomable.c
+++ b/src/lib/elementary/efl_ui_image_zoomable.c
@@ -869,7 +869,7 @@ _efl_ui_image_zoomable_elm_widget_on_focus_update(Eo *obj, 
Efl_Ui_Image_Zoomable
int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
if (!int_ret) return EINA_FALSE;
 
-   if (elm_widget_focus_get(obj))
+   if (efl_ui_focus_object_focus_get(obj))
  {
 edje_object_signal_emit
   (wd->resize_obj, "elm,action,focus", "elm");
diff --git a/src/lib/elementary/efl_ui_layout.c 
b/src/lib/elementary/efl_ui_layout.c
index 15534c7b7d..65343c1194 100644
--- a/src/lib/elementary/efl_ui_layout.c
+++ b/src/lib/elementary/efl_ui_layout.c
@@ -394,7 +394,7 @@ _efl_ui_layout_elm_widget_on_focus_update(Eo *obj, 
Efl_Ui_Layout_Data *_pd EINA_
 
if (!elm_widget_can_focus_get(obj)) return EINA_FALSE;
 
-   if (elm_widget_focus_get(obj))
+   if (efl_ui_focus_object_focus_get(obj))
  {
 elm_layout_signal_emit(obj, "elm,action,focus", "elm");
 evas_object_focus_set(wd->resize_obj, EINA_TRUE);
diff --git a/src/lib/elementary/efl_ui_multibuttonentry.c 
b/src/lib/elementary/efl_ui_multibuttonentry.c
index 0ff7c5e555..d39d68c470 100644
--- a/src/lib/elementary/efl_ui_multibuttonentry.c
+++ b/src/lib/elementary/efl_ui_multibuttonentry.c
@@ -146,11 +146,11 @@ _visual_guide_text_set(Evas_Object *obj)
elm_box_unpack(sd->box, sd->entry);
if (sd->view_state == MULTIBUTTONENTRY_VIEW_SHRINK) return;
 
-   if (!elm_widget_focus_get(obj))
+   if (!

[EGIT] [core/efl] master 01/01: elm tests: show nstate & slider_interval widgets in Efl.Ui scope

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=3ed9271bf4f2ac8262387a250f07877a3524aa39

commit 3ed9271bf4f2ac8262387a250f07877a3524aa39
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Thu Nov 30 18:47:57 2017 +0900

elm tests: show nstate & slider_interval widgets in Efl.Ui scope
---
 src/bin/elementary/test.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bin/elementary/test.c b/src/bin/elementary/test.c
index f23b37d4ee..726fc4bb67 100644
--- a/src/bin/elementary/test.c
+++ b/src/bin/elementary/test.c
@@ -1029,8 +1029,8 @@ add_tests:
ADD_TEST(NULL, "Range Values", "Slider", test_slider);
ADD_TEST(NULL, "Range Values", "Progressbar", test_progressbar);
ADD_TEST(NULL, "Range Values", "Progressbar 2", test_progressbar2);
-   ADD_TEST_EO(NULL, "Range Values", "Nstate", test_nstate);
-   ADD_TEST_EO(NULL, "Range Values", "Interval Slider", test_slider_interval);
+   ADD_TEST_EO(NULL, "Range Values", "Efl.Ui.Nstate", test_nstate);
+   ADD_TEST_EO(NULL, "Range Values", "Efl.Ui.Slider_Interval", 
test_slider_interval);
 
//--//
ADD_TEST(NULL, "Booleans", "Check", test_check);

-- 

[EGIT] [core/efl] master 01/01: edje: fix NULL ptr dereference

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=769aeb5fccfc752c3fde2c0e423a84689d94c571

commit 769aeb5fccfc752c3fde2c0e423a84689d94c571
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Fri Dec 1 10:59:58 2017 +0900

edje: fix NULL ptr dereference

Fixes CID 1383425
---
 src/lib/edje/edje_util.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index 2872317b13..a82620f5d4 100644
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -396,12 +396,12 @@ _edje_object_efl_ui_base_scale_get(Eo *obj EINA_UNUSED, 
Edje *ed)
 }
 
 EAPI double
-edje_object_base_scale_get(const Eo *obj)
+edje_object_base_scale_get(const Evas_Object *obj)
 {
Edje *ed;
 
ed = _edje_fetch(obj);
-   if (!ed->file) return 1.0;
+   if (!ed || !ed->file) return 1.0;
return TO_DOUBLE(ed->file->base_scale);
 }
 

-- 

[EGIT] [core/efl] master 01/01: Efl.Ui.Format: remove the dupicalte code

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=952593eef24e58d07efe31ff750f114deee9fb02

commit 952593eef24e58d07efe31ff750f114deee9fb02
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Mon Nov 27 16:55:04 2017 +0900

Efl.Ui.Format: remove the dupicalte code

struct tm check is already done at the beginning of the function.
---
 src/lib/efl/interfaces/efl_ui_format.c | 6 --
 1 file changed, 6 deletions(-)

diff --git a/src/lib/efl/interfaces/efl_ui_format.c 
b/src/lib/efl/interfaces/efl_ui_format.c
index 390a45173b..04bf96425e 100644
--- a/src/lib/efl/interfaces/efl_ui_format.c
+++ b/src/lib/efl/interfaces/efl_ui_format.c
@@ -100,12 +100,6 @@ _default_format_cb(void *data, Eina_Strbuf *str, const 
Eina_Value value)
 eina_value_get(, );
 eina_strbuf_append_printf(str, sd->template, v);
  }
-   else if (type == EINA_VALUE_TYPE_TM)
- {
-struct tm v;
-eina_value_get(, );
-eina_strbuf_append_strftime(str, sd->template, );
- }
else
  {
 char *v = eina_value_to_string();

-- 

[EGIT] [core/efl] master 01/01: Efl.Ui.Format: do format check once only.

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=e8ae4178d846136e9993828c3523002c24cdf015

commit e8ae4178d846136e9993828c3523002c24cdf015
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Tue Nov 28 17:05:31 2017 +0900

Efl.Ui.Format: do format check once only.
---
 src/lib/efl/interfaces/efl_ui_format.c | 27 ++-
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/lib/efl/interfaces/efl_ui_format.c 
b/src/lib/efl/interfaces/efl_ui_format.c
index 7fdbc49249..15212f168f 100644
--- a/src/lib/efl/interfaces/efl_ui_format.c
+++ b/src/lib/efl/interfaces/efl_ui_format.c
@@ -3,11 +3,6 @@
 
 #define ERR(...) EINA_LOG_DOM_ERR(EINA_LOG_DOMAIN_DEFAULT, __VA_ARGS__)
 
-typedef struct
-{
-   const char *template;
-} Efl_Ui_Format_Data;
-
 typedef enum _Format_Type
 {
FORMAT_TYPE_INVALID,
@@ -15,6 +10,12 @@ typedef enum _Format_Type
FORMAT_TYPE_INT
 } Format_Type;
 
+typedef struct
+{
+   const char *template;
+   Format_Type format_type;
+} Efl_Ui_Format_Data;
+
 static Eina_Bool
 _is_valid_digit(char x)
 {
@@ -78,7 +79,6 @@ _default_format_cb(void *data, Eina_Strbuf *str, const 
Eina_Value value)
 {
const Eina_Value_Type *type = eina_value_type_get();
Efl_Ui_Format_Data *sd = data;
-   int format_check_result;
 
if (type == EINA_VALUE_TYPE_TM)
  {
@@ -89,29 +89,27 @@ _default_format_cb(void *data, Eina_Strbuf *str, const 
Eina_Value value)
 return;
  }
 
-   format_check_result = _format_string_check(sd->template);
-
-   if (format_check_result == FORMAT_TYPE_INVALID)
+   if (sd->format_type == FORMAT_TYPE_INVALID)
  {
 ERR("Wrong String Format: %s", sd->template);
 return;
  }
 
-   if ((format_check_result == FORMAT_TYPE_DOUBLE)
+   if ((sd->format_type == FORMAT_TYPE_DOUBLE)
&& (type == EINA_VALUE_TYPE_DOUBLE))
  {
 double v;
 eina_value_get(, );
 eina_strbuf_append_printf(str, sd->template, v);
  }
-   else if ((format_check_result == FORMAT_TYPE_INT)
+   else if ((sd->format_type == FORMAT_TYPE_INT)
 && (type == EINA_VALUE_TYPE_INT))
  {
 int v;
 eina_value_get(, );
 eina_strbuf_append_printf(str, sd->template, v);
  }
-   else if ((format_check_result == FORMAT_TYPE_DOUBLE)
+   else if ((sd->format_type == FORMAT_TYPE_DOUBLE)
 && (type == EINA_VALUE_TYPE_INT))
  {
 int v;
@@ -122,7 +120,7 @@ _default_format_cb(void *data, Eina_Strbuf *str, const 
Eina_Value value)
 d_v = v;
 eina_strbuf_append_printf(str, sd->template, d_v);
  }
-   else if ((format_check_result == FORMAT_TYPE_INT)
+   else if ((sd->format_type == FORMAT_TYPE_INT)
 && (type == EINA_VALUE_TYPE_DOUBLE))
  {
 double v;
@@ -157,7 +155,10 @@ EOLIAN static void
 _efl_ui_format_format_string_set(Eo *obj, Efl_Ui_Format_Data *sd, const char 
*template)
 {
if (!template) return;
+
eina_stringshare_replace(>template, template);
+   sd->format_type = _format_string_check(sd->template);
+
efl_ui_format_cb_set(obj, sd, _default_format_cb, _default_format_free_cb);
 }
 

-- 

[EGIT] [core/efl] master 01/01: Efl.Gfx.Shape: fix efl_super() call.

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=5f3e0d62a43d5e3da09e73dbb1f3e0a0cebf4b81

commit 5f3e0d62a43d5e3da09e73dbb1f3e0a0cebf4b81
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Thu Nov 30 16:23:04 2017 +0900

Efl.Gfx.Shape: fix efl_super() call.
---
 src/lib/efl/interfaces/efl_gfx_shape.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/efl/interfaces/efl_gfx_shape.c 
b/src/lib/efl/interfaces/efl_gfx_shape.c
index 7645a04fe3..00bad6677f 100644
--- a/src/lib/efl/interfaces/efl_gfx_shape.c
+++ b/src/lib/efl/interfaces/efl_gfx_shape.c
@@ -122,7 +122,7 @@ _efl_gfx_shape_efl_gfx_path_interpolate(Eo *obj, 
Efl_Gfx_Shape_Data *pd,
efl_gfx_shape_stroke_join_set(obj, (pos_map < 0.5) ?
  property_from.j : property_to.j);
 
-   return efl_gfx_path_interpolate(efl_super(obj, EFL_GFX_PATH_MIXIN), from, 
to, pos_map);
+   return efl_gfx_path_interpolate(efl_super(obj, MY_CLASS), from, to, 
pos_map);
 }
 
 EOLIAN static void

-- 

[EGIT] [core/efl] master 02/03: Efl.Gfx.Shape: add missing EOLIAN prefixes to eolian functions.

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=77d730627e80437ca4b80eb99a21737bdfae51c6

commit 77d730627e80437ca4b80eb99a21737bdfae51c6
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Thu Nov 30 15:45:54 2017 +0900

Efl.Gfx.Shape: add missing EOLIAN prefixes to eolian functions.
---
 src/lib/efl/interfaces/efl_gfx_shape.c | 32 
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/lib/efl/interfaces/efl_gfx_shape.c 
b/src/lib/efl/interfaces/efl_gfx_shape.c
index 21e0b0c25c..7645a04fe3 100644
--- a/src/lib/efl/interfaces/efl_gfx_shape.c
+++ b/src/lib/efl/interfaces/efl_gfx_shape.c
@@ -125,20 +125,20 @@ _efl_gfx_shape_efl_gfx_path_interpolate(Eo *obj, 
Efl_Gfx_Shape_Data *pd,
return efl_gfx_path_interpolate(efl_super(obj, EFL_GFX_PATH_MIXIN), from, 
to, pos_map);
 }
 
-static void
+EOLIAN static void
 _efl_gfx_shape_stroke_scale_set(Eo *obj EINA_UNUSED, Efl_Gfx_Shape_Data *pd,
 double s)
 {
pd->public.stroke.scale = s;
 }
 
-static double
+EOLIAN static double
 _efl_gfx_shape_stroke_scale_get(Eo *obj EINA_UNUSED, Efl_Gfx_Shape_Data *pd)
 {
return pd->public.stroke.scale;
 }
 
-static void
+EOLIAN static void
 _efl_gfx_shape_stroke_color_set(Eo *obj EINA_UNUSED, Efl_Gfx_Shape_Data *pd,
 int r, int g, int b, int a)
 {
@@ -148,7 +148,7 @@ _efl_gfx_shape_stroke_color_set(Eo *obj EINA_UNUSED, 
Efl_Gfx_Shape_Data *pd,
pd->public.stroke.color.a = a;
 }
 
-static void
+EOLIAN static void
 _efl_gfx_shape_stroke_color_get(Eo *obj EINA_UNUSED, Efl_Gfx_Shape_Data *pd,
 int *r, int *g, int *b, int *a)
 {
@@ -158,7 +158,7 @@ _efl_gfx_shape_stroke_color_get(Eo *obj EINA_UNUSED, 
Efl_Gfx_Shape_Data *pd,
if (a) *a = pd->public.stroke.color.a;
 }
 
-static void
+EOLIAN static void
 _efl_gfx_shape_stroke_width_set(Eo *obj, Efl_Gfx_Shape_Data *pd, double w)
 {
pd->public.stroke.width = w;
@@ -166,27 +166,27 @@ _efl_gfx_shape_stroke_width_set(Eo *obj, 
Efl_Gfx_Shape_Data *pd, double w)
efl_event_callback_legacy_call(obj, EFL_GFX_EVENT_CHANGED, NULL);
 }
 
-static double
+EOLIAN static double
 _efl_gfx_shape_stroke_width_get(Eo *obj EINA_UNUSED,
 Efl_Gfx_Shape_Data *pd)
 {
return pd->public.stroke.width;
 }
 
-static void
+EOLIAN static void
 _efl_gfx_shape_stroke_location_set(Eo *obj EINA_UNUSED, Efl_Gfx_Shape_Data *pd,
double centered)
 {
pd->public.stroke.centered = centered;
 }
 
-static double
+EOLIAN static double
 _efl_gfx_shape_stroke_location_get(Eo *obj EINA_UNUSED, Efl_Gfx_Shape_Data *pd)
 {
return pd->public.stroke.centered;
 }
 
-static void
+EOLIAN static void
 _efl_gfx_shape_stroke_dash_set(Eo *obj EINA_UNUSED, Efl_Gfx_Shape_Data *pd,
const Efl_Gfx_Dash *dash, unsigned int length)
 {
@@ -208,7 +208,7 @@ _efl_gfx_shape_stroke_dash_set(Eo *obj EINA_UNUSED, 
Efl_Gfx_Shape_Data *pd,
pd->public.stroke.dash_length = length;
 }
 
-static void
+EOLIAN static void
 _efl_gfx_shape_stroke_dash_get(Eo *obj EINA_UNUSED,
Efl_Gfx_Shape_Data *pd,
const Efl_Gfx_Dash **dash, unsigned int *length)
@@ -217,7 +217,7 @@ _efl_gfx_shape_stroke_dash_get(Eo *obj EINA_UNUSED,
if (length) *length = pd->public.stroke.dash_length;
 }
 
-static void
+EOLIAN static void
 _efl_gfx_shape_stroke_cap_set(Eo *obj EINA_UNUSED,
   Efl_Gfx_Shape_Data *pd,
   Efl_Gfx_Cap c)
@@ -225,14 +225,14 @@ _efl_gfx_shape_stroke_cap_set(Eo *obj EINA_UNUSED,
pd->public.stroke.cap = c;
 }
 
-static Efl_Gfx_Cap
+EOLIAN static Efl_Gfx_Cap
 _efl_gfx_shape_stroke_cap_get(Eo *obj EINA_UNUSED,
   Efl_Gfx_Shape_Data *pd)
 {
return pd->public.stroke.cap;
 }
 
-static void
+EOLIAN static void
 _efl_gfx_shape_stroke_join_set(Eo *obj EINA_UNUSED,
Efl_Gfx_Shape_Data *pd,
Efl_Gfx_Join j)
@@ -240,14 +240,14 @@ _efl_gfx_shape_stroke_join_set(Eo *obj EINA_UNUSED,
pd->public.stroke.join = j;
 }
 
-static Efl_Gfx_Join
+EOLIAN static Efl_Gfx_Join
 _efl_gfx_shape_stroke_join_get(Eo *obj EINA_UNUSED,
Efl_Gfx_Shape_Data *pd)
 {
return pd->public.stroke.join;
 }
 
-static void
+EOLIAN static void
 _efl_gfx_shape_fill_rule_set(Eo *obj EINA_UNUSED,
  Efl_Gfx_Shape_Data *pd,
  Efl_Gfx_Fill_Rule fill_rule)
@@ -255,7 +255,7 @@ _efl_gfx_shape_fill_rule_set(Eo *obj EINA_UNUSED,
pd->fill_rule = fill_rule;
 }
 
-static Efl_Gfx_Fill_Rule
+EOLIAN static Efl_Gfx_Fill_Rule
 _efl_gfx_shape_fill_rule_get(Eo *obj EINA_UNUSED,
  Efl_Gfx_Shape_Data *pd)
 {

-- 

[EGIT] [core/efl] master 03/03: Efl.Gfx.Path: add missing EOLIAN prefixes to eolian functions.

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=774a01a28bb7ee07259e75e66e1b531c14c8f565

commit 774a01a28bb7ee07259e75e66e1b531c14c8f565
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Thu Nov 30 15:58:04 2017 +0900

Efl.Gfx.Path: add missing EOLIAN prefixes to eolian functions.
---
 src/lib/efl/interfaces/efl_gfx_path.c | 46 +--
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/lib/efl/interfaces/efl_gfx_path.c 
b/src/lib/efl/interfaces/efl_gfx_path.c
index 85d017fd8c..b744ef1e37 100644
--- a/src/lib/efl/interfaces/efl_gfx_path.c
+++ b/src/lib/efl/interfaces/efl_gfx_path.c
@@ -144,7 +144,7 @@ _efl_gfx_path_current_search(const Efl_Gfx_Path_Command 
*cmd,
return EINA_TRUE;
 }
 
-static void
+EOLIAN static void
 _efl_gfx_path_path_set(Eo *obj, Efl_Gfx_Path_Data *pd,
   const Efl_Gfx_Path_Command *commands,
   const double *points)
@@ -189,7 +189,7 @@ _efl_gfx_path_path_set(Eo *obj, Efl_Gfx_Path_Data *pd,
efl_event_callback_legacy_call(obj, EFL_GFX_EVENT_CHANGED, NULL);
 }
 
-static void
+EOLIAN static void
 _efl_gfx_path_path_get(Eo *obj EINA_UNUSED, Efl_Gfx_Path_Data *pd,
   const Efl_Gfx_Path_Command **commands,
   const double **points)
@@ -198,7 +198,7 @@ _efl_gfx_path_path_get(Eo *obj EINA_UNUSED, 
Efl_Gfx_Path_Data *pd,
if (points) *points = pd->points;
 }
 
-static void
+EOLIAN static void
 _efl_gfx_path_length_get(Eo *obj EINA_UNUSED, Efl_Gfx_Path_Data *pd,
  unsigned int *commands, unsigned int *points)
 {
@@ -206,7 +206,7 @@ _efl_gfx_path_length_get(Eo *obj EINA_UNUSED, 
Efl_Gfx_Path_Data *pd,
if (points) *points = pd->points_count;
 }
 
-static void
+EOLIAN static void
 _efl_gfx_path_bounds_get(Eo *obj EINA_UNUSED, Efl_Gfx_Path_Data *pd, Eina_Rect 
*r)
 {
double minx, miny, maxx, maxy;
@@ -232,7 +232,7 @@ _efl_gfx_path_bounds_get(Eo *obj EINA_UNUSED, 
Efl_Gfx_Path_Data *pd, Eina_Rect *
EINA_RECTANGLE_SET(r, minx, miny, (maxx - minx), (maxy - miny));
 }
 
-static void
+EOLIAN static void
 _efl_gfx_path_current_get(Eo *obj EINA_UNUSED, Efl_Gfx_Path_Data *pd,
double *x, double *y)
 {
@@ -240,7 +240,7 @@ _efl_gfx_path_current_get(Eo *obj EINA_UNUSED, 
Efl_Gfx_Path_Data *pd,
if (y) *y = pd->current.y;
 }
 
-static void
+EOLIAN static void
 _efl_gfx_path_current_ctrl_get(Eo *obj EINA_UNUSED, Efl_Gfx_Path_Data *pd,
 double *x, double *y)
 {
@@ -248,7 +248,7 @@ _efl_gfx_path_current_ctrl_get(Eo *obj EINA_UNUSED, 
Efl_Gfx_Path_Data *pd,
if (y) *y = pd->current_ctrl.y;
 }
 
-static Eina_Bool
+EOLIAN static Eina_Bool
 _efl_gfx_path_equal_commands_internal(Efl_Gfx_Path_Data *a,
Efl_Gfx_Path_Data *b)
 {
@@ -272,7 +272,7 @@ interpolate(double from, double to, double pos_map)
return (from * (1.0 - pos_map)) + (to * pos_map);
 }
 
-static Eina_Bool
+EOLIAN static Eina_Bool
 _efl_gfx_path_interpolate(Eo *obj, Efl_Gfx_Path_Data *pd,
const Eo *from, const Eo *to, double pos_map)
 {
@@ -345,7 +345,7 @@ _efl_gfx_path_interpolate(Eo *obj, Efl_Gfx_Path_Data *pd,
return EINA_TRUE;
 }
 
-static Eina_Bool
+EOLIAN static Eina_Bool
 _efl_gfx_path_equal_commands(Eo *obj EINA_UNUSED,
   Efl_Gfx_Path_Data *pd,
   const Eo *with)
@@ -358,7 +358,7 @@ _efl_gfx_path_equal_commands(Eo *obj EINA_UNUSED,
return _efl_gfx_path_equal_commands_internal(with_pd, pd);
 }
 
-static void
+EOLIAN static void
 _efl_gfx_path_reset(Eo *obj, Efl_Gfx_Path_Data *pd)
 {
free(pd->commands);
@@ -379,7 +379,7 @@ _efl_gfx_path_reset(Eo *obj, Efl_Gfx_Path_Data *pd)
efl_event_callback_legacy_call(obj, EFL_GFX_EVENT_CHANGED, NULL);
 }
 
-static void
+EOLIAN static void
 _efl_gfx_path_append_move_to(Eo *obj, Efl_Gfx_Path_Data *pd,
   double x, double y)
 {
@@ -398,7 +398,7 @@ _efl_gfx_path_append_move_to(Eo *obj, Efl_Gfx_Path_Data *pd,
efl_event_callback_legacy_call(obj, EFL_GFX_EVENT_CHANGED, NULL);
 }
 
-static void
+EOLIAN static void
 _efl_gfx_path_append_line_to(Eo *obj, Efl_Gfx_Path_Data *pd,
   double x, double y)
 {
@@ -417,7 +417,7 @@ _efl_gfx_path_append_line_to(Eo *obj, Efl_Gfx_Path_Data *pd,
efl_event_callback_legacy_call(obj, EFL_GFX_EVENT_CHANGED, NULL);
 }
 
-static void
+EOLIAN static void
 _efl_gfx_path_append_cubic_to(Eo *obj, Efl_Gfx_Path_Data *pd,
double ctrl_x0, double ctrl_y0,
double ctrl_x1, double ctrl_y1,
@@ -445,7 +445,7 @@ _efl_gfx_path_append_cubic_to(Eo *obj, Efl_Gfx_Path_Data 
*pd,
efl_event_callback_legacy_call(obj, EFL_GFX_EVENT_CHANGED, NULL);
 }
 
-static void
+EOLIAN static void
 _efl_gfx_path_append_scubic_to(Eo *obj, 

[EGIT] [core/efl] master 01/03: Efl.Gfx.Shape: implement Gfx.Path.interpolate{}

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=ad28bdfb5a464895a1a0ce3e909aa1c11529b3b3

commit ad28bdfb5a464895a1a0ce3e909aa1c11529b3b3
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Thu Nov 30 13:56:58 2017 +0900

Efl.Gfx.Shape: implement Gfx.Path.interpolate{}

This fixes the Eolian 'interpolate' redefine warning.
---
 src/lib/efl/interfaces/efl_gfx_shape.c  |  8 
 src/lib/efl/interfaces/efl_gfx_shape.eo | 18 +-
 src/lib/evas/canvas/evas_vg_shape.c |  4 ++--
 3 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/src/lib/efl/interfaces/efl_gfx_shape.c 
b/src/lib/efl/interfaces/efl_gfx_shape.c
index 45bf04da43..21e0b0c25c 100644
--- a/src/lib/efl/interfaces/efl_gfx_shape.c
+++ b/src/lib/efl/interfaces/efl_gfx_shape.c
@@ -60,9 +60,9 @@ _efl_gfx_property_get(const Eo *obj, Efl_Gfx_Property 
*property)
property->j = efl_gfx_shape_stroke_join_get(obj);
 }
 
-static Eina_Bool
-_efl_gfx_shape_interpolate(Eo *obj, Efl_Gfx_Shape_Data *pd,
-   const Eo *from, const Eo *to, double pos_map)
+EOLIAN static Eina_Bool
+_efl_gfx_shape_efl_gfx_path_interpolate(Eo *obj, Efl_Gfx_Shape_Data *pd,
+const Eo *from, const Eo *to, double 
pos_map)
 {
Efl_Gfx_Shape_Data *from_pd, *to_pd;
Efl_Gfx_Property property_from, property_to;
@@ -122,7 +122,7 @@ _efl_gfx_shape_interpolate(Eo *obj, Efl_Gfx_Shape_Data *pd,
efl_gfx_shape_stroke_join_set(obj, (pos_map < 0.5) ?
  property_from.j : property_to.j);
 
-   return efl_gfx_path_interpolate(obj, from, to, pos_map);
+   return efl_gfx_path_interpolate(efl_super(obj, EFL_GFX_PATH_MIXIN), from, 
to, pos_map);
 }
 
 static void
diff --git a/src/lib/efl/interfaces/efl_gfx_shape.eo 
b/src/lib/efl/interfaces/efl_gfx_shape.eo
index e66b870615..bd3c769422 100644
--- a/src/lib/efl/interfaces/efl_gfx_shape.eo
+++ b/src/lib/efl/interfaces/efl_gfx_shape.eo
@@ -117,25 +117,9 @@ mixin Efl.Gfx.Shape (Efl.Gfx.Path)
One of $EFL_GFX_FILL_RULE_WINDING, 
$EFL_GFX_FILL_RULE_ODD_EVEN]]
  }
   }
-  interpolate {
-[[Creates intermediary shape part-way between two shapes
-
-  Sets the data properties of $obj as the linear interpolation
-  of the $from and $to objects by $pos_map.  In addition to
-  interpolating the path data, the two shapes' dash length, fill
-  color, and stroke style are also interpolated.
-
-  See also @Efl.Gfx.Path.interpolate.
-]]
-return: bool; [[$true on success, $false otherwise]]
-params {
-  @in from: const(Efl.Object); [[Source shape]]
-  @in to: const(Efl.Object); [[Destination shape]]
-  @in pos_map: double; [[Position map in range 0.0 to 1.0]]
-}
-  }
}
implements {
   Efl.Gfx.Path.copy_from;
+  Efl.Gfx.Path.interpolate;
}
 }
diff --git a/src/lib/evas/canvas/evas_vg_shape.c 
b/src/lib/evas/canvas/evas_vg_shape.c
index b15694eeb3..177d05eaa3 100644
--- a/src/lib/evas/canvas/evas_vg_shape.c
+++ b/src/lib/evas/canvas/evas_vg_shape.c
@@ -163,7 +163,7 @@ _efl_vg_shape_efl_vg_interpolate(Eo *obj,
 
r = efl_vg_interpolate(efl_super(obj, MY_CLASS), from, to, pos_map);
 
-   r &= efl_gfx_shape_interpolate(obj, from, to, pos_map);
+   r &= efl_gfx_path_interpolate(obj, from, to, pos_map);
 
if (fromd->fill && tod->fill && pd->fill)
  {
@@ -402,7 +402,7 @@ evas_vg_shape_append_svg_path(Eo *obj, const char 
*svg_path_data)
 EAPI Eina_Bool
 evas_vg_shape_interpolate(Eo *obj, const Eo *from, const Eo *to, double 
pos_map)
 {
-   return efl_gfx_shape_interpolate(obj, from, to, pos_map);
+   return efl_gfx_path_interpolate(obj, from, to, pos_map);
 }
 
 EAPI Eina_Bool

-- 

[EGIT] [core/efl] master 01/01: edje: fix the typo in prev commit

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=864fbede3e5cc36fcde0f791478bf0928217314a

commit 864fbede3e5cc36fcde0f791478bf0928217314a
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Thu Nov 30 20:02:36 2017 +0900

edje: fix the typo in prev commit
---
 src/lib/edje/edje_util.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index 06bc9ee1ba..2872317b13 100644
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -402,7 +402,7 @@ edje_object_base_scale_get(const Eo *obj)
 
ed = _edje_fetch(obj);
if (!ed->file) return 1.0;
-   return TO_DOUBLE(ed->scale);
+   return TO_DOUBLE(ed->file->base_scale);
 }
 
 EOLIAN Eina_Bool

-- 

[EGIT] [core/efl] master 01/01: edje legacy: replace Edje_Object with Evas_Object

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=5b113aaa38a09454f60b4b4423e9b908002c53a6

commit 5b113aaa38a09454f60b4b4423e9b908002c53a6
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Thu Nov 30 20:05:49 2017 +0900

edje legacy: replace Edje_Object with Evas_Object
---
 src/lib/edje/Edje_Legacy.h | 268 ++---
 1 file changed, 134 insertions(+), 134 deletions(-)

diff --git a/src/lib/edje/Edje_Legacy.h b/src/lib/edje/Edje_Legacy.h
index e13aef9a50..aaecf138bc 100644
--- a/src/lib/edje/Edje_Legacy.h
+++ b/src/lib/edje/Edje_Legacy.h
@@ -250,7 +250,7 @@ EAPI const char   *edje_load_error_str
(Edje_Load_Error error);
  *
  * @ingroup Edje_Object
  */
-EAPI Eina_Bool edje_object_part_geometry_get(const Edje_Object *obj, const 
char * part, int *x, int *y, int *w, int *h);
+EAPI Eina_Bool edje_object_part_geometry_get(const Evas_Object *obj, const 
char * part, int *x, int *y, int *w, int *h);
 
 /**
  * @brief Returns the state of the Edje part.
@@ -262,7 +262,7 @@ EAPI Eina_Bool edje_object_part_geometry_get(const 
Edje_Object *obj, const char
  *
  * @ingroup Edje_Object
  */
-EAPI const char *edje_object_part_state_get(const Edje_Object *obj, const char 
* part, double *val_ret);
+EAPI const char *edje_object_part_state_get(const Evas_Object *obj, const char 
* part, double *val_ret);
 
 /**
  * @brief Gets a handle to the Evas object implementing a given Edje part, in
@@ -288,7 +288,7 @@ EAPI const char *edje_object_part_state_get(const 
Edje_Object *obj, const char *
  *
  * @ingroup Edje_Object
  */
-EAPI const Efl_Canvas_Object *edje_object_part_object_get(const Edje_Object 
*obj, const char * part);
+EAPI const Efl_Canvas_Object *edje_object_part_object_get(const Evas_Object 
*obj, const char * part);
 
 /**
  * @brief Whether this object updates its size hints automatically.
@@ -309,7 +309,7 @@ EAPI const Efl_Canvas_Object 
*edje_object_part_object_get(const Edje_Object *obj
  *
  * @ingroup Edje_Object
  */
-EAPI void edje_object_update_hints_set(Edje_Object *obj, Eina_Bool update);
+EAPI void edje_object_update_hints_set(Evas_Object *obj, Eina_Bool update);
 
 /**
  * @brief Whether this object updates its size hints automatically.
@@ -330,7 +330,7 @@ EAPI void edje_object_update_hints_set(Edje_Object *obj, 
Eina_Bool update);
  *
  * @ingroup Edje_Object
  */
-EAPI Eina_Bool edje_object_update_hints_get(const Edje_Object *obj);
+EAPI Eina_Bool edje_object_update_hints_get(const Evas_Object *obj);
 
 /**
  * @brief Calculates the minimum required size for a given Edje object.
@@ -343,7 +343,7 @@ EAPI Eina_Bool edje_object_update_hints_get(const 
Edje_Object *obj);
  *
  * @ingroup Edje_Object
  */
-EAPI void edje_object_size_min_calc(Edje_Object *obj, int *minw, int *minh);
+EAPI void edje_object_size_min_calc(Evas_Object *obj, int *minw, int *minh);
 
 /**
  * @brief Calculates the minimum required size for a given Edje object.
@@ -370,7 +370,7 @@ EAPI void edje_object_size_min_calc(Edje_Object *obj, int 
*minw, int *minh);
  *
  * @ingroup Edje_Object
  */
-EAPI void edje_object_size_min_restricted_calc(Edje_Object *obj, int *minw, 
int *minh, int restrictedw, int restrictedh);
+EAPI void edje_object_size_min_restricted_calc(Evas_Object *obj, int *minw, 
int *minh, int restrictedw, int restrictedh);
 
 /**
  * @brief Calculates the geometry of the region, relative to a given Edje
@@ -394,7 +394,7 @@ EAPI void edje_object_size_min_restricted_calc(Edje_Object 
*obj, int *minw, int
  *
  * @ingroup Edje_Object
  */
-EAPI Eina_Bool edje_object_parts_extends_calc(Edje_Object *obj, int *x, int 
*y, int *w, int *h);
+EAPI Eina_Bool edje_object_parts_extends_calc(Evas_Object *obj, int *x, int 
*y, int *w, int *h);
 
 /**
  * @brief Forces a Size/Geometry calculation.
@@ -405,7 +405,7 @@ EAPI Eina_Bool edje_object_parts_extends_calc(Edje_Object 
*obj, int *x, int *y,
  *
  * @ingroup Edje_Object
  */
-EAPI void edje_object_calc_force(Edje_Object *obj);
+EAPI void edje_object_calc_force(Evas_Object *obj);
 
 /**
  * @brief Freezes the Edje object.
@@ -419,7 +419,7 @@ EAPI void edje_object_calc_force(Edje_Object *obj);
  *
  * @ingroup Edje_Object
  */
-EAPI int edje_object_freeze(Edje_Object *obj);
+EAPI int edje_object_freeze(Evas_Object *obj);
 
 /**
  * @brief Thaws the Edje object.
@@ -435,7 +435,7 @@ EAPI int edje_object_freeze(Edje_Object *obj);
  *
  * @ingroup Edje_Object
  */
-EAPI int edje_object_thaw(Edje_Object *obj);
+EAPI int edje_object_thaw(Evas_Object *obj);
 
 /**
  * @typedef (*Edje_Text_Change_Cb)
@@ -459,7 +459,7 @@ typedef void (*Edje_Text_Change_Cb) (void 
*data, Evas_Object *obj, c
  * @param[in] func The callback function to handle the text change
  * @param[in] data The data associated to the callback function.
  */
-EAPI void edje_object_text_change_cb_set(Edje_Object *obj, Edje_Text_Change_Cb 
func, void *data);
+EAPI void edje_object_text_change_

[EGIT] [core/efl] master 01/01: Efl.Ui.Base: remove base_scale.get{} from interface.

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=2ddea7065f0bd60764ad7b7f8118463a14a37085

commit 2ddea7065f0bd60764ad7b7f8118463a14a37085
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Thu Nov 30 19:27:04 2017 +0900

Efl.Ui.Base: remove base_scale.get{} from interface.

base_scale for edje would be legacy now.
---
 src/lib/edje/Edje_Legacy.h|  2 +-
 src/lib/edje/edje_object.eo   |  1 -
 src/lib/edje/edje_util.c  | 13 +
 src/lib/efl/interfaces/efl_ui_base.eo | 21 -
 4 files changed, 6 insertions(+), 31 deletions(-)

diff --git a/src/lib/edje/Edje_Legacy.h b/src/lib/edje/Edje_Legacy.h
index 78d9656bfe..e13aef9a50 100644
--- a/src/lib/edje/Edje_Legacy.h
+++ b/src/lib/edje/Edje_Legacy.h
@@ -1507,7 +1507,7 @@ EAPI double edje_object_scale_get(const Edje_Object *obj);
  *
  * @ingroup Edje_Object
  */
-EAPI double edje_object_base_scale_get(const Edje_Object *obj);
+EAPI double edje_object_base_scale_get(const Evas_Object *obj);
 
 /**
  * @defgroup Edje_Part_Drag Edje Drag
diff --git a/src/lib/edje/edje_object.eo b/src/lib/edje/edje_object.eo
index d077b6a3e0..2be3869e9a 100644
--- a/src/lib/edje/edje_object.eo
+++ b/src/lib/edje/edje_object.eo
@@ -126,7 +126,6 @@ class Edje.Object (Efl.Canvas.Group, Efl.File, 
Efl.Container, Efl.Part,
   Efl.Ui.Base.mirrored { set; get; }
   Efl.Ui.Base.language { set; get; }
   Efl.Ui.Base.scale { set; get; }
-  Efl.Ui.Base.base_scale { get; }
   Efl.File.load_error { get; }
   Efl.File.mmap { get; set; }
   Efl.Container.content_remove;
diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index fc47e43b13..06bc9ee1ba 100644
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -395,17 +395,14 @@ _edje_object_efl_ui_base_scale_get(Eo *obj EINA_UNUSED, 
Edje *ed)
return TO_DOUBLE(ed->scale);
 }
 
-EOLIAN double
-_edje_object_efl_ui_base_base_scale_get(Eo *obj EINA_UNUSED, Edje *ed)
-{
-   if (!ed->file) return 1.0;
-   return TO_DOUBLE(ed->file->base_scale);
-}
-
 EAPI double
 edje_object_base_scale_get(const Eo *obj)
 {
-   return efl_ui_base_scale_get(obj);
+   Edje *ed;
+
+   ed = _edje_fetch(obj);
+   if (!ed->file) return 1.0;
+   return TO_DOUBLE(ed->scale);
 }
 
 EOLIAN Eina_Bool
diff --git a/src/lib/efl/interfaces/efl_ui_base.eo 
b/src/lib/efl/interfaces/efl_ui_base.eo
index 7ddcbf0336..eb00535a2d 100644
--- a/src/lib/efl/interfaces/efl_ui_base.eo
+++ b/src/lib/efl/interfaces/efl_ui_base.eo
@@ -65,26 +65,5 @@ interface Efl.Ui.Base
   meaning individual scaling is not set)]]
  }
   }
-  @property base_scale {
- [[The base scale of a layout object (read-only).
-
-   The base scale refers to the scale for which the backing EDC file
-   was designed. By default it is 1.0 which means the EDC file was
-   designed for a scale of 1.0.
-
-   This base scale can be specified in an EDC file as the
-   collections' "base_scale" field.
-
-   If the object is not a layout, this will return 1.0.
- ]]
- get {
-[[Gets a given layout object's base_scale factor.]]
- }
- values {
-base_scale: double(1.0); [[The base_scale factor (the default value
-   is 1.0, meaning that the edc file was
-   designed based on scale 1.0).]]
- }
-  }
}
 }

-- 

[EGIT] [apps/terminology] master 01/01: title: set focus to title entry

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/apps/terminology.git/commit/?id=31285fb5dce5de80da82e75ca76b0594c4ef73b2

commit 31285fb5dce5de80da82e75ca76b0594c4ef73b2
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Tue Dec 5 13:41:51 2017 +0900

title: set focus to title entry

Focus was not coming to entry on 'set title' popup.
Set focus to a popup subobject after showing popup.

@fix
---
 src/bin/win.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bin/win.c b/src/bin/win.c
index 0d9aa29..610f8b7 100644
--- a/src/bin/win.c
+++ b/src/bin/win.c
@@ -3647,9 +3647,9 @@ term_set_title(Term *term)
 evas_object_smart_callback_add(o, "aborted", _set_title_cancel_cb, popup);
 elm_object_content_set(popup, o);
 evas_object_show(o);
-elm_object_focus_set(o, EINA_TRUE);
-
 evas_object_show(popup);
+
+elm_object_focus_set(o, EINA_TRUE);
 }
 
 static void

-- 

[EGIT] [core/efl] master 01/03: edje: rename intf Efl.Canvas.Layout.Signal to Efl.Layout.Signal

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=7b3fde4d4b9047b39a1dc0c7794500364f689325

commit 7b3fde4d4b9047b39a1dc0c7794500364f689325
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Tue Dec 5 14:39:20 2017 +0900

edje: rename intf Efl.Canvas.Layout.Signal to Efl.Layout.Signal
---
 src/Makefile_Edje.am   |  2 +-
 src/lib/edje/Edje_Eo.h |  2 +-
 src/lib/edje/edje_legacy.c |  8 +++---
 src/lib/edje/edje_message_queue.c  |  6 ++---
 src/lib/edje/edje_object.eo| 12 -
 src/lib/edje/edje_program.c|  6 ++---
 src/lib/edje/edje_smart.c  |  2 +-
 ...anvas_layout_signal.eo => efl_layout_signal.eo} |  2 +-
 src/lib/elementary/efl_ui_check.c  |  6 ++---
 src/lib/elementary/efl_ui_image.c  |  2 +-
 src/lib/elementary/efl_ui_image.eo |  4 +--
 src/lib/elementary/efl_ui_layout.c | 26 +--
 src/lib/elementary/efl_ui_layout.eo| 12 -
 src/lib/elementary/efl_ui_nstate.c |  2 +-
 src/lib/elementary/efl_ui_text.c   | 22 
 src/lib/elementary/efl_ui_text.eo  |  6 ++---
 src/lib/elementary/elc_naviframe.c |  4 +--
 src/lib/elementary/elc_popup.c |  2 +-
 src/lib/elementary/elm_entry.c | 22 
 src/lib/elementary/elm_entry.eo|  6 ++---
 src/lib/elementary/elm_naviframe.eo|  2 +-
 src/lib/elementary/elm_popup.eo|  2 +-
 src/tests/edje/edje_test_edje.c|  8 +++---
 src/tests/emotion/emotion_test_main-eo.c   | 30 +++---
 24 files changed, 98 insertions(+), 98 deletions(-)

diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am
index fd7c903e38..2c1921a7e3 100644
--- a/src/Makefile_Edje.am
+++ b/src/Makefile_Edje.am
@@ -3,7 +3,7 @@
 
 edje_eolian_files = \
lib/edje/efl_canvas_layout_calc.eo \
-   lib/edje/efl_canvas_layout_signal.eo \
+   lib/edje/efl_layout_signal.eo \
lib/edje/efl_canvas_layout_group.eo \
lib/edje/edje_object.eo \
lib/edje/efl_canvas_layout_part.eo \
diff --git a/src/lib/edje/Edje_Eo.h b/src/lib/edje/Edje_Eo.h
index 877f3bea07..9f3c7bc3bc 100644
--- a/src/lib/edje/Edje_Eo.h
+++ b/src/lib/edje/Edje_Eo.h
@@ -1,7 +1,7 @@
 #include 
 
 #include "efl_canvas_layout_calc.eo.h"
-#include "efl_canvas_layout_signal.eo.h"
+#include "efl_layout_signal.eo.h"
 #include "efl_canvas_layout_group.eo.h"
 #include "edje_object.eo.h"
 #include "edje_edit.eo.h"
diff --git a/src/lib/edje/edje_legacy.c b/src/lib/edje/edje_legacy.c
index 4bf32aa0f6..700d17cbd6 100644
--- a/src/lib/edje/edje_legacy.c
+++ b/src/lib/edje/edje_legacy.c
@@ -64,20 +64,20 @@ edje_object_part_state_get(const Edje_Object *obj, const 
char * part, double *va
 EAPI void
 edje_object_message_signal_process(Edje_Object *obj)
 {
-   efl_canvas_layout_signal_process(obj, EINA_FALSE);
+   efl_layout_signal_process(obj, EINA_FALSE);
 }
 
 /* since 1.20 */
 EAPI void
 edje_object_message_signal_recursive_process(Edje_Object *obj)
 {
-   efl_canvas_layout_signal_process(obj, EINA_TRUE);
+   efl_layout_signal_process(obj, EINA_TRUE);
 }
 
 EAPI void
 edje_object_signal_callback_add(Evas_Object *obj, const char *emission, const 
char *source, Edje_Signal_Cb func, void *data)
 {
-   efl_canvas_layout_signal_callback_add(obj, emission, source, 
(Efl_Signal_Cb) func, data);
+   efl_layout_signal_callback_add(obj, emission, source, (Efl_Signal_Cb) func, 
data);
 }
 
 EAPI void *
@@ -133,7 +133,7 @@ edje_object_signal_callback_del(Evas_Object *obj, const 
char *emission, const ch
 EAPI void
 edje_object_signal_emit(Evas_Object *obj, const char *emission, const char 
*source)
 {
-   efl_canvas_layout_signal_emit(obj, emission, source);
+   efl_layout_signal_emit(obj, emission, source);
 }
 
 EAPI Eina_Bool
diff --git a/src/lib/edje/edje_message_queue.c 
b/src/lib/edje/edje_message_queue.c
index 4e132154ec..d971582e4d 100644
--- a/src/lib/edje/edje_message_queue.c
+++ b/src/lib/edje/edje_message_queue.c
@@ -32,7 +32,7 @@ _edje_object_message_propagate_send(Evas_Object *obj, 
Edje_Message_Type type, in
 }
 
 EOLIAN void
-_edje_object_efl_canvas_layout_signal_message_send(Eo *obj, Edje *pd 
EINA_UNUSED, int id, const Eina_Value val)
+_edje_object_efl_layout_signal_message_send(Eo *obj, Edje *pd EINA_UNUSED, int 
id, const Eina_Value val)
 {
const Eina_Value_Type *valtype;
Edje_Message_Type msgtype;
@@ -228,7 +228,7 @@ end:
 }
 
 EOLIAN void
-_edje_object_efl_canvas_layout_signal_signal_process(Eo *obj, Edje *ed, 
Eina_Bool recurse)
+_edje_object_efl_layout_signal_signal_process(Eo *obj, Edje *ed, Eina_Boo

[EGIT] [core/efl] master 02/03: edje: rename intf Efl.Canvas.Layout_Calc to Efl.Layout.Calc

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=c7aa3b2f83bfed886cf5bcd53dea21d0c9d11a99

commit c7aa3b2f83bfed886cf5bcd53dea21d0c9d11a99
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Tue Dec 5 15:29:07 2017 +0900

edje: rename intf Efl.Canvas.Layout_Calc to Efl.Layout.Calc
---
 src/Makefile_Edje.am   |  2 +-
 src/lib/edje/Edje_Eo.h |  2 +-
 src/lib/edje/edje_legacy.c | 14 +++---
 src/lib/edje/edje_object.eo| 14 +++---
 src/lib/edje/edje_private.h|  2 +-
 src/lib/edje/edje_smart.c  |  2 +-
 src/lib/edje/edje_util.c   | 14 +++---
 .../edje/{efl_canvas_layout_calc.eo => efl_layout_calc.eo} |  2 +-
 src/lib/elementary/efl_ui_image.c  |  8 
 src/lib/elementary/efl_ui_image.eo |  6 +++---
 src/lib/elementary/efl_ui_layout.c |  8 
 src/lib/elementary/efl_ui_layout.eo|  6 +++---
 src/tests/edje/edje_test_edje.c|  4 ++--
 13 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am
index 2c1921a7e3..e87c45e9e6 100644
--- a/src/Makefile_Edje.am
+++ b/src/Makefile_Edje.am
@@ -2,7 +2,7 @@
 ### Library
 
 edje_eolian_files = \
-   lib/edje/efl_canvas_layout_calc.eo \
+   lib/edje/efl_layout_calc.eo \
lib/edje/efl_layout_signal.eo \
lib/edje/efl_canvas_layout_group.eo \
lib/edje/edje_object.eo \
diff --git a/src/lib/edje/Edje_Eo.h b/src/lib/edje/Edje_Eo.h
index 9f3c7bc3bc..cd2465e7ee 100644
--- a/src/lib/edje/Edje_Eo.h
+++ b/src/lib/edje/Edje_Eo.h
@@ -1,6 +1,6 @@
 #include 
 
-#include "efl_canvas_layout_calc.eo.h"
+#include "efl_layout_calc.eo.h"
 #include "efl_layout_signal.eo.h"
 #include "efl_canvas_layout_group.eo.h"
 #include "edje_object.eo.h"
diff --git a/src/lib/edje/edje_legacy.c b/src/lib/edje/edje_legacy.c
index 700d17cbd6..526b31a113 100644
--- a/src/lib/edje/edje_legacy.c
+++ b/src/lib/edje/edje_legacy.c
@@ -1090,13 +1090,13 @@ edje_object_part_text_insert(Eo *obj, const char *part, 
const char *text)
 EAPI void
 edje_object_update_hints_set(Edje_Object *obj, Eina_Bool update)
 {
-   efl_canvas_layout_calc_auto_update_hints_set(obj, update);
+   efl_layout_calc_auto_update_hints_set(obj, update);
 }
 
 EAPI Eina_Bool
 edje_object_update_hints_get(const Edje_Object *obj)
 {
-   return efl_canvas_layout_calc_auto_update_hints_get(obj);
+   return efl_layout_calc_auto_update_hints_get(obj);
 }
 
 EAPI void
@@ -1118,7 +1118,7 @@ edje_object_size_min_restricted_calc(Edje_Object *obj, 
int *minw, int *minh, int
 if (minh) *minh = sz.h;
 return;
  }
-   sz = efl_canvas_layout_calc_size_min(obj, EINA_SIZE2D(restrictedw, 
restrictedh));
+   sz = efl_layout_calc_size_min(obj, EINA_SIZE2D(restrictedw, restrictedh));
if (minw) *minw = sz.w;
if (minh) *minh = sz.h;
 }
@@ -1130,7 +1130,7 @@ edje_object_parts_extends_calc(Edje_Object *obj, int *x, 
int *y, int *w, int *h)
Edje *ed;
 
ed = _edje_fetch(obj);
-   if (ed) r = efl_canvas_layout_calc_parts_extends(obj);
+   if (ed) r = efl_layout_calc_parts_extends(obj);
if (x) *x = r.x;
if (y) *y = r.y;
if (w) *w = r.w;
@@ -1141,19 +1141,19 @@ edje_object_parts_extends_calc(Edje_Object *obj, int 
*x, int *y, int *w, int *h)
 EAPI int
 edje_object_freeze(Edje_Object *obj)
 {
-   return efl_canvas_layout_calc_freeze(obj);
+   return efl_layout_calc_freeze(obj);
 }
 
 EAPI int
 edje_object_thaw(Edje_Object *obj)
 {
-   return efl_canvas_layout_calc_thaw(obj);
+   return efl_layout_calc_thaw(obj);
 }
 
 EAPI void
 edje_object_calc_force(Edje_Object *obj)
 {
-   efl_canvas_layout_calc_force(obj);
+   efl_layout_calc_force(obj);
 }
 
 EAPI void
diff --git a/src/lib/edje/edje_object.eo b/src/lib/edje/edje_object.eo
index af514c52e2..a23fb94aca 100644
--- a/src/lib/edje/edje_object.eo
+++ b/src/lib/edje/edje_object.eo
@@ -3,7 +3,7 @@ import edje_types;
 // FIXME: This EO doc needs a direct link to the "edcref" doc
 
 class Edje.Object (Efl.Canvas.Group, Efl.File, Efl.Container, Efl.Part,
-   Efl.Observer, Efl.Ui.Base, Efl.Canvas.Layout_Calc,
+   Efl.Observer, Efl.Ui.Base, Efl.Layout.Calc,
Efl.Layout.Signal, Efl.Canvas.Layout_Group,
Efl.Player, Efl.Gfx.Color_Class, Efl.Gfx.Text_Class,
Efl.Gfx.Size_Class)
@@ -109,12 +109,12 @@ class Edje.Object (Efl.Canvas.Group, Efl.File, 
Efl.Container, Efl.Part,
   Efl.Gfx.Size_Class.size_class { get; set; }
   Efl.Gfx.Size_Class.size_class_del;
   Efl.Canvas.Group.group_calcu

[EGIT] [core/efl] master 03/03: edje: rename intf Efl.Canvas.Layout_Group to Efl.Layout.Group

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=bdc396945281290c3d4b0622d9f9a3945af01097

commit bdc396945281290c3d4b0622d9f9a3945af01097
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Tue Dec 5 16:00:08 2017 +0900

edje: rename intf Efl.Canvas.Layout_Group to Efl.Layout.Group
---
 src/Makefile_Edje.am   |  2 +-
 src/lib/edje/Edje_Eo.h |  2 +-
 src/lib/edje/Edje_Legacy.h |  2 +-
 src/lib/edje/edje_legacy.c |  4 ++--
 src/lib/edje/edje_object.eo|  8 
 src/lib/edje/edje_smart.c  |  2 +-
 src/lib/edje/edje_util.c   |  6 +++---
 .../{efl_canvas_layout_group.eo => efl_layout_group.eo}|  2 +-
 src/lib/elementary/efl_ui_image.c  |  8 
 src/lib/elementary/efl_ui_image.eo |  6 +++---
 src/lib/elementary/efl_ui_image_zoomable.c |  8 
 src/lib/elementary/efl_ui_image_zoomable.eo|  4 ++--
 src/lib/elementary/efl_ui_layout.c | 14 +++---
 src/lib/elementary/efl_ui_layout.eo|  8 
 14 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am
index e87c45e9e6..1f7ffe980f 100644
--- a/src/Makefile_Edje.am
+++ b/src/Makefile_Edje.am
@@ -4,7 +4,7 @@
 edje_eolian_files = \
lib/edje/efl_layout_calc.eo \
lib/edje/efl_layout_signal.eo \
-   lib/edje/efl_canvas_layout_group.eo \
+   lib/edje/efl_layout_group.eo \
lib/edje/edje_object.eo \
lib/edje/efl_canvas_layout_part.eo \
lib/edje/efl_canvas_layout_part_box.eo \
diff --git a/src/lib/edje/Edje_Eo.h b/src/lib/edje/Edje_Eo.h
index cd2465e7ee..663d6c5244 100644
--- a/src/lib/edje/Edje_Eo.h
+++ b/src/lib/edje/Edje_Eo.h
@@ -2,7 +2,7 @@
 
 #include "efl_layout_calc.eo.h"
 #include "efl_layout_signal.eo.h"
-#include "efl_canvas_layout_group.eo.h"
+#include "efl_layout_group.eo.h"
 #include "edje_object.eo.h"
 #include "edje_edit.eo.h"
 
diff --git a/src/lib/edje/Edje_Legacy.h b/src/lib/edje/Edje_Legacy.h
index aaecf138bc..730b6ff64b 100644
--- a/src/lib/edje/Edje_Legacy.h
+++ b/src/lib/edje/Edje_Legacy.h
@@ -3111,4 +3111,4 @@ typedef Efl_Canvas_Layout_Part_Type Edje_Part_Type;
  */
 #include "edje_object.eo.legacy.h"
 #include "edje_edit.eo.legacy.h"
-#include "efl_canvas_layout_group.eo.legacy.h"
+#include "efl_layout_group.eo.legacy.h"
diff --git a/src/lib/edje/edje_legacy.c b/src/lib/edje/edje_legacy.c
index 526b31a113..2ead3b40be 100644
--- a/src/lib/edje/edje_legacy.c
+++ b/src/lib/edje/edje_legacy.c
@@ -1188,7 +1188,7 @@ EAPI void
 edje_object_size_min_get(const Edje_Object *obj, int *minw, int *minh)
 {
Eina_Size2D sz;
-   sz = efl_canvas_layout_group_size_min_get(obj);
+   sz = efl_layout_group_size_min_get(obj);
if (minw) *minw = sz.w;
if (minh) *minh = sz.h;
 }
@@ -1197,7 +1197,7 @@ EAPI void
 edje_object_size_max_get(const Edje_Object *obj, int *maxw, int *maxh)
 {
Eina_Size2D sz;
-   sz = efl_canvas_layout_group_size_max_get(obj);
+   sz = efl_layout_group_size_max_get(obj);
if (maxw) *maxw = sz.w;
if (maxh) *maxh = sz.h;
 }
diff --git a/src/lib/edje/edje_object.eo b/src/lib/edje/edje_object.eo
index a23fb94aca..5af4a417b5 100644
--- a/src/lib/edje/edje_object.eo
+++ b/src/lib/edje/edje_object.eo
@@ -4,7 +4,7 @@ import edje_types;
 
 class Edje.Object (Efl.Canvas.Group, Efl.File, Efl.Container, Efl.Part,
Efl.Observer, Efl.Ui.Base, Efl.Layout.Calc,
-   Efl.Layout.Signal, Efl.Canvas.Layout_Group,
+   Efl.Layout.Signal, Efl.Layout.Group,
Efl.Player, Efl.Gfx.Color_Class, Efl.Gfx.Text_Class,
Efl.Gfx.Size_Class)
 {
@@ -115,9 +115,9 @@ class Edje.Object (Efl.Canvas.Group, Efl.File, 
Efl.Container, Efl.Part,
   Efl.Layout.Calc.calc_freeze;
   Efl.Layout.Calc.calc_thaw;
   Efl.Layout.Calc.calc_force;
-  Efl.Canvas.Layout_Group.group_size_min { get; }
-  Efl.Canvas.Layout_Group.group_size_max { get; }
-  Efl.Canvas.Layout_Group.group_data { get; }
+  Efl.Layout.Group.group_size_min { get; }
+  Efl.Layout.Group.group_size_max { get; }
+  Efl.Layout.Group.group_data { get; }
   Efl.Layout.Signal.message_send;
   Efl.Layout.Signal.signal_callback_add;
   Efl.Layout.Signal.signal_callback_del;
diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c
index 2a029d7839..6c2406d13a 100644
--- a/src/lib/edje/edje_smart.c
+++ b/src/lib/edje/edje_smart.c
@@ -546,4 +546,4 @@ _edje_object_efl_player_play_speed_get(Eo *obj EINA_UNUSED, 
Edje *p

[EGIT] [core/efl] master 01/01: efl.image.load: fix eolian redefine warnings for load_error{}

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=3726af831350ac042831c628b7ae1ef1ac88cd69

commit 3726af831350ac042831c628b7ae1ef1ac88cd69
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Thu Dec 14 13:42:41 2017 +0900

efl.image.load: fix eolian redefine warnings for load_error{}

load_error{} was defined in efl.file as well.
remove load_error{} from efl.image.load intf and implement
Efl.File.load_error{} instead.

Ref T6514
---
 src/bin/eolian_mono/eolian/mono/function_blacklist.hh |  1 -
 src/examples/evas/evas-object-manipulation-eo.c   |  4 ++--
 src/lib/efl/interfaces/efl_image_load.eo  | 12 
 src/lib/evas/canvas/efl_canvas_image.c|  4 ++--
 src/lib/evas/canvas/efl_canvas_image.eo   |  2 +-
 5 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/src/bin/eolian_mono/eolian/mono/function_blacklist.hh 
b/src/bin/eolian_mono/eolian/mono/function_blacklist.hh
index 51e0a433c1..314235b5dc 100644
--- a/src/bin/eolian_mono/eolian/mono/function_blacklist.hh
+++ b/src/bin/eolian_mono/eolian/mono/function_blacklist.hh
@@ -8,7 +8,6 @@ inline bool is_function_blacklisted(std::string const& c_name)
   return
 c_name == "efl_event_callback_array_priority_add"
 || c_name == "efl_player_position_get"
-|| c_name == "efl_image_load_error_get"
 || c_name == "efl_text_font_source_get"
 || c_name == "efl_text_font_source_set"
 || c_name == "efl_ui_focus_manager_focus_get"
diff --git a/src/examples/evas/evas-object-manipulation-eo.c 
b/src/examples/evas/evas-object-manipulation-eo.c
index dfe02bb0c2..ef61a50aec 100644
--- a/src/examples/evas/evas-object-manipulation-eo.c
+++ b/src/examples/evas/evas-object-manipulation-eo.c
@@ -194,7 +194,7 @@ main(void)
 * will be deleted automatically by parent.*/
 
efl_file_set(d.img, img_path, NULL);
-   err = efl_image_load_error_get(d.img);
+   err = efl_file_load_error_get(d.img);
 
if (err != EVAS_LOAD_ERROR_NONE)
  {
@@ -212,7 +212,7 @@ main(void)
/* border on the image's clipper, here just to emphasize its position */
d.clipper_border = efl_add(EFL_CANVAS_IMAGE_CLASS, d.canvas);
efl_file_set(d.clipper_border, border_img_path, NULL);
-   err = efl_image_load_error_get(d.clipper_border);
+   err = efl_file_load_error_get(d.clipper_border);
 
if (err != EVAS_LOAD_ERROR_NONE)
  {
diff --git a/src/lib/efl/interfaces/efl_image_load.eo 
b/src/lib/efl/interfaces/efl_image_load.eo
index 65e4853111..703dbebe1b 100644
--- a/src/lib/efl/interfaces/efl_image_load.eo
+++ b/src/lib/efl/interfaces/efl_image_load.eo
@@ -163,18 +163,6 @@ interface Efl.Image.Load ()
 div: int; [[The scale down dividing factor.]]
  }
   }
-  @property load_error {
- get {
-[[Retrieves a number representing any error that occurred during
-  the last loading of the given image object's source image.
-]]
-return: Efl.Image.Load.Error @warn_unused; [[
-   A value giving the last error that occurred, one of
-   @Efl.Image.Load.Error values. @Efl.Image.Load.Error.none is
-   returned if there was no error.
-]]
- }
-  }
   @property load_skip_header {
  [[Initial load should skip header check and leave it all to data load
 
diff --git a/src/lib/evas/canvas/efl_canvas_image.c 
b/src/lib/evas/canvas/efl_canvas_image.c
index 075b5e6c1c..4a1de7cc97 100644
--- a/src/lib/evas/canvas/efl_canvas_image.c
+++ b/src/lib/evas/canvas/efl_canvas_image.c
@@ -65,7 +65,7 @@ _evas_image_load_error_get(const Eo *eo_obj)
 }
 
 EOLIAN static Efl_Image_Load_Error
-_efl_canvas_image_efl_image_load_load_error_get(Eo *eo_obj, void *_pd 
EINA_UNUSED EINA_UNUSED)
+_efl_canvas_image_efl_file_load_error_get(Eo *eo_obj, void *_pd EINA_UNUSED 
EINA_UNUSED)
 {
return _evas_image_load_error_get(eo_obj);
 }
@@ -784,7 +784,7 @@ _efl_canvas_image_efl_object_dbg_info_get(Eo *obj, void *pd 
EINA_UNUSED, Efl_Dbg
 {
efl_dbg_info_get(efl_super(obj, MY_CLASS), root);
 
-   if ((efl_image_load_error_get(obj) != EFL_IMAGE_LOAD_ERROR_NONE) &&
+   if ((efl_file_load_error_get(obj) != EFL_IMAGE_LOAD_ERROR_NONE) &&
(root))
  {
 Efl_Dbg_Info *group = EFL_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME);
diff --git a/src/lib/evas/canvas/efl_canvas_image.eo 
b/src/lib/evas/canvas/efl_canvas_image.eo
index 63307ef520..0164b2d038 100644
--- a/src/lib/evas/canvas/efl_canvas_image.eo
+++ b/src/lib/evas/canvas/efl_canvas_image.eo
@@ -17,13 +17,13 @@ class Efl.Canvas.Image (Efl.Canvas.Image.Internal, 
Efl.Gfx.Buffer,
   Efl.Gfx.Buffer.buffer_map;
   Efl.Gfx.Buffer.buffer_unmap;
   Efl.File.mmap { get; set; }
+  Efl.File.load_error { get; }
   Efl.Image.Animated.animated { get; }
   Efl.Image.Anim

[EGIT] [core/enlightenment] master 01/01: Revert "re-enable building against latest efl git"

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=4d340f211471830908eb51f249a2b3aa7910c19e

commit 4d340f211471830908eb51f249a2b3aa7910c19e
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Dec 13 13:26:37 2017 +0900

Revert "re-enable building against latest efl git"

This reverts commit a782beba82e77c374228be2aaf1cfa09bcc40aaf.

the legacy API was missing. I added it in EFL now.
Refer 1264fb4af2 in EFL.

Fixes T6500
---
 src/bin/e_comp_object.c | 12 +---
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index acc3bc5b6..c1a7941c7 100644
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -3365,17 +3365,7 @@ e_comp_object_coords_inside_input_area(Evas_Object *obj, 
int x, int y)
 Eina_Array_Iterator it;
 
 EINA_ARRAY_ITER_NEXT(cw->input_objs, i, rect, it)
-  {
-#ifndef EFL_VERSION_1_21
- if (evas_object_pointer_coords_inside_get(rect, x, y))
-   return EINA_TRUE;
-#else
- Eina_Position2D pos = {x, y};
-
- if (evas_object_coords_inside_get(rect, pos))
-   return EINA_TRUE;
-#endif
-  }
+  if (evas_object_pointer_coords_inside_get(rect, x, y)) return 
EINA_TRUE;
 
 return EINA_FALSE;
  }

-- 

[EGIT] [core/efl] master 01/01: Efl.Canvas.Object: add legacy APIs for pointer_coords_inside_get()

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=1264fb4af2d8cc98fc43589253c1988650b80880

commit 1264fb4af2d8cc98fc43589253c1988650b80880
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Dec 13 13:42:17 2017 +0900

Efl.Canvas.Object: add legacy APIs for pointer_coords_inside_get()

fix the b0rkage after 8fb49de5eb179ba
---
 src/lib/evas/Evas_Legacy.h   | 21 +
 src/lib/evas/canvas/efl_canvas_object.eo |  1 +
 src/lib/evas/canvas/evas_object_main.c   |  8 
 3 files changed, 30 insertions(+)

diff --git a/src/lib/evas/Evas_Legacy.h b/src/lib/evas/Evas_Legacy.h
index 94b06d0f12..9c29fb1b2a 100644
--- a/src/lib/evas/Evas_Legacy.h
+++ b/src/lib/evas/Evas_Legacy.h
@@ -2243,6 +2243,27 @@ EAPI Eina_Bool 
evas_object_pointer_inside_by_device_get(const Evas_Object *obj,
  */
 EAPI Eina_Bool evas_object_pointer_inside_get(const Evas_Object *obj) 
EINA_WARN_UNUSED_RESULT;
 
+/**
+ * @brief Returns whether the coords are logically inside the object.
+ *
+ * When this function is called it will return a value of either @c false or
+ * @c true, depending on if the coords are inside the object's current
+ * geometry.
+ *
+ * A return value of @c true indicates the position is logically inside the
+ * object, and @c false implies it is logically outside the object.
+ *
+ * If @c e is not a valid object, the return value is undefined.
+ *
+ * @param[in] x The canvas-relative x coordinate.
+ * @param[in] y The canvas-relative y coordinate.
+ *
+ * @return @c true if the coords are inside the object, @c false otherwise
+ *
+ * @ingroup Evas_Object
+ */
+
+EAPI Eina_Bool evas_object_pointer_coords_inside_get(const Evas_Object 
*eo_obj, int x, int y) EINA_WARN_UNUSED_RESULT;
 
 #include "canvas/efl_canvas_object.eo.legacy.h"
 
diff --git a/src/lib/evas/canvas/efl_canvas_object.eo 
b/src/lib/evas/canvas/efl_canvas_object.eo
index b2c1e4c864..011865d570 100644
--- a/src/lib/evas/canvas/efl_canvas_object.eo
+++ b/src/lib/evas/canvas/efl_canvas_object.eo
@@ -566,6 +566,7 @@ abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx, 
Efl.Gfx.Stack, Efl.Animator,
 
If $e is not a valid object, the return value is undefined.
   ]]
+  legacy: null;
  }
  keys {
 pos: Eina.Position2D; [[The position in pixels.]]
diff --git a/src/lib/evas/canvas/evas_object_main.c 
b/src/lib/evas/canvas/evas_object_main.c
index 5e2313d40f..afee978ced 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -2971,6 +2971,14 @@ evas_object_pointer_inside_by_device_get(const 
Evas_Object *eo_obj, Efl_Input_De
 }
 
 EAPI Eina_Bool
+evas_object_pointer_coords_inside_get(const Evas_Object *eo_obj, int x, int y)
+{
+   Eina_Position2D pos = EINA_POSITION2D(x, y);
+
+   return efl_canvas_object_coords_inside_get(eo_obj, pos);
+}
+
+EAPI Eina_Bool
 evas_object_pointer_inside_get(const Evas_Object *eo_obj)
 {
return evas_object_pointer_inside_by_device_get(eo_obj, NULL);

-- 

[EGIT] [core/efl] master 01/01: Efl.Ui.Slider_Interval: remove smart data associated with class.

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=9ba451c98addabe2f965312a4bea26f8a3f1da90

commit 9ba451c98addabe2f965312a4bea26f8a3f1da90
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Tue Nov 14 09:54:42 2017 +0900

Efl.Ui.Slider_Interval: remove smart data associated with class.

Its not getting used anywhere.
---
 src/lib/elementary/efl_ui_slider_interval.c  | 10 +++---
 src/lib/elementary/efl_ui_slider_interval.eo |  1 +
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/lib/elementary/efl_ui_slider_interval.c 
b/src/lib/elementary/efl_ui_slider_interval.c
index c9bcca1d53..8002879b7f 100644
--- a/src/lib/elementary/efl_ui_slider_interval.c
+++ b/src/lib/elementary/efl_ui_slider_interval.c
@@ -13,12 +13,8 @@
 #define MY_CLASS EFL_UI_SLIDER_INTERVAL_CLASS
 #define MY_CLASS_NAME "Efl.Ui.Slider_Interval"
 
-typedef struct
-{
-} Efl_Ui_Slider_Interval_Data;
-
 EOLIAN static void
-_efl_ui_slider_interval_interval_value_get(Eo *obj, 
Efl_Ui_Slider_Interval_Data *sd EINA_UNUSED, double *from, double *to)
+_efl_ui_slider_interval_interval_value_get(Eo *obj, void *sd EINA_UNUSED, 
double *from, double *to)
 {
Efl_Ui_Slider_Data *pd =  efl_data_scope_get(obj, EFL_UI_SLIDER_CLASS);
if (from) *from = fmin(pd->intvl_from, pd->intvl_to);
@@ -90,7 +86,7 @@ _visuals_refresh(Eo *obj)
 }
 
 EOLIAN static void
-_efl_ui_slider_interval_interval_value_set(Eo *obj, 
Efl_Ui_Slider_Interval_Data *sd EINA_UNUSED, double from, double to)
+_efl_ui_slider_interval_interval_value_set(Eo *obj, void *sd EINA_UNUSED, 
double from, double to)
 {
Efl_Ui_Slider_Data *pd =  efl_data_scope_get(obj, EFL_UI_SLIDER_CLASS);
 
@@ -105,7 +101,7 @@ _efl_ui_slider_interval_interval_value_set(Eo *obj, 
Efl_Ui_Slider_Interval_Data
 }
 
 EOLIAN static Efl_Object *
-_efl_ui_slider_interval_efl_object_finalize(Eo *obj, 
Efl_Ui_Slider_Interval_Data *sd EINA_UNUSED)
+_efl_ui_slider_interval_efl_object_finalize(Eo *obj, void *sd EINA_UNUSED)
 {
Efl_Ui_Slider_Data *pd =  efl_data_scope_get(obj, EFL_UI_SLIDER_CLASS);
 
diff --git a/src/lib/elementary/efl_ui_slider_interval.eo 
b/src/lib/elementary/efl_ui_slider_interval.eo
index 9c86c463c2..3141fbbaac 100644
--- a/src/lib/elementary/efl_ui_slider_interval.eo
+++ b/src/lib/elementary/efl_ui_slider_interval.eo
@@ -6,6 +6,7 @@ class Efl.Ui.Slider_Interval (Efl.Ui.Slider)
 
   @since 1.21
 ]]
+data: null;
 legacy_prefix: null;
 methods {
 @property interval_value {

-- 

[EGIT] [core/efl] master 01/01: Efl.Ui.Format: Add support for "struct tm" in string format.

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=302cc259ff27c7a912f8335b1910edfe39ae30ec

commit 302cc259ff27c7a912f8335b1910edfe39ae30ec
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Tue Nov 14 10:51:03 2017 +0900

Efl.Ui.Format: Add support for "struct tm" in string format.
---
 src/lib/efl/interfaces/efl_ui_format.c | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/lib/efl/interfaces/efl_ui_format.c 
b/src/lib/efl/interfaces/efl_ui_format.c
index c0dd9d6b42..b55cda074d 100644
--- a/src/lib/efl/interfaces/efl_ui_format.c
+++ b/src/lib/efl/interfaces/efl_ui_format.c
@@ -24,7 +24,12 @@ _default_format_cb(void *data, Eina_Strbuf *str, const 
Eina_Value value)
 eina_value_get(, );
 eina_strbuf_append_printf(str, sd->template, v);
  }
-   //XXX: handle other types e.g. struct tm
+   else if (type == EINA_VALUE_TYPE_TM)
+ {
+struct tm v;
+eina_value_get(, );
+eina_strbuf_append_strftime(str, sd->template, );
+ }
else
  {
 char *v = eina_value_to_string();

-- 

[EGIT] [core/efl] master 01/01: test calendar: make format callback function better

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=20a0d8c26eac9ceaa594e384885cf2df7d347e17

commit 20a0d8c26eac9ceaa594e384885cf2df7d347e17
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Tue Nov 14 10:30:55 2017 +0900

test calendar: make format callback function better

Add comments too.
---
 src/bin/elementary/test_calendar.c | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/bin/elementary/test_calendar.c 
b/src/bin/elementary/test_calendar.c
index dbcf9463ad..d4c08d3752 100644
--- a/src/bin/elementary/test_calendar.c
+++ b/src/bin/elementary/test_calendar.c
@@ -409,11 +409,12 @@ _cal_format_cb(void *data EINA_UNUSED, Eina_Strbuf *str, 
const Eina_Value value)
 {
struct tm current_time;
 
-   if (eina_value_type_get() == EINA_VALUE_TYPE_TM)
- {
-eina_value_get(, _time);
-eina_strbuf_append_strftime(str, "<< %b %y >>", _time);
- }
+   //return if the value type is other than EINA_VALUE_TYPE_TM
+   if (eina_value_type_get() != EINA_VALUE_TYPE_TM)
+ return;
+
+   eina_value_get(, _time);
+   eina_strbuf_append_strftime(str, "<< %b %y >>", _time);
 }
 
 void

-- 

[EGIT] [core/efl] master 01/01: test calendar: Add test case for string format func.

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=ee89f8767305326f63a196b9290cabc99e857c87

commit ee89f8767305326f63a196b9290cabc99e857c87
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Tue Nov 14 11:08:17 2017 +0900

test calendar: Add test case for string format func.
---
 src/bin/elementary/test_calendar.c | 28 +---
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/bin/elementary/test_calendar.c 
b/src/bin/elementary/test_calendar.c
index d4c08d3752..34064395ac 100644
--- a/src/bin/elementary/test_calendar.c
+++ b/src/bin/elementary/test_calendar.c
@@ -420,7 +420,7 @@ _cal_format_cb(void *data EINA_UNUSED, Eina_Strbuf *str, 
const Eina_Value value)
 void
 test_efl_ui_calendar(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, 
void *event_info EINA_UNUSED)
 {
-   Evas_Object *win, *box, *cal;
+   Evas_Object *win, *box;
struct tm selected_date, min_date, max_date;
time_t current_date;
 
@@ -433,20 +433,26 @@ test_efl_ui_calendar(void *data EINA_UNUSED, Evas_Object 
*obj EINA_UNUSED, void
 
win = efl_add(EFL_UI_WIN_CLASS, NULL,
  efl_text_set(efl_added, "Efl Ui Calendar"),
-efl_ui_win_autodel_set(efl_added, EINA_TRUE));
+ efl_ui_win_autodel_set(efl_added, EINA_TRUE));
 
box = efl_add(EFL_UI_BOX_CLASS, win,
- efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL),
  efl_content_set(win, efl_added));
 
-   cal = efl_add(EFL_UI_CALENDAR_CLASS, win,
- efl_ui_calendar_date_min_set(efl_added, min_date),
- efl_ui_calendar_date_max_set(efl_added, max_date),
- efl_ui_calendar_date_set(efl_added, selected_date),
- efl_event_callback_add(efl_added, 
EFL_UI_CALENDAR_EVENT_CHANGED, _cal_changed_cb, NULL),
- efl_pack(box, efl_added));
-
-   efl_ui_format_cb_set(cal, NULL, _cal_format_cb, NULL);
+   efl_add(EFL_UI_CALENDAR_CLASS, win,
+   efl_ui_calendar_date_min_set(efl_added, min_date),
+   efl_ui_calendar_date_max_set(efl_added, max_date),
+   efl_ui_calendar_date_set(efl_added, selected_date),
+   efl_event_callback_add(efl_added, EFL_UI_CALENDAR_EVENT_CHANGED, 
_cal_changed_cb, NULL),
+   efl_ui_format_string_set(efl_added, "%b"),
+   efl_pack(box, efl_added));
+
+   efl_add(EFL_UI_CALENDAR_CLASS, win,
+   efl_ui_calendar_date_min_set(efl_added, min_date),
+   efl_ui_calendar_date_max_set(efl_added, max_date),
+   efl_ui_calendar_date_set(efl_added, selected_date),
+   efl_event_callback_add(efl_added, EFL_UI_CALENDAR_EVENT_CHANGED, 
_cal_changed_cb, NULL),
+   efl_ui_format_cb_set(efl_added, NULL, _cal_format_cb, NULL),
+   efl_pack(box, efl_added));
 
efl_gfx_size_set(win, EINA_SIZE2D(300, 300));
 }

-- 

[EGIT] [core/efl] master 01/01: elm: efl access: fix the warnings.

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=3661f719540fca170f3441c31d70aecab1dc655a

commit 3661f719540fca170f3441c31d70aecab1dc655a
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Nov 22 13:45:21 2017 +0900

elm: efl access: fix the warnings.

There were many warnings while building elm.

--->
./src/lib/elementary/efl_access.eo.h:433:55: warning: duplicate ‘const’ 
declaration specifier
 -Wduplicate-decl-specifier]
 EOAPI void efl_access_attribute_append(Eo *obj, const const char *key, 
const const char *value);
<---
---
 src/lib/elementary/efl_access.eo | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/elementary/efl_access.eo b/src/lib/elementary/efl_access.eo
index 33b361d0bb..360832b28f 100644
--- a/src/lib/elementary/efl_access.eo
+++ b/src/lib/elementary/efl_access.eo
@@ -305,8 +305,8 @@ mixin Efl.Access (Efl.Interface, Efl.Object)
  [[Add key-value pair identifying object extra attributes
  ]]
  params {
-@in key: const(string); [[The string key to give extra 
information]]
-@in value: const(string); [[The string value to give extra 
information]]
+@in key: string; [[The string key to give extra information]]
+@in value: string; [[The string value to give extra information]]
  }
   }
   attributes_clear {

-- 

[EGIT] [core/efl] master 01/01: Efl.Ui.Slider: add default indicator format to %0.2f

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=35f3019a6dffe8ae3c4f00e041966cebbc1d2049

commit 35f3019a6dffe8ae3c4f00e041966cebbc1d2049
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Fri Nov 17 14:53:48 2017 +0900

Efl.Ui.Slider: add default indicator format to %0.2f

This was broken in legacy code as well.
Thanks to @taxi2se for reporting.

elm_test -> slider -> check vertical slider

@fix
---
 src/lib/elementary/efl_ui_slider.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/lib/elementary/efl_ui_slider.c 
b/src/lib/elementary/efl_ui_slider.c
index 2eaee70940..38d56b0969 100644
--- a/src/lib/elementary/efl_ui_slider.c
+++ b/src/lib/elementary/efl_ui_slider.c
@@ -1146,6 +1146,8 @@ _efl_ui_slider_efl_canvas_group_group_add(Eo *obj, 
Efl_Ui_Slider_Data *priv)
_elm_access_callback_set
  (_elm_access_info_get(obj), ELM_ACCESS_STATE, _access_state_cb, NULL);
 
+   efl_ui_format_string_set(efl_part(obj, "indicator"), "%0.2f");
+
evas_object_smart_changed(obj);
 }
 

-- 

[EGIT] [core/efl] master 03/04: Efl.Ui.Slider: add visible_mode() as an indicator part API

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=651d9e94a0a720e7641cde952f6086a9ec13d95c

commit 651d9e94a0a720e7641cde952f6086a9ec13d95c
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Thu Nov 16 21:35:39 2017 +0900

Efl.Ui.Slider: add visible_mode() as an indicator part API

Ref T6376
---
 src/bin/elementary/test_ui_slider_interval.c | 18 +--
 src/lib/elementary/efl_ui_slider.c   | 46 ++--
 src/lib/elementary/efl_ui_slider_part.eo | 11 +++
 3 files changed, 57 insertions(+), 18 deletions(-)

diff --git a/src/bin/elementary/test_ui_slider_interval.c 
b/src/bin/elementary/test_ui_slider_interval.c
index ebd3d3de5e..c942c58fed 100644
--- a/src/bin/elementary/test_ui_slider_interval.c
+++ b/src/bin/elementary/test_ui_slider_interval.c
@@ -42,7 +42,8 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj 
EINA_UNUSED, void
 
efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, bx,
efl_text_set(efl_added, "Horizontal"),
-   efl_ui_slider_indicator_visible_mode_set(efl_added, 
EFL_UI_SLIDER_INDICATOR_VISIBLE_MODE_NONE),
+   efl_ui_slider_part_visible_mode_set(efl_part(efl_added, 
"indicator"),
+   
EFL_UI_SLIDER_INDICATOR_VISIBLE_MODE_NONE),
efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(160, 0)),
efl_ui_format_string_set(efl_part(efl_added, "indicator"), "%1.5f"),
efl_ui_slider_interval_value_set(efl_added, 0.4, 0.9),
@@ -95,9 +96,22 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object 
*obj EINA_UNUSED, void
elm_object_disabled_set(efl_added, EINA_TRUE),
efl_pack(hbx, efl_added));
 
+   efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, hbx,
+   efl_text_set(efl_added, "Always Show Indicator:"),
+   efl_ui_slider_part_visible_mode_set(efl_part(efl_added, 
"indicator"),
+   
EFL_UI_SLIDER_INDICATOR_VISIBLE_MODE_ALWAYS),
+   efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(0, 160)),
+   efl_ui_format_string_set(efl_added, "%1.0f units"),
+   efl_ui_format_string_set(efl_part(efl_added, "indicator"), "%1.0f"),
+   efl_ui_range_min_max_set(efl_added, 10, 145),
+   efl_ui_slider_step_set(efl_added, step),
+   efl_ui_direction_set(efl_added, EFL_UI_DIR_VERTICAL),
+   efl_pack(hbx, efl_added));
+
efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, bx,
efl_text_set(efl_added, "Limited (100-500)"),
-   efl_ui_slider_indicator_visible_mode_set(efl_added, 
EFL_UI_SLIDER_INDICATOR_VISIBLE_MODE_ON_FOCUS),
+   efl_ui_slider_part_visible_mode_set(efl_part(efl_added, 
"indicator"),
+   
EFL_UI_SLIDER_INDICATOR_VISIBLE_MODE_ON_FOCUS),
efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(260, 0)),
efl_ui_format_string_set(efl_added, "%1.0f units"),
efl_ui_format_string_set(efl_part(efl_added, "indicator"), "%1.0f"),
diff --git a/src/lib/elementary/efl_ui_slider.c 
b/src/lib/elementary/efl_ui_slider.c
index 095fad8662..2eaee70940 100644
--- a/src/lib/elementary/efl_ui_slider.c
+++ b/src/lib/elementary/efl_ui_slider.c
@@ -1459,6 +1459,29 @@ _efl_ui_slider_part_efl_ui_format_format_string_get(Eo 
*obj, void *_pd EINA_UNUS
return sd->indi_template;
 }
 
+EOLIAN static void
+_efl_ui_slider_part_visible_mode_set(Eo *obj, void *_pd EINA_UNUSED, 
Efl_Ui_Slider_Indicator_Visible_Mode indicator_visible_mode)
+{
+   Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS);
+   Efl_Ui_Slider_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_SLIDER_CLASS);
+
+   if (!eina_streq(pd->part, "indicator")) return;
+
+   if (sd->indicator_visible_mode == indicator_visible_mode) return;
+
+   sd->indicator_visible_mode = indicator_visible_mode;
+}
+
+EOLIAN static Efl_Ui_Slider_Indicator_Visible_Mode
+_efl_ui_slider_part_visible_mode_get(Eo *obj, void *_pd EINA_UNUSED)
+{
+   Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS);
+   Efl_Ui_Slider_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_SLIDER_CLASS);
+
+   if (!eina_streq(pd->part, "indicator")) return 
EFL_UI_SLIDER_INDICATOR_VISIBLE_MODE_NONE;
+   return sd->indicator_visible_mode;
+}
+
 #include "efl_ui_slider_part.eo.c"
 
 /* Efl.Part end */
@@ -1684,20 +1707,16 @@ elm_slider_indicator_format_function_set(Evas_Object 
*obj, slider_func_type func
 EAPI void
 elm_slider_indicator_show_on_focus_set(Evas_Object *obj, Eina_Bool flag)
 {
-   EFL_UI_SLIDER_DATA_GET_OR_RETURN(obj, sd);
-
-   if (flag)
- sd->indicator_visible_mode = ELM_SLIDER_INDICATOR_VISIBLE_MODE_ON_FOCUS;
-   else
- sd->indicator_visible_mo

[EGIT] [core/efl] master 01/04: Efl.Ui.Slider: make indicator_show_on_focus/indicator_show() legacy APIs

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=77164413cd857866a115ce2dd47e4748e8bc6eb1

commit 77164413cd857866a115ce2dd47e4748e8bc6eb1
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Thu Nov 16 10:12:51 2017 +0900

Efl.Ui.Slider: make indicator_show_on_focus/indicator_show() legacy APIs

Ref T6376
---
 src/lib/elementary/efl_ui_slider.c | 98 ++
 src/lib/elementary/efl_ui_slider.eo| 27 --
 src/lib/elementary/elm_slider_legacy.h | 46 
 3 files changed, 98 insertions(+), 73 deletions(-)

diff --git a/src/lib/elementary/efl_ui_slider.c 
b/src/lib/elementary/efl_ui_slider.c
index ad5ed4b706..43c44417d6 100644
--- a/src/lib/elementary/efl_ui_slider.c
+++ b/src/lib/elementary/efl_ui_slider.c
@@ -1230,37 +1230,6 @@ _efl_ui_slider_efl_ui_range_range_value_get(Eo *obj 
EINA_UNUSED, Efl_Ui_Slider_D
 }
 
 EOLIAN static void
-_efl_ui_slider_indicator_show_set(Eo *obj, Efl_Ui_Slider_Data *sd, Eina_Bool 
show)
-{
-   if (show)
- {
-sd->indicator_show = EINA_TRUE;
-elm_layout_signal_emit(obj, "elm,state,val,show", "elm");
-if (sd->popup)
-  edje_object_signal_emit(sd->popup, "elm,state,val,show", "elm");
-if (sd->popup2)
-  edje_object_signal_emit(sd->popup2, "elm,state,val,show", "elm");
- }
-   else
- {
-sd->indicator_show = EINA_FALSE;
-elm_layout_signal_emit(obj, "elm,state,val,hide", "elm");
-if (sd->popup)
-  edje_object_signal_emit(sd->popup, "elm,state,val,hide", "elm");
-if (sd->popup2)
-  edje_object_signal_emit(sd->popup2, "elm,state,val,hide", "elm");
- }
-
-   evas_object_smart_changed(obj);
-}
-
-EOLIAN static Eina_Bool
-_efl_ui_slider_indicator_show_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd)
-{
-   return sd->indicator_show;
-}
-
-EOLIAN static void
 _efl_ui_slider_step_set(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd, double 
step)
 {
if (sd->step == step) return;
@@ -1278,21 +1247,6 @@ _efl_ui_slider_step_get(Eo *obj EINA_UNUSED, 
Efl_Ui_Slider_Data *sd)
 }
 
 EOLIAN static void
-_efl_ui_slider_indicator_show_on_focus_set(Eo *obj EINA_UNUSED, 
Efl_Ui_Slider_Data *sd, Eina_Bool flag)
-{
-   if (flag)
- sd->indicator_visible_mode = ELM_SLIDER_INDICATOR_VISIBLE_MODE_ON_FOCUS;
-   else
- sd->indicator_visible_mode = ELM_SLIDER_INDICATOR_VISIBLE_MODE_DEFAULT;
-}
-
-EOLIAN static Eina_Bool
-_efl_ui_slider_indicator_show_on_focus_get(Eo *obj EINA_UNUSED, 
Efl_Ui_Slider_Data *sd)
-{
-   return (sd->indicator_visible_mode == 
ELM_SLIDER_INDICATOR_VISIBLE_MODE_ON_FOCUS);
-}
-
-EOLIAN static void
 _efl_ui_slider_indicator_visible_mode_set(Eo *obj EINA_UNUSED, 
Efl_Ui_Slider_Data *sd, Elm_Slider_Indicator_Visible_Mode 
indicator_visible_mode)
 {
if (sd->indicator_visible_mode == indicator_visible_mode) return;
@@ -1740,6 +1694,58 @@ elm_slider_indicator_format_function_set(Evas_Object 
*obj, slider_func_type func
 _format_legacy_to_format_eo_free_cb);
 }
 
+EAPI void
+elm_slider_indicator_show_on_focus_set(Evas_Object *obj, Eina_Bool flag)
+{
+   EFL_UI_SLIDER_DATA_GET_OR_RETURN(obj, sd);
+
+   if (flag)
+ sd->indicator_visible_mode = ELM_SLIDER_INDICATOR_VISIBLE_MODE_ON_FOCUS;
+   else
+ sd->indicator_visible_mode = ELM_SLIDER_INDICATOR_VISIBLE_MODE_DEFAULT;
+}
+
+EAPI Eina_Bool
+elm_slider_indicator_show_on_focus_get(const Evas_Object *obj)
+{
+   EFL_UI_SLIDER_DATA_GET_OR_RETURN(obj, sd, EINA_FALSE);
+
+   return (sd->indicator_visible_mode == 
ELM_SLIDER_INDICATOR_VISIBLE_MODE_ON_FOCUS);
+}
+
+EAPI void
+elm_slider_indicator_show_set(Evas_Object *obj, Eina_Bool show)
+{
+   EFL_UI_SLIDER_DATA_GET_OR_RETURN(obj, sd);
+
+   if (show)
+ {
+sd->indicator_show = EINA_TRUE;
+elm_layout_signal_emit(obj, "elm,state,val,show", "elm");
+if (sd->popup)
+  edje_object_signal_emit(sd->popup, "elm,state,val,show", "elm");
+if (sd->popup2)
+  edje_object_signal_emit(sd->popup2, "elm,state,val,show", "elm");
+ }
+   else
+ {
+sd->indicator_show = EINA_FALSE;
+elm_layout_signal_emit(obj, "elm,state,val,hide", "elm");
+if (sd->popup)
+  edje_object_signal_emit(sd->popup, "elm,state,val,hide", "elm");
+if (sd->popup2)
+  edje_object_signal_emit(sd->popup2, "elm,state,val,hide", "elm");
+ }
+
+   evas_object_smart_changed(obj);
+}
+
+EAPI Eina_Bool
+elm_slider_indicator_show_get(const Evas_Object *obj)
+{
+   EFL_UI_SLIDER_DATA_GET_OR_RETURN(obj, sd, EINA_FALSE);
+   return sd->indicator_sho

[EGIT] [core/efl] master 04/04: Efl.Ui.Slider: replace default with on_drag in visible_mode enum.

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=19e70a8e1f30839befb450cad6982957571df4b1

commit 19e70a8e1f30839befb450cad6982957571df4b1
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Fri Nov 17 11:30:49 2017 +0900

Efl.Ui.Slider: replace default with on_drag in visible_mode enum.

Ref T6376
---
 src/lib/elementary/efl_ui.eot  | 4 ++--
 src/lib/elementary/efl_ui_slider_private.h | 2 +-
 src/lib/elementary/elm_config.c| 2 +-
 src/lib/elementary/elm_general.h   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/lib/elementary/efl_ui.eot b/src/lib/elementary/efl_ui.eot
index 4483acc10d..69afcccbf0 100644
--- a/src/lib/elementary/efl_ui.eot
+++ b/src/lib/elementary/efl_ui.eot
@@ -48,10 +48,10 @@ enum Efl.Ui.Slider.Indicator_Visible_Mode
 
  @since 1.13
]]
-   default,   [[show indicator on mouse down or change in slider value]]
+   on_drag,[[show indicator on mouse down or change in slider value]]
always,[[Always show the indicator.]]
on_focus,  [[Show the indicator on focus]]
-   none   [[Never show the indicator ]]
+   none  [[Never show the indicator ]]
 }
 
 enum Efl.Ui.Focus.Autoscroll_Mode
diff --git a/src/lib/elementary/efl_ui_slider_private.h 
b/src/lib/elementary/efl_ui_slider_private.h
index c5baa83150..8e1a27af83 100644
--- a/src/lib/elementary/efl_ui_slider_private.h
+++ b/src/lib/elementary/efl_ui_slider_private.h
@@ -33,7 +33,7 @@ struct _Efl_Ui_Slider_Data
 
Ecore_Timer   *wheel_indicator_timer;
doublewheel_indicator_duration;
-   Elm_Slider_Indicator_Visible_Mode indicator_visible_mode; /**< 
indicator_visible_mode of the slider.
+   Efl_Ui_Slider_Indicator_Visible_Mode indicator_visible_mode; /**< 
indicator_visible_mode of the slider.
 This indicates 
when to show an indicator */
 
Evas_Coordsize;
diff --git a/src/lib/elementary/elm_config.c b/src/lib/elementary/elm_config.c
index 4c312b3107..12837ee407 100644
--- a/src/lib/elementary/elm_config.c
+++ b/src/lib/elementary/elm_config.c
@@ -4785,7 +4785,7 @@ static const struct {
Efl_Ui_Slider_Indicator_Visible_Mode  val;
const char   *str;
 } _enum_map_slider_indicator_visible_mode[] = {
-{ EFL_UI_SLIDER_INDICATOR_VISIBLE_MODE_DEFAULT, "default" },
+{ EFL_UI_SLIDER_INDICATOR_VISIBLE_MODE_ON_DRAG, "on_drag" },
 { EFL_UI_SLIDER_INDICATOR_VISIBLE_MODE_ALWAYS, "always" },
 { EFL_UI_SLIDER_INDICATOR_VISIBLE_MODE_ON_FOCUS, "on_focus" },
 { EFL_UI_SLIDER_INDICATOR_VISIBLE_MODE_NONE, "none" },
diff --git a/src/lib/elementary/elm_general.h b/src/lib/elementary/elm_general.h
index 45117bc921..5696f3e78a 100644
--- a/src/lib/elementary/elm_general.h
+++ b/src/lib/elementary/elm_general.h
@@ -348,7 +348,7 @@ typedef Efl_Ui_Softcursor_Mode 
Elm_Softcursor_Mode;
 #define ELM_SOFTCURSOR_MODE_OFFEFL_UI_SOFTCURSOR_MODE_OFF
 
 typedef Efl_Ui_Slider_Indicator_Visible_Mode   
Elm_Slider_Indicator_Visible_Mode;
-#define ELM_SLIDER_INDICATOR_VISIBLE_MODE_DEFAULT  
EFL_UI_SLIDER_INDICATOR_VISIBLE_MODE_DEFAULT
+#define ELM_SLIDER_INDICATOR_VISIBLE_MODE_DEFAULT  
EFL_UI_SLIDER_INDICATOR_VISIBLE_MODE_ON_DRAG
 #define ELM_SLIDER_INDICATOR_VISIBLE_MODE_ALWAYS   
EFL_UI_SLIDER_INDICATOR_VISIBLE_MODE_ALWAYS
 #define ELM_SLIDER_INDICATOR_VISIBLE_MODE_ON_FOCUS 
EFL_UI_SLIDER_INDICATOR_VISIBLE_MODE_ON_FOCUS
 #define ELM_SLIDER_INDICATOR_VISIBLE_MODE_NONE 
EFL_UI_SLIDER_INDICATOR_VISIBLE_MODE_NONE

-- 

[EGIT] [core/efl] master 02/04: Efl.Ui.Slider: make indicator_visible_mode() legacy APIs

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=67996afbf66de827a6912a43e5b4a85a2ce5a314

commit 67996afbf66de827a6912a43e5b4a85a2ce5a314
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Thu Nov 16 11:06:14 2017 +0900

Efl.Ui.Slider: make indicator_visible_mode() legacy APIs

Ref T6376
---
 src/lib/elementary/efl_ui_slider.c | 31 ++-
 src/lib/elementary/efl_ui_slider.eo|  7 ---
 src/lib/elementary/elm_slider_legacy.h | 21 +
 3 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/src/lib/elementary/efl_ui_slider.c 
b/src/lib/elementary/efl_ui_slider.c
index 43c44417d6..095fad8662 100644
--- a/src/lib/elementary/efl_ui_slider.c
+++ b/src/lib/elementary/efl_ui_slider.c
@@ -1246,19 +1246,6 @@ _efl_ui_slider_step_get(Eo *obj EINA_UNUSED, 
Efl_Ui_Slider_Data *sd)
return sd->step;
 }
 
-EOLIAN static void
-_efl_ui_slider_indicator_visible_mode_set(Eo *obj EINA_UNUSED, 
Efl_Ui_Slider_Data *sd, Elm_Slider_Indicator_Visible_Mode 
indicator_visible_mode)
-{
-   if (sd->indicator_visible_mode == indicator_visible_mode) return;
-   sd->indicator_visible_mode = indicator_visible_mode;
-}
-
-EOLIAN static Elm_Slider_Indicator_Visible_Mode
-_efl_ui_slider_indicator_visible_mode_get(Eo *obj EINA_UNUSED, 
Efl_Ui_Slider_Data *sd)
-{
-   return sd->indicator_visible_mode;
-}
-
 EOLIAN static Eina_Bool
 _efl_ui_slider_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Slider_Data *sd 
EINA_UNUSED, Elm_Object_Item *item EINA_UNUSED)
 {
@@ -1746,6 +1733,24 @@ elm_slider_indicator_show_get(const Evas_Object *obj)
EFL_UI_SLIDER_DATA_GET_OR_RETURN(obj, sd, EINA_FALSE);
return sd->indicator_show;
 }
+
+EAPI void
+elm_slider_indicator_visible_mode_set(Evas_Object *obj, 
Elm_Slider_Indicator_Visible_Mode indicator_visible_mode)
+{
+   EFL_UI_SLIDER_DATA_GET_OR_RETURN(obj, sd);
+
+   if (sd->indicator_visible_mode == indicator_visible_mode) return;
+   sd->indicator_visible_mode = indicator_visible_mode;
+}
+
+EAPI Elm_Slider_Indicator_Visible_Mode
+elm_slider_indicator_visible_mode_get(const Evas_Object *obj)
+{
+   EFL_UI_SLIDER_DATA_GET_OR_RETURN(obj, sd, 
ELM_SLIDER_INDICATOR_VISIBLE_MODE_NONE);
+
+   return sd->indicator_visible_mode;
+}
+
 /* Internal EO APIs and hidden overrides */
 
 ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(efl_ui_slider)
diff --git a/src/lib/elementary/efl_ui_slider.eo 
b/src/lib/elementary/efl_ui_slider.eo
index 845e5b0168..608ddf124f 100644
--- a/src/lib/elementary/efl_ui_slider.eo
+++ b/src/lib/elementary/efl_ui_slider.eo
@@ -30,13 +30,6 @@ class Efl.Ui.Slider (Efl.Ui.Layout, Efl.Ui.Range, 
Efl.Ui.Direction,
 step: double; [[The step value.]]
  }
   }
-  @property indicator_visible_mode {
- [[Set/Get the visible mode of indicator.
- ]]
- values {
-indicator_visible_mode: Efl.Ui.Slider.Indicator_Visible_Mode; 
[[The indicator visible mode.]]
- }
-  }
}
parts {
   indicator: Efl.Ui.Slider.Part; [[A floating indicator above the slider.]]
diff --git a/src/lib/elementary/elm_slider_legacy.h 
b/src/lib/elementary/elm_slider_legacy.h
index 312b087b23..f117e15af0 100644
--- a/src/lib/elementary/elm_slider_legacy.h
+++ b/src/lib/elementary/elm_slider_legacy.h
@@ -329,4 +329,25 @@ EAPI void elm_slider_indicator_show_set(Evas_Object *obj, 
Eina_Bool show);
  */
 EAPI Eina_Bool elm_slider_indicator_show_get(const Evas_Object *obj);
 
+/**
+ * @brief Set/Get the visible mode of indicator.
+ *
+ * @param[in] obj The object.
+ * @param[in] indicator_visible_mode The indicator visible mode.
+ *
+ * @ingroup Elm_Slider
+ */
+EAPI void elm_slider_indicator_visible_mode_set(Evas_Object *obj, 
Elm_Slider_Indicator_Visible_Mode indicator_visible_mode);
+
+/**
+ * @brief Set/Get the visible mode of indicator.
+ *
+ * @param[in] obj The object.
+ *
+ * @return The indicator visible mode.
+ *
+ * @ingroup Elm_Slider
+ */
+EAPI Elm_Slider_Indicator_Visible_Mode 
elm_slider_indicator_visible_mode_get(const Evas_Object *obj);
+
 #include "efl_ui_slider.eo.legacy.h"

-- 

[EGIT] [core/efl] master 01/01: Efl.Ui.Radio: remove value{} api

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=225b70465158e4886d0150ece63190823c6a92d4

commit 225b70465158e4886d0150ece63190823c6a92d4
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Thu Nov 2 17:26:12 2017 +0900

Efl.Ui.Radio: remove value{} api

Efl.Ui.Nstate already implements value{}.

@fix
---
 src/bin/elementary/test_bg.c  |  4 ++--
 src/bin/elementary/test_panes.c   |  8 
 src/bin/elementary/test_photocam.c|  2 +-
 src/lib/elementary/efl_ui_radio.c | 32 +++-
 src/lib/elementary/efl_ui_radio.eo| 17 +
 src/lib/elementary/elm_radio_legacy.h | 23 ++-
 6 files changed, 53 insertions(+), 33 deletions(-)

diff --git a/src/bin/elementary/test_bg.c b/src/bin/elementary/test_bg.c
index b8fde191dd..53c05ae38f 100644
--- a/src/bin/elementary/test_bg.c
+++ b/src/bin/elementary/test_bg.c
@@ -374,7 +374,7 @@ _cb_radio_changed_scale_type(void *data, const Efl_Event 
*ev)
 {
Evas_Object *o_bg = data;
 
-   efl_ui_image_scale_type_set(o_bg, efl_ui_radio_value_get(ev->object));
+   efl_ui_image_scale_type_set(o_bg, efl_ui_nstate_value_get(ev->object));
 }
 
 static void
@@ -464,7 +464,7 @@ test_bg_scale_type(void *data EINA_UNUSED, Evas_Object *obj 
EINA_UNUSED, void *e
 efl_event_callback_add(efl_added, EFL_UI_RADIO_EVENT_CHANGED, 
_cb_radio_changed_scale_type, o_bg),
 efl_pack(hbox, efl_added));
 
-   efl_ui_radio_value_set(rdg, EFL_UI_IMAGE_SCALE_TYPE_FILL);
+   efl_ui_nstate_value_set(rdg, EFL_UI_IMAGE_SCALE_TYPE_FILL);
 
efl_add(EFL_UI_CHECK_CLASS, hbox,
 efl_text_set(efl_added, "Bg Color"),
diff --git a/src/bin/elementary/test_panes.c b/src/bin/elementary/test_panes.c
index a4d6894b0f..bb4e7ff893 100644
--- a/src/bin/elementary/test_panes.c
+++ b/src/bin/elementary/test_panes.c
@@ -123,24 +123,24 @@ test_panes_minsize(void *data EINA_UNUSED, Evas_Object 
*obj EINA_UNUSED, void *e
efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Left - user set min size(110,110)"),
efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(110, 110)),
-   efl_content_set(efl_part(panes, "first"), efl_added)
+   efl_content_set(efl_part(panes, "elm.swallow.left"), efl_added)
   );
 
panes_h = efl_add(EFL_UI_PANES_CLASS, win,
  efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL),
- efl_content_set(efl_part(panes, "second"), efl_added)
+ efl_content_set(efl_part(panes, "elm.swallow.right"), 
efl_added)
 );
efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Up - user set min size(10,0)"),
efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(10, 0)),
-   efl_content_set(efl_part(panes_h, "first"), efl_added)
+   efl_content_set(efl_part(panes_h, "elm.swallow.left"), efl_added)
   );
efl_ui_panes_part_hint_min_allow_set(efl_part(panes_h, "first"), EINA_TRUE);
 
efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Down - min size 50 40"),
efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(50, 40)),
-   efl_content_set(efl_part(panes_h, "second"), efl_added)
+   efl_content_set(efl_part(panes_h, "elm.swallow.right"), efl_added)
   );
 
efl_gfx_size_set(win, EINA_SIZE2D(320,  400));
diff --git a/src/bin/elementary/test_photocam.c 
b/src/bin/elementary/test_photocam.c
index 162834e6e2..58e34e1a31 100644
--- a/src/bin/elementary/test_photocam.c
+++ b/src/bin/elementary/test_photocam.c
@@ -653,7 +653,7 @@ static const struct {
 static void
 _radio_changed_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
 {
-   unsigned char index = efl_ui_radio_value_get(obj);
+   unsigned char index = efl_ui_nstate_value_get(obj);
efl_ui_image_icon_set(data, photocam_icons[index].name);
printf("icon is %s\n", efl_ui_image_icon_get(data));
 }
diff --git a/src/lib/elementary/efl_ui_radio.c 
b/src/lib/elementary/efl_ui_radio.c
index c2edeb7b21..89d0578066 100644
--- a/src/lib/elementary/efl_ui_radio.c
+++ b/src/lib/elementary/efl_ui_radio.c
@@ -202,13 +202,6 @@ _access_state_cb(void *data EINA_UNUSED, Evas_Object *obj)
return strdup(E_("State: Off"));
 }
 
-EAPI Evas_Object *
-elm_radio_add(Evas_Object *parent)
-{
-   EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added));
-}
-
 EOLIAN static Eo *
 _efl_ui_radio_efl_object_constructor(Eo *obj, Efl_Ui_Radio_Data *pd)
 {
@@ -288,7 +281,7 @@ _efl_ui_radio_state_value_get(Eo *obj EINA_UNUSED, 
Efl_Ui_Radio_Data *sd)
 }
 
 EOLIAN static void
-_efl_ui_radio_value_set(Eo *obj EINA_UNUS

[EGIT] [core/efl] master 01/01: elm test: panes - revert the code

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=efa6fb70e62f32ae262e6c967c987e1cd7cb4d58

commit efa6fb70e62f32ae262e6c967c987e1cd7cb4d58
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Thu Nov 2 17:37:25 2017 +0900

elm test: panes - revert the code

test_panes.c code was added into previous patch by accident.
---
 src/bin/elementary/test_panes.c | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/bin/elementary/test_panes.c b/src/bin/elementary/test_panes.c
index bb4e7ff893..a4d6894b0f 100644
--- a/src/bin/elementary/test_panes.c
+++ b/src/bin/elementary/test_panes.c
@@ -123,24 +123,24 @@ test_panes_minsize(void *data EINA_UNUSED, Evas_Object 
*obj EINA_UNUSED, void *e
efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Left - user set min size(110,110)"),
efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(110, 110)),
-   efl_content_set(efl_part(panes, "elm.swallow.left"), efl_added)
+   efl_content_set(efl_part(panes, "first"), efl_added)
   );
 
panes_h = efl_add(EFL_UI_PANES_CLASS, win,
  efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL),
- efl_content_set(efl_part(panes, "elm.swallow.right"), 
efl_added)
+ efl_content_set(efl_part(panes, "second"), efl_added)
 );
efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Up - user set min size(10,0)"),
efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(10, 0)),
-   efl_content_set(efl_part(panes_h, "elm.swallow.left"), efl_added)
+   efl_content_set(efl_part(panes_h, "first"), efl_added)
   );
efl_ui_panes_part_hint_min_allow_set(efl_part(panes_h, "first"), EINA_TRUE);
 
efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Down - min size 50 40"),
efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(50, 40)),
-   efl_content_set(efl_part(panes_h, "elm.swallow.right"), efl_added)
+   efl_content_set(efl_part(panes_h, "second"), efl_added)
   );
 
efl_gfx_size_set(win, EINA_SIZE2D(320,  400));

-- 

[EGIT] [core/efl] master 01/01: Efl.Ui.Slider: implement Slider.part & Ui.format functions

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=d6c9b37925554de261b1f4a07df72bf83f68c302

commit d6c9b37925554de261b1f4a07df72bf83f68c302
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Tue Nov 7 13:28:01 2017 +0900

Efl.Ui.Slider: implement Slider.part & Ui.format functions

indicator_format_set/get & indicator_format_function_set are
now legacy APIs.
indicator format can be set by using generic Ui.Format function
e.g.
efl_ui_format_string_set(efl_part(sliderObj, "indicator"), "1.0%f");
---
 src/Makefile_Elementary.am   |   1 +
 src/bin/elementary/test_ui_slider_interval.c |  13 +-
 src/lib/efl/interfaces/efl_ui_format.c   |   2 +-
 src/lib/elementary/efl_ui_slider.c   | 202 ++-
 src/lib/elementary/efl_ui_slider.eo  |  47 +--
 src/lib/elementary/efl_ui_slider_part.eo |   9 ++
 src/lib/elementary/efl_ui_slider_private.h   |  12 +-
 src/lib/elementary/elm_slider_legacy.h   |  52 +++
 8 files changed, 214 insertions(+), 124 deletions(-)

diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index ea0e6bcf55..1c41f580f7 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -57,6 +57,7 @@ elm_public_eolian_files = \
lib/elementary/efl_ui_multibuttonentry_part.eo \
lib/elementary/efl_ui_panes_part.eo \
lib/elementary/efl_ui_progressbar_part.eo \
+   lib/elementary/efl_ui_slider_part.eo \
lib/elementary/efl_ui_textpath_part.eo \
lib/elementary/efl_ui_widget_part.eo \
lib/elementary/efl_ui_win_part.eo \
diff --git a/src/bin/elementary/test_ui_slider_interval.c 
b/src/bin/elementary/test_ui_slider_interval.c
index 518528e813..ebd3d3de5e 100644
--- a/src/bin/elementary/test_ui_slider_interval.c
+++ b/src/bin/elementary/test_ui_slider_interval.c
@@ -44,7 +44,7 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj 
EINA_UNUSED, void
efl_text_set(efl_added, "Horizontal"),
efl_ui_slider_indicator_visible_mode_set(efl_added, 
EFL_UI_SLIDER_INDICATOR_VISIBLE_MODE_NONE),
efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(160, 0)),
-   efl_ui_slider_indicator_format_set(efl_added, "%1.5f"),
+   efl_ui_format_string_set(efl_part(efl_added, "indicator"), "%1.5f"),
efl_ui_slider_interval_value_set(efl_added, 0.4, 0.9),
efl_pack(bx, efl_added));
 
@@ -53,7 +53,7 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj 
EINA_UNUSED, void
efl_text_set(efl_added, "Manual step"),
efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(120, 0)),
efl_ui_format_string_set(efl_added, "%1.1f units"),
-   efl_ui_slider_indicator_format_set(efl_added, "%1.1f"),
+   efl_ui_format_string_set(efl_part(efl_added, "indicator"), "%1.1f"),
efl_ui_slider_interval_value_set(efl_added, 0.4, 0.9),
efl_ui_slider_step_set(efl_added, step),
efl_pack(bx, efl_added));
@@ -62,7 +62,7 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj 
EINA_UNUSED, void
efl_text_set(efl_added, "Disabled"),
efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(120, 0)),
efl_ui_format_string_set(efl_added, "%1.0f units"),
-   efl_ui_slider_indicator_format_set(efl_added, "%1.0f"),
+   efl_ui_format_string_set(efl_part(efl_added, "indicator"), "%1.0f"),
efl_ui_range_min_max_set(efl_added, 10, 145),
efl_ui_slider_interval_value_set(efl_added, 50, 100),
efl_ui_slider_step_set(efl_added, step),
@@ -77,7 +77,7 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj 
EINA_UNUSED, void
efl_text_set(efl_added, "Vertical"),
efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(0, 160)),
efl_ui_format_string_set(efl_added, "%1.0f units"),
-   efl_ui_slider_indicator_format_set(efl_added, "%1.0f"),
+   efl_ui_format_string_set(efl_part(efl_added, "indicator"), "%1.0f"),
efl_ui_range_min_max_set(efl_added, 10, 145),
efl_ui_slider_interval_value_set(efl_added, 50, 100),
efl_ui_slider_step_set(efl_added, step),
@@ -88,9 +88,8 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj 
EINA_UNUSED, void
efl_text_set(efl_added, "Disabled"),
efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(0, 160)),
efl_ui_format_string_set(efl_added, "%1.0f units"),
-   efl_ui_slider_indicator_format_set(efl_added, "%1.0f"),
+   efl_ui_format_string_set(efl_part(efl_added, "indi

[EGIT] [core/efl] master 01/01: Efl.Ui.Slider: fix documentations

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=6c444bebcbb8858364c88f9aba4b217b23b28a07

commit 6c444bebcbb8858364c88f9aba4b217b23b28a07
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Thu Nov 9 11:02:29 2017 +0900

Efl.Ui.Slider: fix documentations
---
 src/lib/elementary/elm_slider_legacy.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/elementary/elm_slider_legacy.h 
b/src/lib/elementary/elm_slider_legacy.h
index 89df6f1bcc..a98324fa7a 100644
--- a/src/lib/elementary/elm_slider_legacy.h
+++ b/src/lib/elementary/elm_slider_legacy.h
@@ -176,7 +176,7 @@ EAPI void elm_slider_units_format_function_set(Evas_Object 
*obj, slider_func_typ
  * @param[in] min The minimum value.
  * @param[in] max The maximum value.
  *
- * @ingroup Efl_Ui_Slider
+ * @ingroup Elm_Slider
  */
 EAPI void elm_slider_min_max_set(Evas_Object *obj, double min, double max);
 
@@ -189,7 +189,7 @@ EAPI void elm_slider_min_max_set(Evas_Object *obj, double 
min, double max);
  * @param[out] min The minimum value.
  * @param[out] max The maximum value.
  *
- * @ingroup Efl_Ui_Slider
+ * @ingroup Elm_Slider
  */
 EAPI void elm_slider_min_max_get(const Evas_Object *obj, double *min, double 
*max);
 

-- 

[EGIT] [core/efl] master 01/01: evas_event: add missing comments about code.

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=39793f4cd589ca0e8c61c3faca74486ea0b9b816

commit 39793f4cd589ca0e8c61c3faca74486ea0b9b816
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Fri Dec 8 22:57:20 2017 +0900

evas_event: add missing comments about code.
---
 src/lib/evas/canvas/evas_events.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/evas/canvas/evas_events.c 
b/src/lib/evas/canvas/evas_events.c
index 7e15ead38b..3448ec26e8 100644
--- a/src/lib/evas/canvas/evas_events.c
+++ b/src/lib/evas/canvas/evas_events.c
@@ -3892,8 +3892,8 @@ 
_efl_canvas_object_efl_canvas_pointer_pointer_inside_get(Eo *eo_obj,
if (!obj->is_smart)
  return obj_pdata->mouse_in;
 
-   /* This is to keep the legacy APIs evas_object_pointer_inside_by_device_get 
& 
-* evas_object_pointer_inside_get. */
+   /* This is to keep the legacy APIs 
evas_object_pointer_inside_by_device_get() & 
+* evas_object_pointer_inside_get() old behaviour. */
if (obj->is_pointer_inside_legacy) return EINA_FALSE;
 
/* For smart objects, this is a bit expensive obj->mouse_in will not be set.

-- 

[EGIT] [core/efl] master 03/03: update .gitignore for vscode ide

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=6e4138293d018df5ab3a5866313693326bad06c3

commit 6e4138293d018df5ab3a5866313693326bad06c3
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Fri Dec 8 19:53:25 2017 +0900

update .gitignore for vscode ide
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 58817cf060..76dd79784d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -91,3 +91,4 @@ Session.vim
 .project
 /.settings/
 efl_libs.csv
+.vscode/

-- 

[EGIT] [core/efl] master 01/03: interface: add Efl.Canvas.Pointer intf for pointer related functions.

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=80463f0e2ed6a951ab5449b987d18bb47daf23e8

commit 80463f0e2ed6a951ab5449b987d18bb47daf23e8
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Dec 6 14:34:51 2017 +0900

interface: add Efl.Canvas.Pointer intf for pointer related functions.

and remove pointer_inside function from Efl.Canvas{}
---
 src/Makefile_Efl.am  |  1 +
 src/lib/efl/CMakeLists.txt   |  1 +
 src/lib/efl/Efl.h|  1 +
 src/lib/efl/interfaces/efl_canvas.eo | 25 --
 src/lib/efl/interfaces/efl_canvas_pointer.eo | 32 
 src/lib/efl/interfaces/efl_interfaces_main.c |  1 +
 src/lib/elementary/efl_ui_win.c  |  2 +-
 src/lib/elementary/efl_ui_win.eo |  4 ++--
 src/lib/evas/canvas/evas_canvas.eo   |  4 ++--
 src/lib/evas/canvas/evas_main.c  |  6 +++---
 10 files changed, 44 insertions(+), 33 deletions(-)

diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am
index 0584602894..d623743d77 100644
--- a/src/Makefile_Efl.am
+++ b/src/Makefile_Efl.am
@@ -14,6 +14,7 @@ efl_eolian_legacy_files = \
 
 efl_eolian_files = \
   lib/efl/interfaces/efl_canvas.eo \
+  lib/efl/interfaces/efl_canvas_pointer.eo \
   lib/efl/interfaces/efl_config.eo \
   lib/efl/interfaces/efl_control.eo \
   lib/efl/interfaces/efl_dup.eo \
diff --git a/src/lib/efl/CMakeLists.txt b/src/lib/efl/CMakeLists.txt
index 6637bedfc4..e6efc3b680 100644
--- a/src/lib/efl/CMakeLists.txt
+++ b/src/lib/efl/CMakeLists.txt
@@ -5,6 +5,7 @@ set(LIBRARIES eo eina)
 set(PUBLIC_EO_FILES
   interfaces/efl_animator.eo
   interfaces/efl_canvas.eo
+  interfaces/efl_canvas_pointer.eo
   interfaces/efl_config.eo
   interfaces/efl_container.eo
   interfaces/efl_content.eo
diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h
index fa66d95044..e80e5de9d9 100644
--- a/src/lib/efl/Efl.h
+++ b/src/lib/efl/Efl.h
@@ -134,6 +134,7 @@ typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command;
 
 /* Canvas & UI */
 #include "interfaces/efl_canvas.eo.h"
+#include "interfaces/efl_canvas_pointer.eo.h"
 #include "interfaces/efl_ui_view.eo.h"
 #include "interfaces/efl_ui_model_connect.eo.h"
 #include "interfaces/efl_ui_factory.eo.h"
diff --git a/src/lib/efl/interfaces/efl_canvas.eo 
b/src/lib/efl/interfaces/efl_canvas.eo
index 98da146f5f..98d70a3851 100644
--- a/src/lib/efl/interfaces/efl_canvas.eo
+++ b/src/lib/efl/interfaces/efl_canvas.eo
@@ -193,31 +193,6 @@ interface Efl.Canvas ()
 pos: Eina.Position2D; [[The pointer position in pixels.]]
  }
   }
-  @property pointer_inside {
- get {
-[[Returns whether the mouse pointer is logically inside the
-  canvas.
-
-  When this function is called it will return a value of either
-  $false or $true, depending on whether a pointer,in or pointer,out
-  event has been called previously.
-
-  A return value of $true indicates the mouse is logically
-  inside the canvas, and $false implies it is logically
-  outside the canvas.
-
-  A canvas begins with the mouse being assumed outside ($false).
-]]
- }
- keys {
-seat: Efl.Input.Device @optional; [[The seat to consider, if $null
-   then the default seat will be used.]]
- }
- values {
-inside: bool; [[$true if the mouse pointer is inside the canvas,
-$false otherwise]]
- }
-  }
   /* FIXME: maybe not necessary if gesture supports this */
   pointer_iterate @const {
  [[Returns an iterator over the current known pointer positions.
diff --git a/src/lib/efl/interfaces/efl_canvas_pointer.eo 
b/src/lib/efl/interfaces/efl_canvas_pointer.eo
new file mode 100644
index 00..57111a7896
--- /dev/null
+++ b/src/lib/efl/interfaces/efl_canvas_pointer.eo
@@ -0,0 +1,32 @@
+import efl_input_device;
+
+interface Efl.Canvas.Pointer ()
+{
+   methods {
+  @property pointer_inside {
+ get {
+[[Returns whether the mouse pointer is logically inside the
+  canvas.
+
+  When this function is called it will return a value of either
+  $false or $true, depending on whether a pointer,in or pointer,out
+  event has been called previously.
+
+  A return value of $true indicates the mouse is logically
+  inside the canvas, and $false implies it is logically
+  outside the canvas.
+
+  A canvas begins with the mouse being assumed outside ($false).
+]]
+ }
+ keys {
+seat: Efl.Input.Device @optional; [[The seat to consider, if $null
+ then the default seat will b

[EGIT] [core/efl] master 02/03: efl.canvas.object: implement pointer_inside of Efl.Canvas.Pointer.

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=b734c132f93f86b34a2bdf3e12ee62c22404d295

commit b734c132f93f86b34a2bdf3e12ee62c22404d295
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Fri Dec 8 16:04:18 2017 +0900

efl.canvas.object: implement pointer_inside of Efl.Canvas.Pointer.

remove eo apis pointer_in, pointer_device_in, pointer_inside_get &
pointer_inside_by_device_get and add legacy APIs for
pointer_inside_get & pointer_inside_by_device_get.
These four APIs do almost same things.
---
 src/lib/elementary/els_cursor.c  |  2 +-
 src/lib/evas/Evas_Legacy.h   | 33 
 src/lib/evas/canvas/efl_canvas_object.eo | 68 +---
 src/lib/evas/canvas/evas_events.c| 17 
 src/lib/evas/canvas/evas_object_main.c   | 34 +++-
 src/lib/evas/include/evas_private.h  |  1 +
 6 files changed, 59 insertions(+), 96 deletions(-)

diff --git a/src/lib/elementary/els_cursor.c b/src/lib/elementary/els_cursor.c
index 69d541835e..a90c7daf25 100644
--- a/src/lib/elementary/els_cursor.c
+++ b/src/lib/elementary/els_cursor.c
@@ -570,7 +570,7 @@ _elm_cursor_cur_set(Elm_Cursor *cur)
   }
  }
 
-   if (efl_canvas_object_pointer_in_get(cur->eventarea))
+   if (efl_canvas_pointer_inside_get(cur->eventarea, NULL))
  _elm_cursor_set(cur);
 }
 
diff --git a/src/lib/evas/Evas_Legacy.h b/src/lib/evas/Evas_Legacy.h
index de7bf35d45..94b06d0f12 100644
--- a/src/lib/evas/Evas_Legacy.h
+++ b/src/lib/evas/Evas_Legacy.h
@@ -2210,6 +2210,39 @@ EAPI void evas_object_scale_set(Evas_Object *obj, double 
scale);
  */
 EAPI double evas_object_scale_get(const Evas_Object *obj);
 
+/**
+ * @brief Returns whether the mouse pointer is logically inside the object.
+ *
+ * @param[in] dev The pointer device.
+ *
+ * @return @c true if the pointer is inside, @c false otherwise.
+ *
+ * @since 1.20
+ *
+ * @ingroup Evas_Object
+ */
+EAPI Eina_Bool evas_object_pointer_inside_by_device_get(const Evas_Object 
*obj, Efl_Input_Device * dev);
+
+/**
+ * @brief Returns whether the default mouse pointer is logically inside the
+ * object.
+ *
+ * When this function is called it will return a value of either @c false or
+ * @c true, depending on if event_feed_mouse_in or event_feed_mouse_out have
+ * been called to feed in a mouse enter event into the object.
+ *
+ * A return value of @c true indicates the mouse is logically inside the
+ * object, and @c false implies it is logically outside the object.
+ *
+ * If @c e is not a valid object, the return value is undefined.
+ *
+ * @return @c true if the mouse pointer is inside the object, @c false
+ * otherwise
+ *
+ * @ingroup Evas_Object
+ */
+EAPI Eina_Bool evas_object_pointer_inside_get(const Evas_Object *obj) 
EINA_WARN_UNUSED_RESULT;
+
 
 #include "canvas/efl_canvas_object.eo.legacy.h"
 
diff --git a/src/lib/evas/canvas/efl_canvas_object.eo 
b/src/lib/evas/canvas/efl_canvas_object.eo
index 7deae67d95..86c74b2431 100644
--- a/src/lib/evas/canvas/efl_canvas_object.eo
+++ b/src/lib/evas/canvas/efl_canvas_object.eo
@@ -3,7 +3,7 @@ import efl_animation_types;
 
 abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx, Efl.Gfx.Stack, Efl.Animator,
 Efl.Input.Interface, Efl.Gfx.Size.Hint,
-Efl.Gfx.Map, Efl.Loop_User, Efl.Ui.Base)
+Efl.Gfx.Map, Efl.Loop_User, Efl.Ui.Base, 
Efl.Canvas.Pointer)
 {
[[Efl canvas object abstract class]]
legacy_prefix: evas_object;
@@ -56,41 +56,6 @@ abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx, 
Efl.Gfx.Stack, Efl.Animator,
 pointer_mode: Efl.Input.Object_Pointer_Mode; [[Input pointer mode]]
  }
   }
-  @property pointer_in {
- [[Read-only value indicating whether the main pointer is in the 
object.
-
-   This shall be true between pointer,in and pointer,out events (coming
-   in matching numbers). Note that group objects may receive multiple
-   pointer,in in a row. See algo @.pointer_device_in.get
-
-   @since 1.19
- ]]
- get {
-legacy: null;
- }
- values {
-in: bool; [[If $true the main pointer has entered this object.]]
- }
-  }
-  @property pointer_device_in {
- [[Read-only value indicating whether a pointer is in the object.
-
-   This shall be true between pointer,in and pointer,out events (coming
-   in matching numbers). Note that group objects may receive multiple
-   pointer,in in a row.
-
-   @since 1.19
- ]]
- get {
-legacy: null;
- }
- keys {
-pointer: Efl.Input.Device; [[The pointer. Use $null for the defaul 
pointer]]
- }
- values {
-in: bool; [[If $true the pointer has entered this object.]]
- }
-

[EGIT] [core/efl] master 01/01: efl.gfx: move scale{} from efl.ui.base to efl.gfx

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=10103b9b457c996ee7d413112af2d0c7613088b3

commit 10103b9b457c996ee7d413112af2d0c7613088b3
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Fri Dec 1 11:51:56 2017 +0900

efl.gfx: move scale{} from efl.ui.base to efl.gfx
---
 src/bin/elementary/test_gfx_filters.c|  4 ++--
 src/lib/edje/edje_legacy.c   |  4 ++--
 src/lib/edje/edje_object.eo  |  2 +-
 src/lib/edje/edje_text.c | 14 +++---
 src/lib/edje/edje_textblock.c| 10 +-
 src/lib/edje/edje_util.c |  4 ++--
 src/lib/efl/interfaces/efl_gfx.eo| 25 +
 src/lib/efl/interfaces/efl_ui_base.eo| 25 -
 src/lib/elementary/efl_ui_image.c|  2 +-
 src/lib/elementary/efl_ui_layout.c   |  2 +-
 src/lib/elementary/efl_ui_multibuttonentry.c |  4 ++--
 src/lib/elementary/efl_ui_progressbar.c  |  8 
 src/lib/elementary/efl_ui_slider.c   | 14 +++---
 src/lib/elementary/efl_ui_text.c |  2 +-
 src/lib/elementary/efl_ui_win.c  |  2 +-
 src/lib/elementary/elm_clock.c   |  6 +++---
 src/lib/elementary/elm_colorselector.c   |  4 ++--
 src/lib/elementary/elm_entry.c   |  2 +-
 src/lib/elementary/elm_gengrid.c |  6 +++---
 src/lib/elementary/elm_genlist.c |  8 
 src/lib/elementary/elm_image_legacy.h|  4 ++--
 src/lib/elementary/elm_list.c|  2 +-
 src/lib/elementary/elm_main.c|  4 ++--
 src/lib/elementary/elm_menu.c|  2 +-
 src/lib/elementary/elm_notify.c  |  2 +-
 src/lib/elementary/elm_photo.c   |  8 
 src/lib/elementary/elm_segment_control.c |  4 ++--
 src/lib/elementary/elm_toolbar.c | 18 +-
 src/lib/elementary/elm_widget.c  | 10 +-
 src/lib/elementary/elm_widget.eo |  2 +-
 src/lib/evas/canvas/efl_canvas_object.eo |  2 +-
 src/lib/evas/canvas/efl_canvas_text.eo   |  2 +-
 src/lib/evas/canvas/evas_object_main.c   | 10 +-
 src/lib/evas/canvas/evas_object_text.c   |  6 +++---
 src/lib/evas/canvas/evas_object_textblock.c  |  6 +++---
 src/lib/evas/canvas/evas_object_textgrid.c   |  6 +++---
 src/lib/evas/canvas/evas_text.eo |  2 +-
 src/lib/evas/canvas/evas_textgrid.eo |  2 +-
 38 files changed, 120 insertions(+), 120 deletions(-)

diff --git a/src/bin/elementary/test_gfx_filters.c 
b/src/bin/elementary/test_gfx_filters.c
index f87e38ed7f..c827b80b2d 100644
--- a/src/bin/elementary/test_gfx_filters.c
+++ b/src/bin/elementary/test_gfx_filters.c
@@ -453,7 +453,7 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj 
EINA_UNUSED, void *eve
   o = text = evas_object_text_add(evas_object_evas_get(win));
   efl_event_callback_add(o, EFL_GFX_EVENT_RESIZE, _text_resize, NULL);
   efl_text_properties_font_set(o, "Sans:style=Bold", default_font_size);
-  efl_ui_scale_set(text, elm_config_scale_get());
+  efl_gfx_scale_set(text, elm_config_scale_get());
   efl_text_set(o, "EFL");
   efl_gfx_visible_set(o, 1);
   efl_pack(box2, o);
@@ -492,7 +492,7 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj 
EINA_UNUSED, void *eve
 efl_gfx_filter_data_set(o, prg_data[k].name, prg_data[k].value, 
prg_data[k].exec);
   evas_object_textblock_style_set(o, st);
   evas_object_textblock_text_markup_set(o, tbtxt);
-  efl_ui_scale_set(o, elm_config_scale_get());
+  efl_gfx_scale_set(o, elm_config_scale_get());
   efl_pack(box2, o);
   evas_object_resize(o, 1, 1);
}
diff --git a/src/lib/edje/edje_legacy.c b/src/lib/edje/edje_legacy.c
index a4520ba0b5..4bf32aa0f6 100644
--- a/src/lib/edje/edje_legacy.c
+++ b/src/lib/edje/edje_legacy.c
@@ -195,13 +195,13 @@ EAPI const char *edje_object_language_get(const 
Edje_Object *obj)
 
 EAPI Eina_Bool edje_object_scale_set(Edje_Object *obj, double scale)
 {
-   efl_ui_scale_set(obj, scale);
+   efl_gfx_scale_set(obj, scale);
return EINA_TRUE;
 }
 
 EAPI double edje_object_scale_get(const Edje_Object *obj)
 {
-   return efl_ui_scale_get(obj);
+   return efl_gfx_scale_get(obj);
 }
 
 /* Legacy part drag APIs */
diff --git a/src/lib/edje/edje_object.eo b/src/lib/edje/edje_object.eo
index 2be3869e9a..66d584bb4a 100644
--- a/src/lib/edje/edje_object.eo
+++ b/src/lib/edje/edje_object.eo
@@ -125,7 +125,7 @@ class Edje.Object (Efl.Canvas.Group, Efl.File, 
Efl.Container, Efl.Part,
   Efl.Canvas.Layout_Signal.signal_process;
   Efl.Ui.Base.mirrored { set; get; }
   Efl.Ui.Base.language { set; get; }
-  Efl.Ui.Base.scale { set; get; }
+  Efl.Gfx.scale { set; get; }
   Efl.File.load_error { get; }
   Efl.File.mmap { get; set; }
   Efl.Container.

[EGIT] [core/efl] master 01/01: focus: use elm_object_focus_get instead

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=ad9e36d7508c82e068b76cbd3931d25e9753a843

commit ad9e36d7508c82e068b76cbd3931d25e9753a843
Author: Amitesh Singh <singh.amit...@gmail.com>
Date:   Sat Dec 2 00:54:21 2017 +0900

focus: use elm_object_focus_get instead
---
 src/lib/elementary/efl_ui_multibuttonentry.c | 14 +++---
 src/lib/elementary/elm_gengrid.c |  2 +-
 src/lib/elementary/elm_list.c|  8 
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/lib/elementary/efl_ui_multibuttonentry.c 
b/src/lib/elementary/efl_ui_multibuttonentry.c
index d39d68c470..7c253d1c43 100644
--- a/src/lib/elementary/efl_ui_multibuttonentry.c
+++ b/src/lib/elementary/efl_ui_multibuttonentry.c
@@ -146,11 +146,11 @@ _visual_guide_text_set(Evas_Object *obj)
elm_box_unpack(sd->box, sd->entry);
if (sd->view_state == MULTIBUTTONENTRY_VIEW_SHRINK) return;
 
-   if (!efl_ui_focus_object_focus_get(obj))
+   if (!elm_object_focus_get(obj))
  elm_object_focus_set(sd->entry, EINA_FALSE);
 
if ((!eina_list_count(sd->items)) && sd->guide_text
-   && (!efl_ui_focus_object_focus_get(obj)) && (!sd->n_str))
+   && (!elm_object_focus_get(obj)) && (!sd->n_str))
  {
 evas_object_hide(sd->entry);
 elm_box_pack_end(sd->box, sd->guide_text);
@@ -165,7 +165,7 @@ _visual_guide_text_set(Evas_Object *obj)
   {
  elm_box_pack_end(sd->box, sd->entry);
  evas_object_show(sd->entry);
- if (efl_ui_focus_object_focus_get(obj))
+ if (elm_object_focus_get(obj))
{
   if (!sd->selected_it)
 elm_object_focus_set(sd->entry, EINA_TRUE);
@@ -448,7 +448,7 @@ _item_select(Evas_Object *obj,
 
 if (it->func) it->func((void *)(WIDGET_ITEM_DATA_GET(EO_OBJ(it))), 
WIDGET(it), EO_OBJ(it));
 
-if (efl_ui_focus_object_focus_get(obj))
+if (elm_object_focus_get(obj))
   {
  elm_object_focus_set(sd->entry, EINA_FALSE);
  elm_object_focus_set(VIEW(it), EINA_TRUE);
@@ -479,7 +479,7 @@ _item_select(Evas_Object *obj,
  {
 _current_item_state_change
   (obj, MULTIBUTTONENTRY_BUTTON_STATE_DEFAULT);
-if (efl_ui_focus_object_focus_get(obj) && sd->editable)
+if (elm_object_focus_get(obj) && sd->editable)
   elm_object_focus_set(sd->entry, EINA_TRUE);
  }
 }
@@ -1039,7 +1039,7 @@ _entry_resize_cb(void *data,
 {
EFL_UI_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd);
 
-   if (efl_ui_focus_object_focus_get(sd->parent))
+   if (elm_object_focus_get(sd->parent))
  elm_widget_show_region_set(sd->entry, efl_gfx_geometry_get(sd->entry), 
EINA_TRUE);
 }
 
@@ -1058,7 +1058,7 @@ _entry_focus_changed_cb(void *data, const Efl_Event 
*event)
 {
EFL_UI_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd);
 
-   if (efl_ui_focus_object_focus_get(event->object))
+   if (elm_object_focus_get(event->object))
  {
 Elm_Multibuttonentry_Item_Data *item = NULL;
 
diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c
index 8f5615fbd7..42548bc877 100644
--- a/src/lib/elementary/elm_gengrid.c
+++ b/src/lib/elementary/elm_gengrid.c
@@ -3805,7 +3805,7 @@ _elm_gengrid_item_elm_widget_item_focus_set(Eo *eo_it, 
Elm_Gen_Item *it, Eina_Bo
  }
else
  {
-if (!efl_ui_focus_object_focus_get(obj))
+if (!elm_object_focus_get(obj))
   return;
 _elm_gengrid_item_unfocused(eo_it);
  }
diff --git a/src/lib/elementary/elm_list.c b/src/lib/elementary/elm_list.c
index 1b7f239abf..7efe9e5610 100644
--- a/src/lib/elementary/elm_list.c
+++ b/src/lib/elementary/elm_list.c
@@ -1245,7 +1245,7 @@ _elm_list_elm_widget_on_focus_update(Eo *obj, 
Elm_List_Data *sd, Elm_Object_Item
int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
if (!int_ret) return EINA_FALSE;
 
-   if (efl_ui_focus_object_focus_get(obj) && sd->selected && 
!sd->last_selected_item)
+   if (elm_object_focus_get(obj) && sd->selected && !sd->last_selected_item)
  {
 Elm_Object_Item *sel = eina_list_data_get(sd->selected);
 sd->last_selected_item = efl_data_scope_get(sel, ELM_LIST_ITEM_CLASS);
@@ -1253,7 +1253,7 @@ _elm_list_elm_widget_on_focus_update(Eo *obj, 
Elm_List_Data *sd, Elm_Object_Item
 
if (!sd->items) return EINA_FALSE;
 
-   if (efl_ui_focus_object_focus_get(obj) && !sd->mouse_down)
+   if (elm_object_focus_get(obj) && !sd->mouse_down)
  {
 if (sd->last_focused_item)
   eo_it = sd->last_focused_item;
@@ -2070,7 +2070,7 @@ _elm_list_item_elm_widget_item_focus_set(Eo *eo_it, 
Elm_List_Item_Data *it, Eina
 if (!e

[EGIT] [core/efl] master 01/01: update gitignore.

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=90276a2d5acfefa27599a759aff9255c12dd4187

commit 90276a2d5acfefa27599a759aff9255c12dd4187
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Dec 6 10:20:58 2017 +0900

update gitignore.
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index b0fe06ce2a..58817cf060 100644
--- a/.gitignore
+++ b/.gitignore
@@ -90,3 +90,4 @@ Session.vim
 .cproject
 .project
 /.settings/
+efl_libs.csv

-- 

[EGIT] [core/efl] master 01/01: Efl.Canvas.Object.eo: indent correction

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=b3715d30bb50015d5fc423fee1adeab2ff8dbb8e

commit b3715d30bb50015d5fc423fee1adeab2ff8dbb8e
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Dec 6 10:49:26 2017 +0900

Efl.Canvas.Object.eo: indent correction
---
 src/lib/evas/canvas/efl_canvas_object.eo | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/lib/evas/canvas/efl_canvas_object.eo 
b/src/lib/evas/canvas/efl_canvas_object.eo
index 0ceb456248..7deae67d95 100644
--- a/src/lib/evas/canvas/efl_canvas_object.eo
+++ b/src/lib/evas/canvas/efl_canvas_object.eo
@@ -21,7 +21,7 @@ abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx, 
Efl.Gfx.Stack, Efl.Animator,
  pointer_mode: Efl.Input.Object_Pointer_Mode; [[The pointer mode]]
  }
  set {
-   return: bool; [[$true if pointer mode was set, $false otherwise]]
+return: bool; [[$true if pointer mode was set, $false otherwise]]
 legacy: null;
  }
  get {
@@ -47,11 +47,11 @@ abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx, 
Efl.Gfx.Stack, Efl.Animator,
See also: @.pointer_mode_by_device.get and 
@.pointer_mode_by_device.set
Note: This function will only set/get the mode for the default 
pointer.
  ]]
-get {
-}
-set {
-   return: bool; [[$true if pointer behaviour was set, $false 
otherwise]]
-}
+ get {
+ }
+ set {
+return: bool; [[$true if pointer behaviour was set, $false 
otherwise]]
+ }
  values {
 pointer_mode: Efl.Input.Object_Pointer_Mode; [[Input pointer mode]]
  }

-- 

[EGIT] [core/efl] master 01/01: edje: rename Edje.Object to Efl.Canvas.Layout

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=54ae9cc18b6c0fdb9a10f03ad2681587ca062c6c

commit 54ae9cc18b6c0fdb9a10f03ad2681587ca062c6c
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Dec 6 12:15:39 2017 +0900

edje: rename Edje.Object to Efl.Canvas.Layout
---
 src/Makefile_Edje.am   |   2 +-
 src/lib/edje/Edje_Eo.h |   2 +-
 src/lib/edje/Edje_Legacy.h |   2 +-
 src/lib/edje/edje_edit.c   |  10 +-
 src/lib/edje/edje_edit.eo  |   2 +-
 src/lib/edje/edje_legacy.c |  38 
 src/lib/edje/edje_load.c   |   6 +-
 src/lib/edje/edje_message_queue.c  |   4 +-
 src/lib/edje/edje_part.c   |   2 +-
 src/lib/edje/edje_private.h|   2 +-
 src/lib/edje/edje_program.c|  14 +--
 src/lib/edje/edje_smart.c  |  48 +-
 src/lib/edje/edje_util.c   | 106 ++---
 .../edje/{edje_object.eo => efl_canvas_layout.eo}  |  11 +--
 src/lib/elementary/efl_ui_image.c  |   4 +-
 src/lib/elementary/efl_ui_layout.c |   4 +-
 src/lib/elementary/efl_ui_text.c   |   2 +-
 src/lib/elementary/efl_ui_win.c|   2 +-
 src/lib/elementary/elm_colorselector.c |   2 +-
 src/lib/elementary/elm_widget.c|   6 +-
 src/tests/edje/edje_test_edje.c|  22 ++---
 src/tests/emotion/emotion_test_main-eo.c   |   4 +-
 22 files changed, 147 insertions(+), 148 deletions(-)

diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am
index 1f7ffe980f..0831e01dba 100644
--- a/src/Makefile_Edje.am
+++ b/src/Makefile_Edje.am
@@ -5,7 +5,7 @@ edje_eolian_files = \
lib/edje/efl_layout_calc.eo \
lib/edje/efl_layout_signal.eo \
lib/edje/efl_layout_group.eo \
-   lib/edje/edje_object.eo \
+   lib/edje/efl_canvas_layout.eo \
lib/edje/efl_canvas_layout_part.eo \
lib/edje/efl_canvas_layout_part_box.eo \
lib/edje/efl_canvas_layout_part_external.eo \
diff --git a/src/lib/edje/Edje_Eo.h b/src/lib/edje/Edje_Eo.h
index 663d6c5244..859d4d0183 100644
--- a/src/lib/edje/Edje_Eo.h
+++ b/src/lib/edje/Edje_Eo.h
@@ -3,7 +3,7 @@
 #include "efl_layout_calc.eo.h"
 #include "efl_layout_signal.eo.h"
 #include "efl_layout_group.eo.h"
-#include "edje_object.eo.h"
+#include "efl_canvas_layout.eo.h"
 #include "edje_edit.eo.h"
 
 #include "efl_canvas_layout_part.eo.h"
diff --git a/src/lib/edje/Edje_Legacy.h b/src/lib/edje/Edje_Legacy.h
index 730b6ff64b..b7350114d4 100644
--- a/src/lib/edje/Edje_Legacy.h
+++ b/src/lib/edje/Edje_Legacy.h
@@ -3109,6 +3109,6 @@ typedef Efl_Canvas_Layout_Part_Type Edje_Part_Type;
 /**
  * @}
  */
-#include "edje_object.eo.legacy.h"
+#include "efl_canvas_layout.eo.legacy.h"
 #include "edje_edit.eo.legacy.h"
 #include "efl_layout_group.eo.legacy.h"
diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c
index 4aebf29726..0d39dc0274 100644
--- a/src/lib/edje/edje_edit.c
+++ b/src/lib/edje/edje_edit.c
@@ -39,9 +39,9 @@ EAPI Eina_Error EDJE_EDIT_ERROR_GROUP_DOES_NOT_EXIST = 0;
 /* Get ed(Edje*) from obj(Evas_Object*) */
 #define GET_ED_OR_RETURN(RET)  \
   Edje *ed;\
-  if (!efl_isa(obj, EDJE_OBJECT_CLASS)) \
+  if (!efl_isa(obj, EFL_CANVAS_LAYOUT_CLASS)) \
 return RET;\
-  ed = efl_data_scope_get(obj, EDJE_OBJECT_CLASS);
+  ed = efl_data_scope_get(obj, EFL_CANVAS_LAYOUT_CLASS);
 
 /* Get rp(Edje_Real_Part*) from obj(Evas_Object*) and part(char*) */
 #define GET_RP_OR_RETURN(RET) \
@@ -298,7 +298,7 @@ edje_edit_object_add(Evas *evas)
 EOLIAN static Eo *
 _edje_edit_efl_object_constructor(Eo *obj, Edje_Edit *eed)
 {
-   eed->base = efl_data_ref(obj, EDJE_OBJECT_CLASS);
+   eed->base = efl_data_ref(obj, EFL_CANVAS_LAYOUT_CLASS);
 
return efl_constructor(efl_super(obj, MY_CLASS));
 }
@@ -1145,7 +1145,7 @@ _delete_play_actions(Evas_Object *obj, const char *name, 
int action_type, Eet_Fi
   continue;
 
 eeo = edje_edit_object_add(ed->base.evas);
-if (!efl_isa(eeo, EDJE_OBJECT_CLASS))
+if (!efl_isa(eeo, EFL_CANVAS_LAYOUT_CLASS))
   return EINA_FALSE;
 
 if (!edje_object_file_set(eeo, ed->file->path, pce->entry))
@@ -1161,7 +1161,7 @@ _delete_play_actions(Evas_Object *obj, const char *name, 
int action_type, Eet_Fi
  continue;
   }
 
-eed = efl_data_scope_get(eeo, EDJE_OBJECT_CLASS);
+eed = efl_data_scope_get(eeo, EFL_CANVAS_LAYOUT_CLASS);
 for (i = 0; i < eed->collection->patterns.table_program

[EGIT] [core/efl] master 01/01: interface: rename Efl.Dup to Efl.Duplicate.

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=196b6f1ba48bf06a11c0017e43550583a05d00f5

commit 196b6f1ba48bf06a11c0017e43550583a05d00f5
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Mon Dec 11 14:50:22 2017 +0900

interface: rename Efl.Dup to Efl.Duplicate.

dup is considered too short and maybe confusing,
hence rename it to duplicate instead.
---
 src/Makefile_Efl.am|  2 +-
 src/bin/elementary/test_events.c   | 10 +-
 src/lib/edje/edje_calc.c   |  2 +-
 src/lib/efl/Efl.h  |  2 +-
 .../interfaces/{efl_dup.eo => efl_duplicate.eo}|  8 
 src/lib/efl/interfaces/efl_interfaces_main.c   |  2 +-
 src/lib/evas/canvas/efl_canvas_vg.c|  2 +-
 src/lib/evas/canvas/efl_input_event.eo |  2 +-
 src/lib/evas/canvas/efl_input_focus.c  |  2 +-
 src/lib/evas/canvas/efl_input_focus.eo |  2 +-
 src/lib/evas/canvas/efl_input_hold.c   |  2 +-
 src/lib/evas/canvas/efl_input_hold.eo  |  2 +-
 src/lib/evas/canvas/efl_input_key.c|  2 +-
 src/lib/evas/canvas/efl_input_key.eo   |  2 +-
 src/lib/evas/canvas/efl_input_pointer.c|  2 +-
 src/lib/evas/canvas/efl_input_pointer.eo   |  2 +-
 src/lib/evas/canvas/efl_vg.eo  |  4 ++--
 src/lib/evas/canvas/efl_vg_container.eo|  2 +-
 src/lib/evas/canvas/efl_vg_gradient.eo |  2 +-
 src/lib/evas/canvas/efl_vg_gradient_linear.eo  |  2 +-
 src/lib/evas/canvas/efl_vg_gradient_radial.eo  |  2 +-
 src/lib/evas/canvas/efl_vg_shape.eo|  2 +-
 src/lib/evas/canvas/evas_device.c  |  2 +-
 src/lib/evas/canvas/evas_events.c  | 22 +++---
 src/lib/evas/canvas/evas_vg_container.c|  6 +++---
 src/lib/evas/canvas/evas_vg_gradient.c |  4 ++--
 src/lib/evas/canvas/evas_vg_gradient_linear.c  |  4 ++--
 src/lib/evas/canvas/evas_vg_gradient_radial.c  |  4 ++--
 src/lib/evas/canvas/evas_vg_node.c |  4 ++--
 src/lib/evas/canvas/evas_vg_shape.c| 10 +-
 src/lib/evas/vg/evas_vg_cache.c|  2 +-
 31 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am
index d623743d77..c80d81c950 100644
--- a/src/Makefile_Efl.am
+++ b/src/Makefile_Efl.am
@@ -17,7 +17,7 @@ efl_eolian_files = \
   lib/efl/interfaces/efl_canvas_pointer.eo \
   lib/efl/interfaces/efl_config.eo \
   lib/efl/interfaces/efl_control.eo \
-  lib/efl/interfaces/efl_dup.eo \
+  lib/efl/interfaces/efl_duplicate.eo \
   lib/efl/interfaces/efl_file.eo \
   lib/efl/interfaces/efl_image_load.eo \
   lib/efl/interfaces/efl_part.eo \
diff --git a/src/bin/elementary/test_events.c b/src/bin/elementary/test_events.c
index f8ae9daced..38c94418ce 100644
--- a/src/bin/elementary/test_events.c
+++ b/src/bin/elementary/test_events.c
@@ -22,7 +22,7 @@ _pointer_down(void *data, const Efl_Event *ev)
testdata *td = data;
td->down = 1;
efl_unref(td->evdown);
-   td->evdown = efl_dup(ev->info);
+   td->evdown = efl_duplicate(ev->info);
 }
 
 static void
@@ -30,7 +30,7 @@ _pointer_move(void *data, const Efl_Event *ev)
 {
testdata *td = data;
efl_unref(td->evmove);
-   td->evmove = efl_dup(ev->info);
+   td->evmove = efl_duplicate(ev->info);
 }
 
 static void
@@ -39,7 +39,7 @@ _pointer_up(void *data, const Efl_Event *ev)
testdata *td = data;
td->down = 0;
efl_unref(td->evup);
-   td->evup = efl_dup(ev->info);
+   td->evup = efl_duplicate(ev->info);
 }
 
 static void
@@ -64,7 +64,7 @@ _key_down(void *data, const Efl_Event *ev)
if (!efl_input_fake_get(ev->info))
  {
 efl_unref(td->evkeydown);
-td->evkeydown = efl_dup(ev->info);
+td->evkeydown = efl_duplicate(ev->info);
  }
 }
 
@@ -89,7 +89,7 @@ _key_up(void *data, const Efl_Event *ev)
if (!efl_input_fake_get(ev->info))
  {
 efl_unref(td->evkeyup);
-td->evkeyup = efl_dup(ev->info);
+td->evkeyup = efl_duplicate(ev->info);
  }
 
if (td->f) eina_future_cancel(td->f);
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index c2dbee503b..64b95ed72e 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -3151,7 +3151,7 @@ _edje_svg_recalc_apply(Edje *ed, Edje_Real_Part *ep, 
Edje_Calc_Params *p3 EINA_U
 dest_root = efl_canvas_vg_root_node_get(ep->object);
 efl_ref(dest_root);
 
-root = efl_dup(src_root);
+root = efl_duplicate(src_root);
 
 if (!evas_vg_node_interpolate(root, src_root, dest_root, pos))
   {
diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h
inde

[EGIT] [core/efl] master 01/01: elm test: Add test for Efl.Ui.Slider

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=b7419f4069baa7154c4e8c04587c682337fab992

commit b7419f4069baa7154c4e8c04587c682337fab992
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Tue Dec 12 13:58:39 2017 +0900

elm test: Add test for Efl.Ui.Slider
---
 src/Makefile_Elementary.am  |   1 +
 src/bin/elementary/Makefile.am  |   1 +
 src/bin/elementary/test.c   |   2 +
 src/bin/elementary/test_ui_slider.c | 120 
 4 files changed, 124 insertions(+)

diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index 779c9eed59..d7b2e15ddc 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -901,6 +901,7 @@ bin/elementary/test_scroller.c \
 bin/elementary/test_segment_control.c \
 bin/elementary/test_separator.c \
 bin/elementary/test_slider.c \
+bin/elementary/test_ui_slider.c \
 bin/elementary/test_ui_slider_interval.c \
 bin/elementary/test_ui_spin.c \
 bin/elementary/test_ui_spin_button.c \
diff --git a/src/bin/elementary/Makefile.am b/src/bin/elementary/Makefile.am
index dbc4437bdc..8ce36a7a8d 100644
--- a/src/bin/elementary/Makefile.am
+++ b/src/bin/elementary/Makefile.am
@@ -125,6 +125,7 @@ test_scroller.c \
 test_segment_control.c \
 test_separator.c \
 test_slider.c \
+test_ui_slider.c \
 test_ui_slider_interval.c \
 test_slideshow.c \
 test_spinner.c \
diff --git a/src/bin/elementary/test.c b/src/bin/elementary/test.c
index 577f600c91..8a592ab7d2 100644
--- a/src/bin/elementary/test.c
+++ b/src/bin/elementary/test.c
@@ -110,6 +110,7 @@ void test_scaling(void *data, Evas_Object *obj, void 
*event_info);
 void test_scaling2(void *data, Evas_Object *obj, void *event_info);
 void test_slider(void *data, Evas_Object *obj, void *event_info);
 void test_slider_interval(void *data, Evas_Object *obj, void *event_info);
+void test_ui_slider(void *data, Evas_Object *obj, void *event_info);
 void test_actionslider(void *data, Evas_Object *obj, void *event_info);
 void test_genlist(void *data, Evas_Object *obj, void *event_info);
 void test_genlist2(void *data, Evas_Object *obj, void *event_info);
@@ -1035,6 +1036,7 @@ add_tests:
ADD_TEST(NULL, "Range Values", "Progressbar 2", test_progressbar2);
ADD_TEST_EO(NULL, "Range Values", "Efl.Ui.Nstate", test_nstate);
ADD_TEST_EO(NULL, "Range Values", "Efl.Ui.Slider_Interval", 
test_slider_interval);
+   ADD_TEST_EO(NULL, "Range Values", "Efl.Ui.Slider", test_ui_slider);
 
//--//
ADD_TEST(NULL, "Booleans", "Check", test_check);
diff --git a/src/bin/elementary/test_ui_slider.c 
b/src/bin/elementary/test_ui_slider.c
new file mode 100644
index 00..8fe7047778
--- /dev/null
+++ b/src/bin/elementary/test_ui_slider.c
@@ -0,0 +1,120 @@
+#ifdef HAVE_CONFIG_H
+# include "elementary_config.h"
+#endif
+#include 
+
+static double
+_step_size_calculate(double min, double max)
+{
+   double step = 0.0;
+   int steps = 0;
+
+   steps = max - min;
+   if (steps) step = (1.0 / steps);
+   return step;
+}
+
+static void
+_slider_changed_cb(void *data EINA_UNUSED, const Efl_Event *ev)
+{
+   double val;
+
+   val = efl_ui_range_value_get(ev->object);
+
+   printf("val = %f\n", val);
+   if (val > 100)
+ efl_ui_range_value_set(ev->object, 100);
+}
+
+void
+test_ui_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void 
*event_info EINA_UNUSED)
+{
+   Eo *win, *bx, *hbx;
+   double step;
+
+   win = efl_add(EFL_UI_WIN_CLASS, NULL,
+ efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC),
+ efl_text_set(efl_added, "Efl.Ui.Slider"),
+ efl_ui_win_autodel_set(efl_added, EINA_TRUE));
+
+   bx = efl_add(EFL_UI_BOX_CLASS, win,
+efl_content_set(win, efl_added));
+
+   efl_add(EFL_UI_SLIDER_CLASS, bx,
+   efl_text_set(efl_added, "Horizontal"),
+   efl_ui_slider_part_indicator_visible_mode_set(efl_part(efl_added, 
"indicator"),
+ 
EFL_UI_SLIDER_INDICATOR_VISIBLE_MODE_NONE),
+   efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(160, 0)),
+   efl_ui_format_string_set(efl_part(efl_added, "indicator"), "%1.5f"),
+   efl_pack(bx, efl_added));
+
+   step = _step_size_calculate(0, 9);
+   efl_add(EFL_UI_SLIDER_CLASS, bx,
+   efl_text_set(efl_added, "Manual step"),
+   efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(120, 0)),
+   efl_ui_format_string_set(efl_added, "%1.1f units"),
+   efl_ui_format_string_set(efl_part(efl_added, "indicator"), "%1.1f"),
+   efl_ui_slider_step_set(efl_added, step),
+   efl_pack(bx, efl_added));
+
+   efl_add(EFL_UI_SLIDER_CLASS, bx,
+   

[EGIT] [core/efl] master 01/01: Efl.Canvas: make pointer_iterate a beta API

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=72b96bc4c53aa60584f216d915cb7e0862564de0

commit 72b96bc4c53aa60584f216d915cb7e0862564de0
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Tue Dec 12 15:49:49 2017 +0900

Efl.Canvas: make pointer_iterate a beta API

Gesture framework should implement it.
---
 src/lib/efl/interfaces/efl_canvas.eo | 2 +-
 src/lib/elementary/efl_ui_win.c  | 1 +
 src/tests/elementary/elm_test_win.c  | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/lib/efl/interfaces/efl_canvas.eo 
b/src/lib/efl/interfaces/efl_canvas.eo
index 98d70a3851..7403ca4fea 100644
--- a/src/lib/efl/interfaces/efl_canvas.eo
+++ b/src/lib/efl/interfaces/efl_canvas.eo
@@ -194,7 +194,7 @@ interface Efl.Canvas ()
  }
   }
   /* FIXME: maybe not necessary if gesture supports this */
-  pointer_iterate @const {
+  pointer_iterate @const @beta {
  [[Returns an iterator over the current known pointer positions.
 
This is used to iterate over the current known multi-touch 
positions,
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 397ce28ea5..54945cb699 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -13,6 +13,7 @@
 #define EFL_UI_WIN_INLINED_PROTECTED
 #define EFL_UI_FOCUS_OBJECT_PROTECTED
 #define EFL_UI_WIN_BETA
+#define EFL_CANVAS_BETA
 
 #include 
 #include 
diff --git a/src/tests/elementary/elm_test_win.c 
b/src/tests/elementary/elm_test_win.c
index 7effdefe09..807a823baa 100644
--- a/src/tests/elementary/elm_test_win.c
+++ b/src/tests/elementary/elm_test_win.c
@@ -5,6 +5,8 @@
 #define EFL_ACCESS_BETA
 #define EFL_ACCESS_COMPONENT_BETA
 #define EFL_ACCESS_COMPONENT_PROTECTED
+#define EFL_CANVAS_BETA
+
 #include 
 #ifdef HAVE_ELEMENTARY_X
 # include 

-- 

[EGIT] [core/efl] master 01/01: Efl.Canvas.Object: rename pointer_coords_inside_get to coords_inside property.

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=8fb49de5eb179ba10a1c50637624ad72e2768b15

commit 8fb49de5eb179ba10a1c50637624ad72e2768b15
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Tue Dec 12 16:44:41 2017 +0900

Efl.Canvas.Object: rename pointer_coords_inside_get to coords_inside 
property.

Also change the signature of the function. Pass Eina_Position2D instead.
---
 src/lib/evas/canvas/efl_canvas_object.eo | 17 ++---
 src/lib/evas/canvas/evas_object_main.c   |  4 ++--
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/lib/evas/canvas/efl_canvas_object.eo 
b/src/lib/evas/canvas/efl_canvas_object.eo
index 86c74b2431..b2c1e4c864 100644
--- a/src/lib/evas/canvas/efl_canvas_object.eo
+++ b/src/lib/evas/canvas/efl_canvas_object.eo
@@ -551,8 +551,9 @@ abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx, 
Efl.Gfx.Stack, Efl.Animator,
 enable: bool; [[Enable "no-render" mode.]]
  }
   }
-  pointer_coords_inside_get {
- [[Returns whether the coords are logically inside the
+  @property coords_inside {
+ get {
+   [[Returns whether the coords are logically inside the
object.
 
When this function is called it will return a value of either
@@ -564,12 +565,14 @@ abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx, 
Efl.Gfx.Stack, Efl.Animator,
outside the object.
 
If $e is not a valid object, the return value is undefined.
- ]]
- params {
-@in x: int; [[The canvas-relative x coordinate.]]
-@in y: int; [[The canvas-relative y coordinate.]]
+  ]]
+ }
+ keys {
+pos: Eina.Position2D; [[The position in pixels.]]
+ }
+ values {
+return: bool; [[$true if the coords are inside the object, $false 
otherwise]]
  }
- return: bool @warn_unused; [[$true if the coords are inside the 
object, $false otherwise]]
   }
   @property event_animation {
  [[Set the $animation which starts when the given $event_name happens 
to the object.]]
diff --git a/src/lib/evas/canvas/evas_object_main.c 
b/src/lib/evas/canvas/evas_object_main.c
index 0b6a89d0d1..5e2313d40f 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -2662,7 +2662,7 @@ _efl_canvas_object_precise_is_inside_get(Eo *eo_obj 
EINA_UNUSED, Evas_Object_Pro
 }
 
 EOLIAN static Eina_Bool
-_efl_canvas_object_pointer_coords_inside_get(Eo *eo_obj EINA_UNUSED, 
Evas_Object_Protected_Data *obj, Evas_Coord x, Evas_Coord y)
+_efl_canvas_object_coords_inside_get(Eo *eo_obj EINA_UNUSED, 
Evas_Object_Protected_Data *obj, Eina_Position2D pos)
 {
Eina_Rectangle c;
 
@@ -2679,7 +2679,7 @@ _efl_canvas_object_pointer_coords_inside_get(Eo *eo_obj 
EINA_UNUSED, Evas_Object
 if (obj->clip.clipees) return EINA_FALSE;
 c = obj->cur->geometry;
  }
-   return RECTS_INTERSECT(x, y, 1, 1, c.x, c.y, c.w, c.h);
+   return RECTS_INTERSECT(pos.x, pos.y, 1, 1, c.x, c.y, c.w, c.h);
 }
 
 static void

-- 

[EGIT] [core/efl] master 01/01: eina: eina_value - Add "struct tm" support

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=04fe5e10a299850568cb01e60a6c5856de9c7b11

commit 04fe5e10a299850568cb01e60a6c5856de9c7b11
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Mon Oct 30 15:07:04 2017 +0900

eina: eina_value - Add "struct tm" support

Ref T6204

@feature
---
 src/examples/eina/eina_value_04.c | 32 +
 src/lib/eina/eina_value.c | 94 +++
 src/lib/eina/eina_value.h | 44 +-
 3 files changed, 169 insertions(+), 1 deletion(-)

diff --git a/src/examples/eina/eina_value_04.c 
b/src/examples/eina/eina_value_04.c
new file mode 100644
index 00..0c81f21d2a
--- /dev/null
+++ b/src/examples/eina/eina_value_04.c
@@ -0,0 +1,32 @@
+//Compile with:
+//gcc eina_value_04.c -o eina_value_04 `pkg-config --cflags --libs eina`
+
+#include 
+#include 
+
+int main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
+{
+   Eina_Value tm_val;
+   time_t rawtime;
+   struct tm *timeinfo, timeinfo2;
+   char buf[1024];
+
+   eina_init();
+
+   eina_value_setup(_val, EINA_VALUE_TYPE_TM);
+
+   time();
+   timeinfo = localtime();
+
+   eina_value_set(_val, *timeinfo);
+   strftime(buf, 1024, "Now its %d/%m/%y", timeinfo);
+   printf("%s\n", buf);
+
+   eina_value_get(_val, );
+   strftime(buf, 1024, "Copy: %d/%m/%y", );
+   printf("%s\n", buf);
+
+   eina_value_free(_val);
+
+   eina_shutdown();
+}
diff --git a/src/lib/eina/eina_value.c b/src/lib/eina/eina_value.c
index 63c26ce5d8..884876ee8e 100644
--- a/src/lib/eina/eina_value.c
+++ b/src/lib/eina/eina_value.c
@@ -3531,6 +3531,98 @@ static const Eina_Value_Type _EINA_VALUE_TYPE_TIMEVAL = {
 };
 
 static Eina_Bool
+_eina_value_type_tm_setup(const Eina_Value_Type *type, void *mem)
+{
+   memset(mem, 0, type->value_size);
+   return EINA_TRUE;
+}
+
+static Eina_Bool
+_eina_value_type_tm_flush(const Eina_Value_Type *type EINA_UNUSED, void *mem 
EINA_UNUSED)
+{
+   return EINA_TRUE;
+}
+
+static Eina_Bool
+_eina_value_type_tm_copy(const Eina_Value_Type *type EINA_UNUSED, const void 
*src, void * dst)
+{
+   struct tm *tmsrc = (struct tm *)src;
+   struct tm *tmdst = dst;
+   *tmdst = *tmsrc;
+   return EINA_TRUE;
+}
+
+static int
+_eina_value_type_tm_compare(const Eina_Value_Type *type, const void *a, const 
void *b)
+{
+   struct tm tma = *(struct tm*)a;
+   struct tm tmb = *(struct tm*)b;
+   time_t ta, tb;
+
+   ta = mktime();
+   tb = mktime();
+
+   return _eina_value_type_timeval_compare(type, , );
+}
+
+static Eina_Bool
+_eina_value_type_tm_pset(const Eina_Value_Type *type EINA_UNUSED, void *mem, 
const void *ptr)
+{
+   *(struct tm*)mem = *(struct tm*)ptr;
+   return EINA_TRUE;
+}
+
+static Eina_Bool
+_eina_value_type_tm_vset(const Eina_Value_Type *type, void *mem, va_list args)
+{
+   const struct tm tm_val = va_arg(args, struct tm);
+   return _eina_value_type_tm_pset(type, mem, _val);
+}
+
+static Eina_Bool
+_eina_value_type_tm_pget(const Eina_Value_Type *type, const void *mem, void 
*ptr)
+{
+   memcpy(ptr, mem, type->value_size);
+   return EINA_TRUE;
+}
+
+static Eina_Bool
+_eina_value_type_tm_convert_to(const Eina_Value_Type *type, const 
Eina_Value_Type *convert, const void *type_mem, void *convert_mem)
+{
+   struct tm tmv = *(struct tm *)type_mem;
+   time_t t = mktime();
+   struct timeval v = {t, 0};
+
+   if (convert == EINA_VALUE_TYPE_STRINGSHARE ||
+   convert == EINA_VALUE_TYPE_STRING)
+ {
+const char *other_mem;
+char buf[64];
+
+strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", );
+other_mem = buf; /* required due  == buf */
+return eina_value_type_pset(convert, convert_mem, _mem);
+ }
+   else
+ return _eina_value_type_timeval_convert_to(type, convert, , 
convert_mem);
+}
+
+static const Eina_Value_Type _EINA_VALUE_TYPE_TM = {
+ EINA_VALUE_TYPE_VERSION,
+ sizeof(struct tm),
+ "struct tm",
+ _eina_value_type_tm_setup,
+ _eina_value_type_tm_flush,
+ _eina_value_type_tm_copy,
+ _eina_value_type_tm_compare,
+ _eina_value_type_tm_convert_to,
+ NULL, //No convert from
+ _eina_value_type_tm_vset,
+ _eina_value_type_tm_pset,
+ _eina_value_type_tm_pget
+};
+
+static Eina_Bool
 _eina_value_type_blob_setup(const Eina_Value_Type *type EINA_UNUSED, void *mem)
 {
memset(mem, 0, sizeof(Eina_Value_Blob));
@@ -5365,6 +5457,7 @@ eina_value_init(void)
EINA_VALUE_TYPE_LIST = &_EINA_VALUE_TYPE_LIST;
EINA_VALUE_TYPE_HASH = &_EINA_VALUE_TYPE_HASH;
EINA_VALUE_TYPE_TIMEVAL = &_EINA_VALUE_TYPE_TIMEVAL;
+   EINA_VALUE_TYPE_TM = &_EINA_VALUE_TYPE_TM;
EINA_VALUE_TYPE_BLOB = &_EINA_VALUE_TYPE_BLOB;
EINA_VALUE_TYPE_STRUCT = &_EINA_VALUE_TYPE_STRUCT;
 
@@ -5461,6 +5554,7 @@ EAPI const Eina_Value_Type *EINA_VALUE_TYPE_STRUCT = NULL;
 EAPI const Eina_Value_Type *EINA_VALUE_T

[EGIT] [core/efl] master 01/01: eina: eina_value: fix the typo in doc

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=3505b7618c1f8efa7ab46e28b15b08862737cd3e

commit 3505b7618c1f8efa7ab46e28b15b08862737cd3e
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Mon Oct 30 16:11:35 2017 +0900

eina: eina_value: fix the typo in doc
---
 src/lib/eina/eina_value.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/eina/eina_value.h b/src/lib/eina/eina_value.h
index cd2e1d7b49..31f4359e25 100644
--- a/src/lib/eina/eina_value.h
+++ b/src/lib/eina/eina_value.h
@@ -1031,7 +1031,7 @@ static inline Eina_Bool eina_value_pset(Eina_Value *value,
  * @li EINA_VALUE_TYPE_HASH: Eina_Value_Hash*
  * @li EINA_VALUE_TYPE_TIMEVAL: struct timeval*
  * @li EINA_VALUE_TYPE_BLOB: Eina_Value_Blob*
- * @li EINA_VALUE_TYPE_BLOB: Eina_Value_Blob*
+ * @li EINA_VALUE_TYPE_STRUCT: Eina_Value_Struct
  * @li EINA_VALUE_TYPE_TM: struct tm*
  *
  * @code

-- 

[EGIT] [core/efl] master 01/01: eina example: fix eina_value examples

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=855959f24de41b87fd2e07ba3ac442a8a5344800

commit 855959f24de41b87fd2e07ba3ac442a8a5344800
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Mon Oct 30 16:14:19 2017 +0900

eina example: fix eina_value examples
---
 src/examples/eina/eina_value_01.c | 1 +
 src/examples/eina/eina_value_03.c | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/examples/eina/eina_value_01.c 
b/src/examples/eina/eina_value_01.c
index 0916ce3444..a9570b8fcd 100644
--- a/src/examples/eina/eina_value_01.c
+++ b/src/examples/eina/eina_value_01.c
@@ -52,4 +52,5 @@ int main(int argc, char **argv)
 
eina_value_flush();
eina_value_flush();
+   eina_shutdown();
 }
diff --git a/src/examples/eina/eina_value_03.c 
b/src/examples/eina/eina_value_03.c
index e5217b4990..be99868626 100644
--- a/src/examples/eina/eina_value_03.c
+++ b/src/examples/eina/eina_value_03.c
@@ -169,6 +169,7 @@ int main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
printf("timezone: %s\n", s);
free(s);
 
-   eina_value_flush();
-   eina_value_flush();
+   eina_value_free();
+   eina_value_free();
+   eina_shutdown();
 }

--