from:"Amitesh Singh"

[EGIT] [core/efl] master 01/01: eina modinfo: improve eina modinfo guide.

2019-01-29 Thread Amitesh Singh

ami pushed a commit to branch master.

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

commit a016f8e592d8e1fed68e231cda62313e9ac178a7
Author: Amitesh Singh 
Date:   Tue Jan 29 16:58:25 2019 +0530

eina modinfo: improve eina modinfo guide.
---
 src/lib/eina/eina_inline_modinfo.x | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/lib/eina/eina_inline_modinfo.x 
b/src/lib/eina/eina_inline_modinfo.x
index 7c931dab27..582b7caf5a 100644
--- a/src/lib/eina/eina_inline_modinfo.x
+++ b/src/lib/eina/eina_inline_modinfo.x
@@ -32,7 +32,8 @@ __attribute__((__used__)) __attribute__((unused, aligned(1))) 
= info;
   * @defgroup Eina_Module_Group Module
   *  
   * These macros allow you to define module informations like 
author/description/version/license.
-  * eina_modinfo can show these informations to users
+  * eina_modinfo - shows information about an eina module.
+  * eina_modinfo pulls out information from the eina modules given on command 
line.
   *
   * $ eina_modinfo module.so
   * version: 0.1

--

[EGIT] [website/www-content] master 01/01: Wiki page gdb.md changed with summary [fix the typo, backgrace -> backtrace] by Amitesh Singh

2018-09-06 Thread Amitesh Singh

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

http://git.enlightenment.org/website/www-content.git/commit/?id=6f24d04b3f8aa01535db1beb1cea044db6f8c418

commit 6f24d04b3f8aa01535db1beb1cea044db6f8c418
Author: Amitesh Singh 
Date:   Thu Sep 6 22:06:44 2018 -0700

Wiki page gdb.md changed with summary [fix the typo, backgrace -> 
backtrace] by Amitesh Singh
---
 pages/develop/debug/c/gdb.md.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/develop/debug/c/gdb.md.txt b/pages/develop/debug/c/gdb.md.txt
index 0bd6f0e68..d7209c925 100644
--- a/pages/develop/debug/c/gdb.md.txt
+++ b/pages/develop/debug/c/gdb.md.txt
@@ -96,7 +96,7 @@ ERR<13088>:eo lib/eo/eo.c:605 _efl_object_call_resolve() in 
../src/lib/efl/inter
 
 Thread 1 "debugging" received signal SIGABRT, Aborted.
 0x73e998a0 in raise () from /usr/lib/libc.so.6
-(gdb) backgrace
+(gdb) backtrace
 #0  0x73e998a0 in raise () from /usr/lib/libc.so.6
 #1  0x73e9af09 in abort () from /usr/lib/libc.so.6
 #2  0x7739ee25 in eina_log_print_unlocked (domain=, 
level=EINA_LOG_LEVEL_ERR,

--

[EGIT] [core/efl] feature/wayland/multioutput 34/44: theme: panes - remove elm panes inheritance.

2018-04-11 Thread Amitesh Singh

devilhorns pushed a commit to branch feature/wayland/multioutput.

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

commit 8b7be2e57885b74bf9757b411baf46aae5fbb9e4
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Apr 11 19:31:42 2018 +0900

theme: panes - remove elm panes inheritance.
---
 data/elementary/themes/edc/efl/panes.edc | 982 ++-
 1 file changed, 966 insertions(+), 16 deletions(-)

diff --git a/data/elementary/themes/edc/efl/panes.edc 
b/data/elementary/themes/edc/efl/panes.edc
index 46a1c07d1c..0ce77383f7 100644
--- a/data/elementary/themes/edc/efl/panes.edc
+++ b/data/elementary/themes/edc/efl/panes.edc
@@ -11,42 +11,992 @@
   elm,action,unpress: Used for "unpress" smart callback.
 */
 
-group { "efl/panes/vertical";
-   inherit: "elm/panes/vertical/default";
+#define PANEMIN  10
+#define PANEMIN2 16
+#define PANEWID  32
+
+group { name: "efl/panes/vertical";
+   images.image: "holes_vert.png" COMP;
parts {
+  //TODO: remove elm.swallow.left/right 
   alias: "first" "elm.swallow.left";
   alias: "second" "elm.swallow.right";
+
+  part { name: "whole"; type: SPACER;
+ description { state: "default" 0.0;
+ }
+  }
+  part { name: "right_constraint"; type: SPACER;
+ dragable { confine: "whole";
+x: 1 1 1;
+y: 0 0 0;
+ }
+ description { state: "default" 0.0;
+max: 0 0;
+ }
+  }
+  part { name: "left_constraint"; type: SPACER;
+ dragable { confine: "whole";
+x: 1 1 1;
+y: 0 0 0;
+ }
+ description { state: "default" 0.0;
+max: 0 0;
+ }
+  }
+  part { name: "sub_whole"; type: SPACER;
+ description { state: "default" 0.0;
+rel1.relative: 1.0 0.0;
+rel1.to_x: "left_constraint";
+rel2.relative: 0.0 1.0;
+rel2.to_x: "right_constraint";
+ }
+  }
+  part { name: "whole_left"; type: RECT;
+ description { state: "default" 0.0;
+rel2.to_x: "elm.bar";
+rel2.relative: 1.0 1.0;
+rel2.offset: -4 -1;
+ }
+  }
+  part { name: "whole_right"; type: RECT;
+ description { state: "default" 0.0;
+rel1.to_x: "elm.bar";
+rel1.relative: 0.0 0.0;
+rel1.offset: 3 0;
+ }
+  }
+  part { name: "elm.swallow.left"; type: SWALLOW;
+ clip_to: "whole_left";
+ description { state: "default" 0.0;
+rel2.to_x: "elm.bar";
+rel2.relative: 1.0 1.0;
+rel2.offset: -4 -1;
+ }
+  }
+  part { name: "elm.swallow.right"; type: SWALLOW;
+ clip_to: "whole_right";
+ description { state: "default" 0.0;
+rel1.to_x: "elm.bar";
+rel1.relative: 0.0 0.0;
+rel1.offset: 3 0;
+ }
+  }
+  part { name: "elm.bar"; type: SPACER;
+ dragable { confine: "sub_whole";
+x: 1 1 1;
+y: 0 0 0;
+ }
+ description { state: "default" 0.0;
+max: 0 9;
+min: 0 14;
+fixed: 1 1;
+rel1.relative: 0.0 0.5;
+rel2.relative: 1.0 0.5;
+ }
+  }
+  part { name: "dots"; mouse_events: 0;
+ description { state: "default" 0.0;
+image.normal: "holes_vert.png";
+rel1.to: "elm.bar";
+rel2.to: "elm.bar";
+FIXED_SIZE(4, 14)
+ }
+  }
+  part { name: "elm.swallow.event"; type: SWALLOW;
+ description { state: "default" 0.0;
+visible: 0;
+min: PANEMIN PANEMIN2;
+fixed: 1 1;
+rel1.to: "elm.bar";
+rel2.to: "elm.bar";
+ }
+  }
+  part { name: "bar"; type: RECT;
+ dragable.events: "elm.bar";
+ description { state: "default" 0.0;
+min: PANEMIN PANEWID;
+max: 9 9;
+fixed: 1 1;
+rel1.to_x: "elm.swallow.event";
+rel2.to_x: "elm.swallow.event";
+color: 0 0 0 0;
+ }
+ description { state: "disabled" 0.0;
+inherit: "default" 0.0;
+visible: 0;
+ }
+  }
+   }
+   programs {
+  program {signal: "mouse,down,1"; source: "bar"; // f

[EGIT] [core/efl] feature/wayland/multioutput 18/44: theme: border - remove elm border inheritance

2018-04-11 Thread Amitesh Singh

devilhorns pushed a commit to branch feature/wayland/multioutput.

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

commit a961563b042c85ec4f6711c551505e5cd8de2aaf
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Apr 11 17:33:37 2018 +0900

theme: border - remove elm border inheritance

and add full edc theme.
---
 data/elementary/themes/edc/efl/border.edc | 1214 -
 1 file changed, 1208 insertions(+), 6 deletions(-)

diff --git a/data/elementary/themes/edc/efl/border.edc 
b/data/elementary/themes/edc/efl/border.edc
index 55748268de..f6e8b8922d 100644
--- a/data/elementary/themes/edc/efl/border.edc
+++ b/data/elementary/themes/edc/efl/border.edc
@@ -7,15 +7,1217 @@
  *  - virtual keyboard
  */
 
-group { "efl/border";
-   inherit: "elm/border/base/default";
+group { name: "efl/border";
+   images.image: "vgrad_med_lighter.png" COMP;
+   images.image: "vgrad_med_dark.png" COMP;
+   images.image: "bevel_out.png" COMP;
+   images.image: "shine.png" COMP;
+   images.image: "bevel_dark_out.png" COMP;
+   images.image: "sym_close_dark_normal.png" COMP;
+   images.image: "sym_close_dark_selected.png" COMP;
+   images.image: "sym_close_light_normal.png" COMP;
+   images.image: "sym_close_light_selected.png" COMP;
+   images.image: "sym_down_dark_normal.png" COMP;
+   images.image: "sym_down_dark_selected.png" COMP;
+   images.image: "sym_down_light_normal.png" COMP;
+   images.image: "sym_down_light_selected.png" COMP;
+   images.image: "sym_up_dark_normal.png" COMP;
+   images.image: "sym_up_dark_selected.png" COMP;
+   images.image: "sym_up_light_normal.png" COMP;
+   images.image: "sym_up_light_selected.png" COMP;
+   images.image: "glow_round_corners_small.png" COMP;
+   images.image: "knob_round_small_busy.png" COMP;
+   images.image: "screen_circular_shadow.png" COMP;
+   images.image: "win_shadow.png" COMP;
+   data.item: "shadow" "1";
+   data.item: "version" "119";
+   parts {
+  /* opaque region of the window, to inform the compositor */
+  spacer { "elm.spacer.opaque";
+ desc {
+rel1.to: "top_clip";
+rel2.to: "bottom_clip";
+ }
+ desc { "max"; inherit: "default"; }
+  }
+  /* covers the entire client contents, excluding the main menu */
+  spacer { "elm.spacer.content";
+ required; // since 1.19
+ desc {
+rel1.to: "elm.swallow.menu";
+rel1.relative: 0.0 1.0;
+rel2.to: "elm.swallow.keyboard";
+rel2.relative: 1.0 0.0;
+ }
+  }
+  /* shadow spacer and clipper */
+  spacer { "shadow_spacer";
+ desc { "default";
+WIN_SHADOW_SPACER;
+ }
+ desc { "hidden";
+rel1.offset: 0 0;
+rel2.offset: -1 -1;
+ }
+  }
+  image { "shadow"; nomouse;
+ desc { "default";
+rel.to: "shadow_spacer";
+WIN_SHADOW;
+ }
+ desc { "hidden"; inherit: "default"; hid; }
+  }
+  /* window background: solid color */
+  rect { "bg_clip";
+ nomouse;
+ desc { "default";
+rel1.to: "top_clip";
+rel1.relative: 0.0 1.0;
+rel2.to: "bottom_clip";
+ }
+  }
+  rect { "elm.rect.background";
+ required; // @since 1.19
+ clip: "bg_clip";
+ desc { "default";
+color: 255 255 255 255;
+color_class: "elm/win/background"; // FIXME: color_class naming 
scheme
+visible: 0;
+ }
+ desc { "visible";
+inherit: "default";
+visible: 1;
+ }
+  }
+  /* window background: image */
+  swallow { "elm.swallow.background";
+ required; // @since 1.19
+ clip: "client_clip";
+  }
+  image { "background_bevel";
+ desc { "default";
+image {
+   normal: "bevel_dark_out.png";
+   border: 1 1 1 1;
+   middle: 0;
+}
+fill.smooth: 0;
+rel.to: "elm.spacer.content";
+visible: 0;
+ }
+ desc { "visible";
+inherit: "default";
+visible: 1;
+ }
+  }
+  spacer { "indicator_spacer";
+ desc { "de

[EGIT] [core/efl] feature/wayland/multioutput 36/44: theme: button - fix the warning.

2018-04-11 Thread Amitesh Singh

devilhorns pushed a commit to branch feature/wayland/multioutput.

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

commit 37b2e6376608a3b4c5c7adb6d054b94a0d546747
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Apr 11 20:03:41 2018 +0900

theme: button - fix the warning.

This fixed following warning

elementary/themes/edc/efl/button.edc:4:19: warning: `ICON' redefined
---
 data/elementary/themes/edc/efl/button.edc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/data/elementary/themes/edc/efl/button.edc 
b/data/elementary/themes/edc/efl/button.edc
index cf4333bea2..9853358e67 100644
--- a/data/elementary/themes/edc/efl/button.edc
+++ b/data/elementary/themes/edc/efl/button.edc
@@ -1,6 +1,8 @@
 group { name: "efl/button";
images.image: "button_normal.png" COMP;
images.image: "button_clicked.png" COMP;
+
+#undef ICON
 #define ICON 1
 #define LABEL2
 #define MASK 3

--

[EGIT] [core/efl] feature/wayland/multioutput 23/44: theme: scroller - remove elm scroller inheritance

2018-04-11 Thread Amitesh Singh

devilhorns pushed a commit to branch feature/wayland/multioutput.

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

commit a42929be449fe4b9a7fd309d65ee5dac8f064e9d
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Apr 11 18:08:08 2018 +0900

theme: scroller - remove elm scroller inheritance
---
 data/elementary/themes/edc/efl/scroller.edc | 1336 ++-
 1 file changed, 1329 insertions(+), 7 deletions(-)

diff --git a/data/elementary/themes/edc/efl/scroller.edc 
b/data/elementary/themes/edc/efl/scroller.edc
index e0d81482c0..032972b084 100644
--- a/data/elementary/themes/edc/efl/scroller.edc
+++ b/data/elementary/themes/edc/efl/scroller.edc
@@ -1,12 +1,1334 @@
-group { "efl/scroller";
-   inherit: "elm/scroller/base/default";
-}
+group { name: "efl/scroller";
+   images.image: "inset_shadow.png" COMP;
+   images.image: "bevel_in.png" COMP;
+   images.image: "bevel_out.png" COMP;
+   images.image: "runner_horiz.png" COMP;
+   images.image: "runner_vert.png" COMP;
+   images.image: "runner_glow_horiz.png" COMP;
+   images.image: "runner_glow_vert.png" COMP;
+   images.image: "holes_tiny_horiz.png" COMP;
+   images.image: "holes_tiny_vert.png" COMP;
+   images.image: "holes_tiny_glow_horiz.png" COMP;
+   images.image: "holes_tiny_glow_vert.png" COMP;
+   images.image: "vgrad_med_lighter.png" COMP;
+   images.image: "shadow_square_tiny.png" COMP;
+   images.image: "glow_small.png" COMP;
+   images.image: "sym_left_light_normal.png" COMP;
+   images.image: "sym_right_light_normal.png" COMP;
+   images.image: "sym_up_light_normal.png" COMP;
+   images.image: "sym_down_light_normal.png" COMP;
+   images.image: "sym_left_glow_normal.png" COMP;
+   images.image: "sym_right_glow_normal.png" COMP;
+   images.image: "sym_up_glow_normal.png" COMP;
+   images.image: "sym_down_glow_normal.png" COMP;
+   images.image: "sym_up_dark_normal.png" COMP;
+   images.image: "sym_down_dark_normal.png" COMP;
+   images.image: "sym_left_dark_normal.png" COMP;
+   images.image: "sym_right_dark_normal.png" COMP;
+
+
+   data.item: "focus_highlight" "on";
+
+   script {
+  public loop_x, loop_y;
+  public action_on_pos_vbar(val) {
+ new x, y , w, h, x1, y1 , w1, h1;
+
+ get_geometry(PART:"y_vbar_up", x,y,w, h);
+ get_geometry(PART:"y_vbar_up_mapper", x1,y1,w1, h1);
+
+ if(((y1 <= y) && (y <= (y1 + h1))) && (0 == get_int(loop_y)))
+ {
+set_state(PART:"arrow1_vbar", "hidden", 0.0);
+set_state(PART:"sb_vbar_a1", "hidden", 0.0);
+ }
+ else
+ {
+set_state(PART:"arrow1_vbar", "default", 0.0);
+set_state(PART:"sb_vbar_a1", "default", 0.0);
+ }
+
+ get_geometry(PART:"y_vbar_down", x,y,w, h);
+ get_geometry(PART:"y_vbar_down_mapper", x1,y1,w1, h1);
+
+ if(((y1 <= (y + h)) && ((y+ h) <= (y1 + h1))) && (0 == 
get_int(loop_y)))
+ {
+set_state(PART:"arrow2_vbar", "hidden", 0.0);
+set_state(PART:"sb_vbar_a2", "hidden", 0.0);
+ }
+ else
+ {
+set_state(PART:"arrow2_vbar", "default", 0.0);
+set_state(PART:"sb_vbar_a2", "default", 0.0);
+ }
+
+ if(val < 10)
+timer(0.1,"action_on_pos_vbar", val+1);
+  }
 
-group { "efl/scroller:noclip";
-   inherit: "elm/scroller/base/noclip";
+  public action_on_pos_hbar(val) {
+ new x, y , w, h, x1, y1 , w1, h1;
+
+ get_geometry(PART:"x_hbar_left", x,y,w, h);
+ get_geometry(PART:"x_hbar_left_mapper", x1,y1,w1, h1);
+
+ if(((x1 <= x) && (x <= (x1 + w1))) && (0 == get_int(loop_x)))
+ {
+set_state(PART:"arrow1_hbar", "hidden", 0.0);
+set_state(PART:"sb_hbar_a1", "hidden", 0.0);
+ }
+ else
+ {
+set_state(PART:"arrow1_hbar", "default", 0.0);
+set_state(PART:"sb_hbar_a1", "default", 0.0);
+ }
+
+ get_geometry(PART:"x_hbar_right", x,y,w, h);
+ get_geometry(PART:"x_hbar_right_mapper", x1,y1,w1, h1);
+
+ if(((x1 <= (x + w)) && ((x + w) <= (x1 + w1))) && (0 == 
get_int(loop_x)))
+ {
+

[EGIT] [core/efl] feature/wayland/multioutput 25/44: theme: win - remove elm win inheritance

2018-04-11 Thread Amitesh Singh

devilhorns pushed a commit to branch feature/wayland/multioutput.

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

commit 9d2ddf292b8df510658d9e253e300b16bab4e7c5
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Apr 11 18:10:57 2018 +0900

theme: win - remove elm win inheritance
---
 data/elementary/themes/edc/efl/win.edc | 34 +++---
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/data/elementary/themes/edc/efl/win.edc 
b/data/elementary/themes/edc/efl/win.edc
index d0b66110f7..c217f62b16 100644
--- a/data/elementary/themes/edc/efl/win.edc
+++ b/data/elementary/themes/edc/efl/win.edc
@@ -1,3 +1,31 @@
-group { "efl/win";
-   inherit: "elm/win/base/default";
-}
+group { name: "efl/win";
+   data.item: "version" "119";
+   parts {
+  rect { "client_clip"; nomouse; }
+  swallow { "elm.swallow.menu";
+ clip_to: "client_clip";
+ desc { "default";
+rel2.relative: 1 0;
+link.base: "elm,action,hide" "elm";
+align: 0.5 0.0;
+hid;
+ }
+ desc { "visible";
+inherit: "default";
+link.base: "elm,action,show_menu" "elm";
+fixed: 0 1;
+vis;
+ }
+  }
+  swallow { "elm.swallow.contents";
+ clip_to: "client_clip";
+ desc { "default";
+ }
+ desc { "with_menu";
+rel1.to: "elm.swallow.menu";
+rel1.relative: 0 1;
+link.base: "elm,action,show_menu" "elm";
+ }
+  }
+   }
+}
\ No newline at end of file

--

[EGIT] [core/efl] feature/wayland/multioutput 26/44: theme: video - remove elm video inheritance

2018-04-11 Thread Amitesh Singh

devilhorns pushed a commit to branch feature/wayland/multioutput.

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

commit 02444811ca9cfc39cb66106b9d4392b2e27a570d
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Apr 11 18:12:09 2018 +0900

theme: video - remove elm video inheritance
---
 data/elementary/themes/edc/efl/video.edc | 46 +---
 1 file changed, 43 insertions(+), 3 deletions(-)

diff --git a/data/elementary/themes/edc/efl/video.edc 
b/data/elementary/themes/edc/efl/video.edc
index 3a2a658b06..1f943a8096 100644
--- a/data/elementary/themes/edc/efl/video.edc
+++ b/data/elementary/themes/edc/efl/video.edc
@@ -1,3 +1,43 @@
-group { "efl/video";
-   inherit: "elm/video/base/default";
-}
+group { name: "efl/video";
+   parts {
+  part { name: "clipper"; type: RECT;
+ description { state: "default" 0.0;
+color: 255 255 255 255;
+ }
+ description { state: "darker" 0.0;
+color: 128 128 128 255;
+ }
+  }
+  part { name: "elm.swallow.video"; type: SWALLOW;  mouse_events: 1;
+ clip_to: "clipper";
+ description { state: "default" 0.0;
+aspect: 1.0 1.0; aspect_preference: BOTH;
+ }
+  }
+   }
+   programs {
+  program {
+ signal: "elm,video,load"; source: "elm";
+ action: STATE_SET "darker" 0.0;
+ target: "clipper";
+  }
+  program {
+ signal: "elm,video,play"; source: "elm";
+ action: STATE_SET "default" 0.0;
+ transition: SINUSOIDAL 0.2 CURRENT;
+ target: "clipper";
+  }
+  program {
+ signal: "elm,video,end"; source: "elm";
+ action: STATE_SET "darker" 0.0;
+ transition: SINUSOIDAL 0.5 CURRENT;
+ target: "clipper";
+  }
+  program {
+ signal: "elm,video,pause"; source: "elm";
+ action: STATE_SET "darker" 0.0;
+ transition: SINUSOIDAL 0.7 CURRENT;
+ target: "clipper";
+  }
+   }
+}
\ No newline at end of file

--

[EGIT] [core/efl] feature/wayland/multioutput 24/44: theme: slider - remove elm slider inheritance.

2018-04-11 Thread Amitesh Singh

devilhorns pushed a commit to branch feature/wayland/multioutput.

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

commit a91a9adbffaa79b854a610eb0c240de194a94e5b
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Apr 11 18:09:32 2018 +0900

theme: slider - remove elm slider inheritance.
---
 data/elementary/themes/edc/efl/slider.edc | 31 +--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/data/elementary/themes/edc/efl/slider.edc 
b/data/elementary/themes/edc/efl/slider.edc
index 8bd19ec16f..0c0609668b 100644
--- a/data/elementary/themes/edc/efl/slider.edc
+++ b/data/elementary/themes/edc/efl/slider.edc
@@ -1,5 +1,32 @@
-group { "efl/slider/hidden/limit";
-   inherit: "elm/slider/hidden/limit";
+group { name: "efl/slider/hidden/limit";
+   parts {
+  part { name: "elm.units.min"; type: TEXT; mouse_events: 0;
+ scale: 1;
+ description { state: "default" 0.0;
+visible: 0;
+align: 1.0 0.5;
+text { font: FN; size: 10;
+   text_class: "slider_text";
+   min: 1 1;
+   align: 0.0 0.5;
+   ellipsis: -1;
+}
+ }
+  }
+  part { name: "elm.units.max"; type: TEXT; mouse_events: 0;
+ scale: 1;
+ description { state: "default" 0.0;
+visible: 0;
+align: 1.0 0.5;
+text { font: FN; size: 10;
+   text_class: "slider_text";
+   min: 1 1;
+   align: 0.0 0.5;
+   ellipsis: -1;
+}
+ }
+  }
+   }
 }
 
 group { "efl/slider/horizontal/indicator";

--

[EGIT] [core/efl] feature/wayland/multioutput 29/44: theme: list - remove elm scroller, elm list item inheritance.

2018-04-11 Thread Amitesh Singh

devilhorns pushed a commit to branch feature/wayland/multioutput.

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

commit 3ead841e94c74b8b3174ea236890cc2075f91e05
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Apr 11 18:33:24 2018 +0900

theme: list - remove elm scroller, elm list item inheritance.
---
 data/elementary/themes/default.edc  |   2 +-
 data/elementary/themes/edc/efl/list.edc | 292 +++-
 2 files changed, 289 insertions(+), 5 deletions(-)

diff --git a/data/elementary/themes/default.edc 
b/data/elementary/themes/default.edc
index 2de68596f5..3b851409f5 100644
--- a/data/elementary/themes/default.edc
+++ b/data/elementary/themes/default.edc
@@ -169,9 +169,9 @@ collections {
 #include "edc/efl/button.edc"
 #include "edc/efl/calendar.edc"
 #include "edc/efl/nstate.edc"
-#include "edc/efl/list.edc"
 // XXX: mobile mode needs invisible scrollers... make signals that do this
 #include "edc/efl/scroller.edc"
+#include "edc/efl/list.edc"
 // XXX: mobile mode needs different entry setup
 #include "edc/efl/text.edc"
 #include "edc/efl/frame.edc"
diff --git a/data/elementary/themes/edc/efl/list.edc 
b/data/elementary/themes/edc/efl/list.edc
index ae252b9413..4b309c8ce5 100644
--- a/data/elementary/themes/edc/efl/list.edc
+++ b/data/elementary/themes/edc/efl/list.edc
@@ -1,8 +1,292 @@
 group { "efl/view_list";
-   inherit: "elm/list/base/default";
+   inherit: "efl/scroller";
 }
 
-group { "efl/list/item";
-   inherit: "elm/list/item/default";
-}
+group { name: "efl/list/item";
+   data.item: "selectraise" "on";
+   data.item: "focusraise" "on";
+   images.image: "bevel_curved_horiz_out.png" COMP;
+   images.image: "shadow_rounded_horiz.png" COMP;
+   images.image: "vgrad_med_dark.png" COMP;
+   images.image: "bevel_horiz_out.png" COMP;
+   images.image: "shine.png" COMP;
+   parts {
+  part { name: "event"; type: RECT;
+ description { state: "default" 0.0;
+color: 0 0 0 0;
+ }
+ description { state: "disabled" 0.0;
+inherit: "default" 0.0;
+visible: 0;
+ }
+  }
+  part { name: "base"; type: RECT; mouse_events: 0;
+ description { state: "default" 0.0;
+color: 64 64 64 255;
+color_class: "list_item_base";
+ }
+ description { state: "odd" 0.0;
+color: 56 56 56 255;
+color_class: "list_item_base_odd";
+ }
+  }
+  program {
+ signal: "elm,state,odd"; source: "elm";
+ action: STATE_SET "odd" 1.0;
+ target: "base";
+  }
+  program {
+ signal: "elm,state,even"; source: "elm";
+ action: STATE_SET "default" 0.0;
+ target: "base";
+  }
+  part { name: "bevel"; mouse_events: 0;
+ description { state: "default" 0.0;
+image.normal: "bevel_curved_horiz_out.png";
+image.border: 0 0 2 2;
+image.middle: 0;
+fill.smooth: 0;
+ }
+  }
+  part { name: "sel_shadow"; mouse_events: 0;
+ description { state: "default" 0.0;
+image.normal: "shadow_rounded_horiz.png";
+image.border: 0 0 9 9;
+rel1.offset: 0 -4;
+rel2.offset: -1 5;
+fill.smooth: 0;
+visible: 0;
+ }
+ description { state: "selected" 0.0;
+inherit: "default" 0.0;
+visible: 1;
+ }
+  }
+  part { name: "sel_base"; mouse_events: 0;
+ description { state: "default" 0.0;
+image.normal: "vgrad_med_dark.png";
+fill.smooth: 0;
+visible: 0;
+TILED_HORIZ(120)
+ }
+ description { state: "selected" 0.0;
+inherit: "default" 0.0;
+visible: 1;
+ }
+  }
+  part { name: "sel_bevel"; mouse_events: 0;
+ description { state: "default" 0.0;
+image.normal: "bevel_horiz_out.png";
+image.border: 0 0 2 2;
+image.middle: 0;
+fill.smooth: 0;
+visible: 0;
+ }
+ description { state: "selected" 0.0;
+inherit: "default" 0.0;
+visible: 1;
+ }
+  }
+  program {
+ signal: "elm,state,selected"; source: "elm";
+ action: STATE

[EGIT] [core/efl] feature/wayland/multioutput 31/44: theme: photocam: define theme based on new theme components.

2018-04-11 Thread Amitesh Singh

devilhorns pushed a commit to branch feature/wayland/multioutput.

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

commit 3a2b032cb4b33b6d0b1ce10af3eb210de7e7a141
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Apr 11 19:00:58 2018 +0900

theme: photocam: define theme based on new theme components.
---
 data/elementary/themes/edc/efl/photocam.edc | 101 +++-
 1 file changed, 99 insertions(+), 2 deletions(-)

diff --git a/data/elementary/themes/edc/efl/photocam.edc 
b/data/elementary/themes/edc/efl/photocam.edc
index ccc226ed39..df5e1e5e51 100644
--- a/data/elementary/themes/edc/efl/photocam.edc
+++ b/data/elementary/themes/edc/efl/photocam.edc
@@ -1,3 +1,100 @@
-group { "efl/photocam";
-   inherit: "elm/photocam/base/default";
+group { name: "efl/photocam";
+   inherit: "efl/scroller";
+   images.image: "knob_round_busy.png" COMP;
+   images.image: "glow_round_corners.png" COMP;
+   parts {
+  part { name: "busy_clip"; type: RECT;
+ description { state: "default" 0.0;
+visible: 0;
+color: 255 255 255 0;
+ }
+ description { state: "active" 0.0;
+visible: 1;
+color: 255 255 255 255;
+ }
+  }
+  part { name: "knob"; mouse_events: 0;
+ clip_to: "busy_clip";
+ scale: 1;
+ description { state: "default" 0.0;
+image.normal: "knob_round_busy.png";
+min: 40 40;
+max: 40 40;
+align: 0.0 0.0;
+rel1.offset: 3 3;
+rel2.offset: 3 3;
+fixed: 1 1;
+ }
+  }
+  part { name: "knob_spinner"; mouse_events: 0;
+ clip_to: "busy_clip";
+ description { state: "default" 0.0;
+fixed: 1 1;
+rel1.to: "knob";
+rel2.to: "knob";
+image.normal: "glow_round_corners.png";
+map.on: 1;
+map.smooth: 1;
+map.rotation.center: "knob";
+ }
+ description { state: "spin" 0.0;
+inherit: "default" 0.0;
+map.rotation.z: 360;
+ }
+  }
+   }
+   programs {
+  program { name: "spin";
+ signal: "elm,state,busy,start"; source: "elm";
+ action: ACTION_STOP;
+ target: "spin";
+ target: "spin0";
+ target: "spin1";
+ target: "spin2";
+ target: "spin3";
+ target: "spin4";
+ after: "spin0";
+  }
+  program { name: "spin0";
+ action: STATE_SET "default" 0.0;
+ target: "knob_spinner";
+ after: "spin1";
+  }
+  program { name: "spin1";
+ action: STATE_SET "spin" 0.0;
+ transition: LINEAR 1.0;
+ target: "knob_spinner";
+ after: "spin2";
+  }
+  program { name: "spin2";
+ action: STATE_SET "default" 0.0;
+ target: "knob_spinner";
+ after: "spin1";
+  }
+  
+  program {
+ signal: "elm,state,busy,start"; source: "elm";
+ action: STATE_SET "active" 0.0;
+ transition: SINUSOIDAL 0.25;
+ target: "busy_clip";
+  }
+  
+  program {
+ signal: "elm,state,busy,stop"; source: "elm";
+ action: STATE_SET "default" 0.0;
+ transition: SINUSOIDAL 1.0;
+ target: "busy_clip";
+ after: "spin3";
+  }
+  program { name: "spin3";
+ action: ACTION_STOP;
+ target: "spin";
+ target: "spin2";
+ after: "spin4";
+  }
+  program { name: "spin4";
+ action: STATE_SET "default" 0.0;
+ target: "knob_spinner";
+  }
+   }
 }

--

[EGIT] [core/efl] feature/wayland/multioutput 19/44: theme: calendar - remove elm btn inheritance.

2018-04-11 Thread Amitesh Singh

devilhorns pushed a commit to branch feature/wayland/multioutput.

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

commit e91d3f1dd03e23685a316562e996fdb66fbbc001
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Apr 11 17:42:19 2018 +0900

theme: calendar - remove elm btn inheritance.
---
 data/elementary/themes/edc/efl/calendar.edc | 180 ++--
 1 file changed, 173 insertions(+), 7 deletions(-)

diff --git a/data/elementary/themes/edc/efl/calendar.edc 
b/data/elementary/themes/edc/efl/calendar.edc
index 86aee2ce42..2fd7e95233 100644
--- a/data/elementary/themes/edc/efl/calendar.edc
+++ b/data/elementary/themes/edc/efl/calendar.edc
@@ -541,11 +541,177 @@ group { "efl/calendar";
 #undef CIT
 #undef CH
 
+ group { name: "efl/calendar/inc_button";
+  images.image: "sym_right_light_normal.png" COMP;
+  images.image: "sym_right_glow_normal.png" COMP;
+  images.image: "sym_right_dark_normal.png" COMP;
+  script {
+ public mouse_down = 0;
+ public multi_down = 0;
+  }
+  parts {
+ part { name: "arrow.image";
+scale: 1;
+description { state: "default" 0.0;
+   min: 15 15;
+   max: 15 15;
+   color_class: "F032L1";
+   image.normal: "sym_right_light_normal.png";
+}
+description { state: "pressed" 0.0;
+   inherit: "default" 0.0;
+   image.normal: "sym_right_glow_normal.png";
+}
+description { state: "disabled" 0.0;
+   inherit: "default" 0.0;
+   image.normal: "sym_right_dark_normal.png";
+}
+ }
+ part { name: "over";
+type: RECT;
+repeat_events: 1;
+description { state: "default" 0.0;
+   color: 0 0 0 0;
+}
+ }
+ part { name: "disabler";
+type: RECT;
+description { state: "default" 0.0;
+   color: 0 0 0 0;
+   visible: 0;
+}
+description { state: "disabled" 0.0;
+   inherit: "default" 0.0;
+   visible: 1;
+}
+ }
+  }
+  programs {
+ program { name: "button_press";
+signal: "mouse,down,1";
+source: "over";
+script {
+   if ((get_int(multi_down) == 0) &&
+   (get_int(mouse_down) == 0)) {
+ set_int(mouse_down, 1);
+ run_program(PROGRAM:"button_press2");
+   }
+}
+ }
+ program { name: "button_press2";
+action: SIGNAL_EMIT "elm,action,press" "";
+after: "button_press_anim";
+ }
+ program { name: "button_press_anim";
+action: STATE_SET "pressed" 0.0;
+target: "arrow.image";
+ }
+ program { name: "button_unpress";
+signal: "mouse,up,1";
+source: "over";
+script {
+   if (get_int(mouse_down) == 1) {
+ set_int(mouse_down, 0);
+ run_program(PROGRAM:"button_unpress2");
+ run_program(PROGRAM:"button_unpress_anim");
+   }
+}
+ }
+ program { name: "button_unpress2";
+action: SIGNAL_EMIT "elm,action,unpress" "";
+ }
+ program { name: "button_unpress_anim";
+action: STATE_SET "default" 0.0;
+target: "arrow.image";
+ }
+ program { name: "button_click";
+signal: "mouse,clicked,1";
+source: "over";
+script {
+   if (get_int(multi_down) == 0) {
+ run_program(PROGRAM:"button_click2");
+   }
+}
+ }
+ program { name: "action_unpressed";
+signal: "elm,action,unpressed";
+source: "elm";
+after: "button_unpress_anim";
+ }
+ program { name: "action_pressed";
+signal: "elm,action,pressed";
+source: "elm";
+after: "button_press_anim";
+ }
+ program { name: "button_click2";
+action: SIGNAL_EMIT "elm,action,click" "";
+ }
+ program { name: "access_pressed";
+

[EGIT] [core/efl] feature/wayland/multioutput 22/44: themes: cursor - remove elm cursor inheritance.

2018-04-11 Thread Amitesh Singh

devilhorns pushed a commit to branch feature/wayland/multioutput.

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

commit 6abbfb4e3f426411e1d15e603a65d39a3b388ca4
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Apr 11 18:01:50 2018 +0900

themes: cursor - remove elm cursor inheritance.
---
 data/elementary/themes/edc/efl/cursor.edc | 78 ---
 1 file changed, 72 insertions(+), 6 deletions(-)

diff --git a/data/elementary/themes/edc/efl/cursor.edc 
b/data/elementary/themes/edc/efl/cursor.edc
index 1302e4c228..78b8590531 100644
--- a/data/elementary/themes/edc/efl/cursor.edc
+++ b/data/elementary/themes/edc/efl/cursor.edc
@@ -78,14 +78,80 @@
 // "watch"
 // "xterm"
 
-group { "efl/cursor/hand1";
-   inherit: "elm/cursor/hand1/default";
+group { name: "efl/cursor/hand1";
+   images.image: "pointer_hand1.png" COMP;
+   parts {
+  part { name: "base"; mouse_events: 0; scale: 1;
+ description { state: "default" 0.0;
+FIXED_SIZE(32, 32)
+image.normal: "pointer_hand1.png";
+ }
+  }
+  part { name: "elm.swallow.hotspot"; type: SWALLOW;
+ description { state: "default" 0.0;
+visible: 0;
+fixed: 1 1;
+rel1.relative: (26/32) (9/32);
+rel1.to: "base";
+rel2.to: "base";
+rel2.relative: (26/32) (9/32);
+rel2.offset: 0 0;
+ }
+  }
+  /* elm.content.hotspot is the old name for the above part */
+  alias: "elm.content.hotspot" "elm.swallow.hotspot";
+   }
 }
 
-group { "efl/cursor/blank";
-   inherit: "elm/cursor/blank/default";
+group { name: "efl/cursor/blank";
+   parts {
+  part { name: "elm.swallow.hotspot"; type: SWALLOW;
+ description { state: "default" 0.0;
+visible: 0;
+max: 1 1;
+ }
+  }
+  /* elm.content.hotspot is the old name for the above part */
+  alias: "elm.content.hotspot" "elm.swallow.hotspot";
+   }
 }
 
-group { "efl/cursor/xterm";
-   inherit: "elm/cursor/xterm/default";
+group { name: "efl/cursor/xterm";
+   images.image: "pointer_entry_bar.png" COMP;
+   images.image: "led_dot_white.png" COMP;
+   parts {
+  part { name: "base"; mouse_events: 0; scale: 1;
+ description { state: "default" 0.0;
+min: 15 20;
+max: 15 9;
+image.normal: "pointer_entry_bar.png";
+image.border: 0 0 10 10;
+rel1.offset: 0 2;
+rel2.offset: -1 -3;
+ }
+  }
+  part { name: "elm.swallow.hotspot"; type: SWALLOW;
+ description { state: "default" 0.0;
+visible: 0;
+fixed: 1 1;
+rel1.to: "base";
+rel2.to: "base";
+rel1.relative: 0.5 0.5;
+rel2.relative: 0.5 0.5;
+rel2.offset: 0 0;
+ }
+  }
+  /* elm.content.hotspot is the old name for the above part */
+  alias: "elm.content.hotspot" "elm.swallow.hotspot";
+  part { name: "shine";
+ description { state: "default" 0.0;
+rel1.to: "base";
+rel2.to: "base";
+image.normal: "led_dot_white.png";
+max: 27 27;
+aspect: 1.0 1.0;
+aspect_preference: VERTICAL;
+ }
+  }
+   }
 }

--

[EGIT] [core/efl] feature/wayland/multioutput 20/44: theme: focus - remove elm focus highlight inheritance.

2018-04-11 Thread Amitesh Singh

devilhorns pushed a commit to branch feature/wayland/multioutput.

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

commit 3286cbc5d9721b48f5d16d577a088460b3424963
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Apr 11 17:46:37 2018 +0900

theme: focus - remove elm focus highlight inheritance.
---
 data/elementary/themes/edc/efl/focus.edc | 178 ++-
 1 file changed, 174 insertions(+), 4 deletions(-)

diff --git a/data/elementary/themes/edc/efl/focus.edc 
b/data/elementary/themes/edc/efl/focus.edc
index d7c3b78f19..426f869399 100644
--- a/data/elementary/themes/edc/efl/focus.edc
+++ b/data/elementary/themes/edc/efl/focus.edc
@@ -1,7 +1,177 @@
-group { "efl/focus_highlight/top";
-   inherit: "elm/focus_highlight/top/default";
+group { name: "efl/focus_highlight/top";
+   images.image: "box_glow.png" COMP;
+   images.image: "box_outline.png" COMP;
+   data.item: "animate" "on";
+   script {
+  public s_x, s_y, s_w, s_h; /* source */
+  public difx, dify, difw, difh;
+  public g_anim_id;
+
+  public animator1(val, Float:pos) {
+ new x, y, w, h, dx, dy, dw, dh, Float:p;
+ p = 1.0 - ((1.0 - pos) * (1.0 - pos) * (1.0 - pos));
+ dx = round(float_mul(float(get_int(difx)), p));
+ x = get_int(s_x) + dx;
+ dy = round(float_mul(float(get_int(dify)), p));
+ y = get_int(s_y) + dy;
+ dw = round(float_mul(float(get_int(difw)), p));
+ w = get_int(s_w) + dw;
+ dh = round(float_mul(float(get_int(difh)), p));
+ h = get_int(s_h) + dh;
+ update_offset(x, y, w, h);
+
+ if (pos >= 1.0) {
+set_int(g_anim_id, 0);
+ }
+  }
+
+  public update_offset(x, y, w, h) {
+ set_state_val(PART:"base", STATE_REL1_OFFSET, x, y);
+ set_state_val(PART:"base", STATE_REL2_OFFSET, x + w, y + h);
+  }
+
+  public message(Msg_Type:type, id, ...) {
+ if ((type == MSG_INT_SET) && (id == 1)) {
+new x1, y1, w1, h1, x2, y2, w2, h2;
+new anim_id;
+
+anim_id = get_int(g_anim_id);
+if (anim_id != 0) {
+   cancel_anim(anim_id);
+}
+
+x1 = getarg(2);
+y1 = getarg(3);
+w1 = getarg(4);
+h1 = getarg(5);
+x2 = getarg(6);
+y2 = getarg(7);
+w2 = getarg(8);
+h2 = getarg(9);
+
+set_int(s_x, x1);
+set_int(s_y, y1);
+set_int(s_w, w1);
+set_int(s_h, h1);
+set_int(difx, x2 - x1);
+set_int(dify, y2 - y1);
+set_int(difw, w2 - w1);
+set_int(difh, h2 - h1);
+
+custom_state(PART:"base", "default", 0.0);
+set_state_val(PART:"base", STATE_REL1, 0.0, 0.0);
+set_state_val(PART:"base", STATE_REL2, 0.0, 0.0);
+update_offset(x1, y1, w1, h1);
+set_state(PART:"base", "custom", 0.0);
+
+anim_id = anim(0.2, "animator1", 1);
+set_int(g_anim_id, anim_id);
+ }
+  }
+   }
+   parts {
+  part { name: "base"; type: SPACER;
+ description { state: "default" 0.0;
+fixed: 1 1;
+ }
+  }
+  part { name: "clip"; type: RECT;
+ description { state: "default" 0.0;
+rel1.to: "glow";
+rel2.to: "glow";
+color: 255 255 255 0;
+ }
+ description { state: "visible" 0.0;
+inherit: "default" 0.0;
+color: 255 255 255 255;
+ }
+  }
+  part { name: "glow"; mouse_events: 0;
+ clip_to: "clip";
+ description { state: "default" 0.0;
+image.normal: "box_glow.png";
+image.border: 12 12 12 12;
+image.middle: 0;
+fill.smooth: 0;
+rel1.to: "base";
+rel1.offset: -7 -7;
+rel2.to: "base";
+rel2.offset: 5 5;
+ }
+  }
+  part { name: "sel"; mouse_events: 0;
+ clip_to: "clip";
+ description { state: "default" 0.0;
+image.normal: "box_outline.png";
+image.border: 12 12 12 12;
+image.middle: 0;
+fill.smooth: 0;
+rel1.to: "glow";
+rel2.to: "glow";
+color: 255 255 255 0;
+ }
+ description { state: "hi" 0.0;
+inherit: "default" 0.0;
+color: 255 255 255 255;
+ }
+  }
+   }
+   programs {
+  program

[EGIT] [core/efl] feature/wayland/multioutput 21/44: themes: frame - remove elm frame inheritance.

2018-04-11 Thread Amitesh Singh

devilhorns pushed a commit to branch feature/wayland/multioutput.

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

commit 608d6df5ca486bc45178005ba3599f10d8e611b1
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Apr 11 17:58:30 2018 +0900

themes: frame - remove elm frame inheritance.
---
 data/elementary/themes/edc/efl/frame.edc | 169 ++-
 1 file changed, 166 insertions(+), 3 deletions(-)

diff --git a/data/elementary/themes/edc/efl/frame.edc 
b/data/elementary/themes/edc/efl/frame.edc
index f8b4690b24..729177ad98 100644
--- a/data/elementary/themes/edc/efl/frame.edc
+++ b/data/elementary/themes/edc/efl/frame.edc
@@ -1,3 +1,166 @@
-group { "efl/frame";
-   inherit: "elm/frame/base/default";
-}
+group { name: "efl/frame";
+   images.image: "shadow_square_tiny.png" COMP;
+   images.image: "vgrad_med_curved.png" COMP;
+   images.image: "bevel_out.png" COMP;
+   images.image: "holes_tiny_vert.png" COMP;
+   parts {
+  part { name: "shadow"; mouse_events: 0;
+ description { state: "default" 0.0;
+rel1.offset: -1 0;
+rel2.offset: 0 1;
+image.normal: "shadow_square_tiny.png";
+image.border: 6 6 6 6;
+fill.smooth: 0;
+ }
+  }
+  part { name: "base"; type: RECT;
+ description { state: "default" 0.0;
+rel1.relative: 0.0 1.0;
+rel1.offset: 2 0;
+rel1.to_y: "top";
+rel2.offset: -3 -3;
+color: 64 64 64 255;
+ }
+  }
+  part { name: "top";
+ description { state: "default" 0.0;
+image.normal: "vgrad_med_curved.png";
+rel1.offset: 2 2;
+rel2.to_y: "elm.text";
+rel2.offset: -3 -1;
+fill.smooth: 0;
+TILED_HORIZ(120)
+ }
+  }
+  part { name: "edge1";
+ description { state: "default" 0.0;
+image.normal: "holes_tiny_vert.png";
+rel1.offset: 4 0;
+rel1.to_y: "elm.text";
+rel2.offset: 4 -1;
+rel2.relative: 0.0 1.0;
+rel2.to_y: "elm.text";
+align: 0.0 0.5;
+FIXED_SIZE(3, 11)
+ }
+  }
+  part { name: "edge2";
+ description { state: "default" 0.0;
+image.normal: "holes_tiny_vert.png";
+rel1.offset: -5 0;
+rel1.to_y: "elm.text";
+rel1.relative: 1.0 0.0;
+rel2.offset: -5 -1;
+rel2.relative: 1.0 1.0;
+rel2.to_y: "elm.text";
+align: 1.0 0.5;
+FIXED_SIZE(3, 11)
+ }
+  }
+  part { name: "elm.text"; type: TEXT;
+ scale: 1;
+ effect: SHADOW BOTTOM;
+ description { state: "default" 0.0;
+color_class: "frame";
+rel1.relative: 1.0 0.0;
+rel1.offset: 1 2;
+rel1.to_x: "edge1";
+rel2.relative: 0.0 0.0;
+rel2.offset: -3 1;
+rel2.to_x: "edge2";
+align: 0.0 0.0;
+color: FN_COL_DISABLE;
+text { font: FNBD; size: 10;
+   text_class: "frame";
+   align: 0.0 0.0;
+   min: 0 1;
+}
+fixed: 0 1;
+ }
+  }
+  part { name: "clip"; type: RECT;
+ description { state: "default" 0.0;
+rel1.relative: 0.0 1.0;
+rel1.offset: 5 0;
+rel1.to_y: "elm.text";
+rel2.offset: -7 -7;
+ }
+  }
+  part { name: "elm.swallow.content"; type: SWALLOW;
+ clip_to: "clip";
+ description { state: "default" 0.0;
+align: 0.0 1.0;
+rel1.relative: 0.0 1.0;
+rel1.offset: 5 0;
+rel1.to_y: "elm.text";
+rel2.offset: -7 -7;
+ }
+ description { state: "collapsed" 0.0;
+inherit: "default" 0.0;
+minmul: 1.0 0.0;
+ }
+  }
+  part { name: "bevel"; mouse_events: 0;
+ description { state: "default" 0.0;
+rel1.offset: 2 2;
+rel2.offset: -3 -3;
+image.normal: "bevel_out.png";
+image.border: 1 1 1 1;
+image.middle: 0;
+fill.smooth: 0;
+ }
+  }
+  part { name: "event"; type: RECT; ignore_flags: ON_HOLD;
+ description { state: "default" 0.0;
+color: 0 0 0 0;
+rel1.to_y: "elm.text&q

[EGIT] [core/efl] feature/wayland/multioutput 28/44: theme: text - use efl/scroller theme group instead.

2018-04-11 Thread Amitesh Singh

devilhorns pushed a commit to branch feature/wayland/multioutput.

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

commit ec8f976bbfc9a7dc67b0b317f8f7ae43645cb7b3
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Apr 11 18:17:35 2018 +0900

theme: text - use efl/scroller theme group instead.
---
 data/elementary/themes/edc/efl/text.edc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/elementary/themes/edc/efl/text.edc 
b/data/elementary/themes/edc/efl/text.edc
index 728c905399..8f8e4c30d3 100644
--- a/data/elementary/themes/edc/efl/text.edc
+++ b/data/elementary/themes/edc/efl/text.edc
@@ -1,5 +1,5 @@
 group { "efl/text/scroller";
-   inherit: "elm/scroller/base/default";
+   inherit: "efl/scroller";
image: "bg_glow_in.png" COMP;
parts {
   part { name: "elm.swallow.background"; type: SWALLOW;

--

[EGIT] [core/efl] feature/wayland/multioutput 32/44: themes: tooltip - remove elm tooltip inheritance.

2018-04-11 Thread Amitesh Singh

devilhorns pushed a commit to branch feature/wayland/multioutput.

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

commit d71192bf76c31d399cf92cce7383fa2ce6bedaa3
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Apr 11 19:07:11 2018 +0900

themes: tooltip - remove elm tooltip inheritance.
---
 data/elementary/themes/edc/efl/tooltip.edc | 428 -
 1 file changed, 422 insertions(+), 6 deletions(-)

diff --git a/data/elementary/themes/edc/efl/tooltip.edc 
b/data/elementary/themes/edc/efl/tooltip.edc
index 204b2b4ddc..389d3894e6 100644
--- a/data/elementary/themes/edc/efl/tooltip.edc
+++ b/data/elementary/themes/edc/efl/tooltip.edc
@@ -1,15 +1,431 @@
-group { "efl/label/tooltip";
-   inherit: "elm/label/base/tooltip/default";
+group { name: "efl/label/tooltip";
alias: "efl/label/base/tooltip"; //XXX: Remove it in EFL 2.0
alias: "efl/label/base/tooltip/transparent";
+   styles {
+  style { name: "tooltip_style2";
+ base: "font="FN" font_size=10 color=#ff style=shadow,bottom 
shadow_color=#0080 text_class=bubble";
+ tag:  "br" "\n";
+ tag: "hilight" "+ font="FN" text_class=bubble";
+ tag: "b" "+ font="FN" text_class=bubble";
+ tag:  "tab" "\t";
+  }
+   }
+   parts {
+  part { name: "elm.text"; type: TEXTBLOCK; mouse_events: 0;
+ scale: 1;
+ description { state: "default" 0.0;
+text {
+   style: "tooltip_style2";
+   min: 1 1;
+   ellipsis: -1;
+}
+ }
+  }
+   }
 }
 
-group { "efl/tooltip";
-   inherit: "elm/tooltip/base/default";
+group { name: "efl/tooltip";
+   min: 30 30;
+   data.item: "pad_x" "10";
+   data.item: "pad_y" "10";
+   data.item: "pad_border_x" "1";
+   data.item: "pad_border_y" "1";
+   /* tooltip is hidden after this amount.
+Keep in sync with hide animations */
+   data.item: "hide_timeout" "0.35";
+   // if in a window... it's transparent!
+   data.item: "transparent" "enabled";
+   images.image: "tooltip-base.png" COMP;
+   images.image: "tooltip-corner-top-left-tip.png" COMP;
+   images.image: "tooltip-corner-top-right-tip.png" COMP;
+   images.image: "tooltip-corner-bottom-left-tip.png" COMP;
+   images.image: "tooltip-corner-bottom-right-tip.png" COMP;
+   images.image: "tooltip-edge-left-tip.png" COMP;
+   images.image: "tooltip-edge-right-tip.png" COMP;
+   images.image: "tooltip-edge-bottom-tip.png" COMP;
+   images.image: "tooltip-edge-top-tip.png" COMP;
+   script {
+  hide_corners() {
+ set_state(PART:"corner-top-left", "default", 0.0);
+ set_state(PART:"corner-top-right", "default", 0.0);
+ set_state(PART:"corner-bottom-left", "default", 0.0);
+ set_state(PART:"corner-bottom-right", "default", 0.0);
+  }
+  hide_edges() {
+ set_state(PART:"clipper-edge-left", "default", 0.0);
+ set_state(PART:"clipper-edge-right", "default", 0.0);
+ set_state(PART:"clipper-edge-top", "default", 0.0);
+ set_state(PART:"clipper-edge-bottom", "default", 0.0);
+  }
+  show_corner_top_left() {
+ set_state(PART:"corner-top-left", "visible", 0.0);
+ set_state(PART:"corner-top-right", "default", 0.0);
+ set_state(PART:"corner-bottom-left", "default", 0.0);
+ set_state(PART:"corner-bottom-right", "default", 0.0);
+ hide_edges();
+  }
+  show_corner_top_right() {
+ set_state(PART:"corner-top-right", "visible", 0.0);
+ set_state(PART:"corner-top-left", "default", 0.0);
+ set_state(PART:"corner-bottom-left", "default", 0.0);
+ set_state(PART:"corner-bottom-right", "default", 0.0);
+ hide_edges();
+  }
+  show_corner_bottom_left() {
+ set_state(PART:"corner-bottom-left", "visible", 0.0);
+ set_state(PART:"corner-bottom-right", "default", 0.0);
+ set_state(PART:"corner-top-left", "default", 0.0);
+ set_state(PART:"corner-top-right", "default", 0.0);
+ hide_edges();
+  }
+  show_corner_bottom_right()

[EGIT] [core/efl] feature/wayland/multioutput 17/44: theme: bg - remove the elm bg inheritance

2018-04-11 Thread Amitesh Singh

devilhorns pushed a commit to branch feature/wayland/multioutput.

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

commit d20650cb1e86e8937fdcebe7ee4d5287b1715bca
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Apr 11 12:47:03 2018 +0900

theme: bg - remove the elm bg inheritance
---
 data/elementary/themes/edc/efl/bg.edc | 41 ---
 1 file changed, 38 insertions(+), 3 deletions(-)

diff --git a/data/elementary/themes/edc/efl/bg.edc 
b/data/elementary/themes/edc/efl/bg.edc
index 43547d3033..3c57ac81b3 100644
--- a/data/elementary/themes/edc/efl/bg.edc
+++ b/data/elementary/themes/edc/efl/bg.edc
@@ -6,6 +6,41 @@
   elm.swallow.content: Used for elm_layout_part_content_set(bg, "overlay", 
content).
 */
 
-group { "efl/bg";
-   inherit: "elm/bg/base/default";
-}
+group { name: "efl/bg";
+   data.item: "version" "119";
+   images.image: "bevel_dark_out.png" COMP;
+   parts {
+  part { name: "clipper"; type: RECT;
+ description { state: "default" 0.0;
+ }
+  }
+  part { name: "base"; type: RECT;
+ description { state: "default" 0.0;
+color_class: "dialog_base";
+color: 64 64 64 255;
+ }
+  }
+  part { name: "elm.swallow.rectangle"; type: SWALLOW;
+ description { state: "default" 0.0;
+ }
+  }
+  part { name: "elm.swallow.background"; type: SWALLOW;
+ clip_to: "clipper";
+ description { state: "default" 0.0;
+fixed: 1 1;
+ }
+  }
+  part { name: "bevel";
+ description { state: "default" 0.0;
+image.normal: "bevel_dark_out.png";
+image.border: 1 1 1 1;
+image.middle: 0;
+fill.smooth: 0;
+ }
+  }
+  part { name: "elm.swallow.content"; type: SWALLOW;
+ description { state: "default" 0.0;
+ }
+  }
+   }
+}
\ No newline at end of file

--

[EGIT] [core/efl] feature/wayland/multioutput 27/44: theme: textpath - remove elm textpath inheritance.

2018-04-11 Thread Amitesh Singh

devilhorns pushed a commit to branch feature/wayland/multioutput.

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

commit 9ffda3994ba13afe31e9beeebf137114d88fbb8c
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Apr 11 18:14:38 2018 +0900

theme: textpath - remove elm textpath inheritance.
---
 data/elementary/themes/edc/efl/textpath.edc | 25 +++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/data/elementary/themes/edc/efl/textpath.edc 
b/data/elementary/themes/edc/efl/textpath.edc
index ed4924f9fb..dd597a55ac 100644
--- a/data/elementary/themes/edc/efl/textpath.edc
+++ b/data/elementary/themes/edc/efl/textpath.edc
@@ -1,3 +1,24 @@
-group { "efl/textpath";
-   inherit: "elm/textpath/base/default";
+group { name: "efl/textpath";
+   styles {
+  style { name: "textpath_style2";
+ base: "font="FN" font_size=16 text_class=tb_plain wrap=none 
align=left color=# style=shadow,bottom shadow_color=#0080";
+ tag: "br" "\n";
+ tag: "b" "+ font="FNBD" text_class=tb_light";
+ ENABLED_TEXTBLOCK_TAGS
+  }
+   }
+   parts {
+  part { name: "elm.text";
+ type: TEXTBLOCK;
+ scale: 1;
+ description { state: "default" 0.0;
+align: 0.0 0.0;
+text {
+   style: "textpath_style2";
+   min: 0 1;
+   align: 0.0 0.5;
+}
+ }
+  }
+   }
 }

--

[EGIT] [core/efl] feature/wayland/multioutput 30/44: theme: popup - define popup alert theme based on new theme

2018-04-11 Thread Amitesh Singh

devilhorns pushed a commit to branch feature/wayland/multioutput.

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

commit 4a8df2d64fce48205fce7659b15bac8da33804da
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Apr 11 18:56:55 2018 +0900

theme: popup - define popup alert theme based on new theme
---
 data/elementary/themes/edc/efl/popup.edc | 22 --
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/data/elementary/themes/edc/efl/popup.edc 
b/data/elementary/themes/edc/efl/popup.edc
index 491d483b42..50fb460f09 100644
--- a/data/elementary/themes/edc/efl/popup.edc
+++ b/data/elementary/themes/edc/efl/popup.edc
@@ -250,9 +250,27 @@ group { "efl/popup_alert/button";
alias: "efl/popup_alert_text/button";
 }
 
-group { "efl/popup_alert_scroll/scroller";
-   inherit: "elm/scroller/base/popup/no_inset_shadow";
+group { name: "efl/popup_alert_scroll/scroller";
+   inherit: "efl/scroller";
alias: "efl/popup_alert_text/scroller";
+   parts {
+  part { name: "elm.swallow.content"; type: SWALLOW;
+ description { state: "default" 0.0;
+rel1.offset: 0 0;
+rel2.offset: 0 0;
+ }
+  }
+  part { name: "inset";
+ description { state: "default" 0.0;
+visible: 0;
+ }
+  }
+  part { name: "shadow";
+ description { state: "default" 0.0;
+visible: 0;
+ }
+  }
+   }
 }
 
 group { "efl/popup_alert_text/text";

--

[EGIT] [core/efl] feature/wayland/multioutput 33/44: theme: pointer - remove elm pointer inheritance.

2018-04-11 Thread Amitesh Singh

devilhorns pushed a commit to branch feature/wayland/multioutput.

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

commit c348a1dd775d49ea817b67dc660d5eb43807fa4e
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Apr 11 19:19:41 2018 +0900

theme: pointer - remove elm pointer inheritance.
---
 data/elementary/themes/edc/efl/pointer.edc | 224 +++--
 1 file changed, 209 insertions(+), 15 deletions(-)

diff --git a/data/elementary/themes/edc/efl/pointer.edc 
b/data/elementary/themes/edc/efl/pointer.edc
index 57bdfbfcee..a101aa73c7 100644
--- a/data/elementary/themes/edc/efl/pointer.edc
+++ b/data/elementary/themes/edc/efl/pointer.edc
@@ -1,27 +1,221 @@
-group { "efl/pointer";
-   inherit: "elm/pointer/base/default";
+group { name: "efl/pointer";
+   images {
+  image: "pointer.png" COMP;
+  image: "pointer_glow.png" COMP;
+   }
+   parts {
+  part {
+ name: "base";
+ mouse_events: 0;
+ description {
+state: "default" 0.0;
+aspect: 1.0 1.0;
+min: 32 32;
+/* force a specific aspect ratio so
+ * when it gets scaled it wont squash
+ * or stretch */
+aspect_preference: BOTH;
+/* both axes control aspect - thus it
+ * will be WITHIN the bounds the axes
+ * of thre part describe */
+image {
+   normal: "pointer.png";
+}
+ }
+  }
+  part { name: "glow";
+ description { state: "default" 0.0;
+image.normal: "pointer_glow.png";
+color: 255 255 255 0;
+ }
+ description { state: "visible" 0.0;
+inherit: "default" 0.0;
+color: 255 255 255 255;
+ }
+ description { state: "faded" 0.0;
+inherit: "default" 0.0;
+color: 255 255 255 128;
+ }
+  }
+  part {
+ name: "elm.swallow.hotspot";
+ /* this is a "fake" swallow part
+  * that is used by e to determine
+  * the pointer hotspot - or where
+  * the actual mouse events get
+  * reported from on the cursor */
+ type: SWALLOW;
+ description {
+state: "default" 0.0;
+visible: 0;
+fixed: 1 1;
+rel1 {
+   /* the hotspot will scale with the cursor here */
+   to: "base";
+   relative: 0.1875 0.1875;
+   offset: 0 0;
+}
+rel2 {
+   to: "base";
+   relative: 0.1875 0.1875;
+   offset: 0 0;
+}
+ }
+  }
+   }
+   programs {
+  program {
+ signal: "elm,action,mouse,down"; source: "elm";
+ action: STATE_SET "visible" 0.0;
+ target: "glow";
+ after: "fade";
+  }
+  program { name: "fade";
+ action: STATE_SET "default" 0.0;
+ transition: SINUSOIDAL 0.5;
+ target: "glow";
+  }
+  program { name: "pulse";
+ signal: "e,state,mouse,idle"; source: "e";
+ in: 10.0 0.0;
+ action: STATE_SET "faded" 0.0;
+ transition: SINUSOIDAL 0.25;
+ target: "glow";
+ after: "pulse2";
+  }
+  program { name: "pulse2";
+ action: STATE_SET "default" 0.0;
+ transition: SINUSOIDAL 0.5;
+ target: "glow";
+ after: "pulse";
+  }
+  program {
+ signal: "elm,action,mouse,move"; source: "elm";
+ action: STATE_SET "default" 0.0;
+ target: "glow";
+ after: "stop2";
+  }
+  program { name: "stop2";
+ action: ACTION_STOP;
+ target: "pulse";
+ target: "pulse2";
+  }
+   }
 }
 
-group { "efl/pointer:bottom_right_corner";
-   inherit: "elm/pointer/base/bottom_right_corner";
+group { name: "efl/pointer:bottom_right_corner";
+   inherit: "efl/pointer";
+   images.image: "mini_box_glow.png" COMP;
+   parts {
+  part { name: "box";
+ insert_after: "glow";
+ description { state: "default" 0.0;
+image.normal: "mini_box_glow.png";
+image.border: 7 7 7 7;
+rel1.relative: 0.3 0.3;
+rel2.relative: 0.7 0.7;
+ }
+ description { state: "p1" 0.0;
+inherit: "default" 0.0;
+rel1.relative:

[EGIT] [core/efl] feature/wayland/multi-output 20/31: theme: list - remove elm scroller, elm list item inheritance.

2018-04-11 Thread Amitesh Singh

devilhorns pushed a commit to branch feature/wayland/multi-output.

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

commit 7dde7babe197e561bc6e26f7dae4e86e609b5ed9
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Apr 11 18:33:24 2018 +0900

theme: list - remove elm scroller, elm list item inheritance.
---
 data/elementary/themes/default.edc  |   2 +-
 data/elementary/themes/edc/efl/list.edc | 292 +++-
 2 files changed, 289 insertions(+), 5 deletions(-)

diff --git a/data/elementary/themes/default.edc 
b/data/elementary/themes/default.edc
index 2de68596f5..3b851409f5 100644
--- a/data/elementary/themes/default.edc
+++ b/data/elementary/themes/default.edc
@@ -169,9 +169,9 @@ collections {
 #include "edc/efl/button.edc"
 #include "edc/efl/calendar.edc"
 #include "edc/efl/nstate.edc"
-#include "edc/efl/list.edc"
 // XXX: mobile mode needs invisible scrollers... make signals that do this
 #include "edc/efl/scroller.edc"
+#include "edc/efl/list.edc"
 // XXX: mobile mode needs different entry setup
 #include "edc/efl/text.edc"
 #include "edc/efl/frame.edc"
diff --git a/data/elementary/themes/edc/efl/list.edc 
b/data/elementary/themes/edc/efl/list.edc
index ae252b9413..4b309c8ce5 100644
--- a/data/elementary/themes/edc/efl/list.edc
+++ b/data/elementary/themes/edc/efl/list.edc
@@ -1,8 +1,292 @@
 group { "efl/view_list";
-   inherit: "elm/list/base/default";
+   inherit: "efl/scroller";
 }
 
-group { "efl/list/item";
-   inherit: "elm/list/item/default";
-}
+group { name: "efl/list/item";
+   data.item: "selectraise" "on";
+   data.item: "focusraise" "on";
+   images.image: "bevel_curved_horiz_out.png" COMP;
+   images.image: "shadow_rounded_horiz.png" COMP;
+   images.image: "vgrad_med_dark.png" COMP;
+   images.image: "bevel_horiz_out.png" COMP;
+   images.image: "shine.png" COMP;
+   parts {
+  part { name: "event"; type: RECT;
+ description { state: "default" 0.0;
+color: 0 0 0 0;
+ }
+ description { state: "disabled" 0.0;
+inherit: "default" 0.0;
+visible: 0;
+ }
+  }
+  part { name: "base"; type: RECT; mouse_events: 0;
+ description { state: "default" 0.0;
+color: 64 64 64 255;
+color_class: "list_item_base";
+ }
+ description { state: "odd" 0.0;
+color: 56 56 56 255;
+color_class: "list_item_base_odd";
+ }
+  }
+  program {
+ signal: "elm,state,odd"; source: "elm";
+ action: STATE_SET "odd" 1.0;
+ target: "base";
+  }
+  program {
+ signal: "elm,state,even"; source: "elm";
+ action: STATE_SET "default" 0.0;
+ target: "base";
+  }
+  part { name: "bevel"; mouse_events: 0;
+ description { state: "default" 0.0;
+image.normal: "bevel_curved_horiz_out.png";
+image.border: 0 0 2 2;
+image.middle: 0;
+fill.smooth: 0;
+ }
+  }
+  part { name: "sel_shadow"; mouse_events: 0;
+ description { state: "default" 0.0;
+image.normal: "shadow_rounded_horiz.png";
+image.border: 0 0 9 9;
+rel1.offset: 0 -4;
+rel2.offset: -1 5;
+fill.smooth: 0;
+visible: 0;
+ }
+ description { state: "selected" 0.0;
+inherit: "default" 0.0;
+visible: 1;
+ }
+  }
+  part { name: "sel_base"; mouse_events: 0;
+ description { state: "default" 0.0;
+image.normal: "vgrad_med_dark.png";
+fill.smooth: 0;
+visible: 0;
+TILED_HORIZ(120)
+ }
+ description { state: "selected" 0.0;
+inherit: "default" 0.0;
+visible: 1;
+ }
+  }
+  part { name: "sel_bevel"; mouse_events: 0;
+ description { state: "default" 0.0;
+image.normal: "bevel_horiz_out.png";
+image.border: 0 0 2 2;
+image.middle: 0;
+fill.smooth: 0;
+visible: 0;
+ }
+ description { state: "selected" 0.0;
+inherit: "default" 0.0;
+visible: 1;
+ }
+  }
+  program {
+ signal: "elm,state,selected"; source: "elm";
+ action: STATE

[EGIT] [core/efl] feature/wayland/multi-output 17/31: theme: video - remove elm video inheritance

2018-04-11 Thread Amitesh Singh

devilhorns pushed a commit to branch feature/wayland/multi-output.

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

commit 1793357dd4dfc8bb92612808459ab03cb0085f87
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Apr 11 18:12:09 2018 +0900

theme: video - remove elm video inheritance
---
 data/elementary/themes/edc/efl/video.edc | 46 +---
 1 file changed, 43 insertions(+), 3 deletions(-)

diff --git a/data/elementary/themes/edc/efl/video.edc 
b/data/elementary/themes/edc/efl/video.edc
index 3a2a658b06..1f943a8096 100644
--- a/data/elementary/themes/edc/efl/video.edc
+++ b/data/elementary/themes/edc/efl/video.edc
@@ -1,3 +1,43 @@
-group { "efl/video";
-   inherit: "elm/video/base/default";
-}
+group { name: "efl/video";
+   parts {
+  part { name: "clipper"; type: RECT;
+ description { state: "default" 0.0;
+color: 255 255 255 255;
+ }
+ description { state: "darker" 0.0;
+color: 128 128 128 255;
+ }
+  }
+  part { name: "elm.swallow.video"; type: SWALLOW;  mouse_events: 1;
+ clip_to: "clipper";
+ description { state: "default" 0.0;
+aspect: 1.0 1.0; aspect_preference: BOTH;
+ }
+  }
+   }
+   programs {
+  program {
+ signal: "elm,video,load"; source: "elm";
+ action: STATE_SET "darker" 0.0;
+ target: "clipper";
+  }
+  program {
+ signal: "elm,video,play"; source: "elm";
+ action: STATE_SET "default" 0.0;
+ transition: SINUSOIDAL 0.2 CURRENT;
+ target: "clipper";
+  }
+  program {
+ signal: "elm,video,end"; source: "elm";
+ action: STATE_SET "darker" 0.0;
+ transition: SINUSOIDAL 0.5 CURRENT;
+ target: "clipper";
+  }
+  program {
+ signal: "elm,video,pause"; source: "elm";
+ action: STATE_SET "darker" 0.0;
+ transition: SINUSOIDAL 0.7 CURRENT;
+ target: "clipper";
+  }
+   }
+}
\ No newline at end of file

--

[EGIT] [core/efl] feature/wayland/multi-output 14/31: theme: scroller - remove elm scroller inheritance

2018-04-11 Thread Amitesh Singh

devilhorns pushed a commit to branch feature/wayland/multi-output.

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

commit 03893ea016f05a2c35889a6614d7153ed00a3683
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Apr 11 18:08:08 2018 +0900

theme: scroller - remove elm scroller inheritance
---
 data/elementary/themes/edc/efl/scroller.edc | 1336 ++-
 1 file changed, 1329 insertions(+), 7 deletions(-)

diff --git a/data/elementary/themes/edc/efl/scroller.edc 
b/data/elementary/themes/edc/efl/scroller.edc
index e0d81482c0..032972b084 100644
--- a/data/elementary/themes/edc/efl/scroller.edc
+++ b/data/elementary/themes/edc/efl/scroller.edc
@@ -1,12 +1,1334 @@
-group { "efl/scroller";
-   inherit: "elm/scroller/base/default";
-}
+group { name: "efl/scroller";
+   images.image: "inset_shadow.png" COMP;
+   images.image: "bevel_in.png" COMP;
+   images.image: "bevel_out.png" COMP;
+   images.image: "runner_horiz.png" COMP;
+   images.image: "runner_vert.png" COMP;
+   images.image: "runner_glow_horiz.png" COMP;
+   images.image: "runner_glow_vert.png" COMP;
+   images.image: "holes_tiny_horiz.png" COMP;
+   images.image: "holes_tiny_vert.png" COMP;
+   images.image: "holes_tiny_glow_horiz.png" COMP;
+   images.image: "holes_tiny_glow_vert.png" COMP;
+   images.image: "vgrad_med_lighter.png" COMP;
+   images.image: "shadow_square_tiny.png" COMP;
+   images.image: "glow_small.png" COMP;
+   images.image: "sym_left_light_normal.png" COMP;
+   images.image: "sym_right_light_normal.png" COMP;
+   images.image: "sym_up_light_normal.png" COMP;
+   images.image: "sym_down_light_normal.png" COMP;
+   images.image: "sym_left_glow_normal.png" COMP;
+   images.image: "sym_right_glow_normal.png" COMP;
+   images.image: "sym_up_glow_normal.png" COMP;
+   images.image: "sym_down_glow_normal.png" COMP;
+   images.image: "sym_up_dark_normal.png" COMP;
+   images.image: "sym_down_dark_normal.png" COMP;
+   images.image: "sym_left_dark_normal.png" COMP;
+   images.image: "sym_right_dark_normal.png" COMP;
+
+
+   data.item: "focus_highlight" "on";
+
+   script {
+  public loop_x, loop_y;
+  public action_on_pos_vbar(val) {
+ new x, y , w, h, x1, y1 , w1, h1;
+
+ get_geometry(PART:"y_vbar_up", x,y,w, h);
+ get_geometry(PART:"y_vbar_up_mapper", x1,y1,w1, h1);
+
+ if(((y1 <= y) && (y <= (y1 + h1))) && (0 == get_int(loop_y)))
+ {
+set_state(PART:"arrow1_vbar", "hidden", 0.0);
+set_state(PART:"sb_vbar_a1", "hidden", 0.0);
+ }
+ else
+ {
+set_state(PART:"arrow1_vbar", "default", 0.0);
+set_state(PART:"sb_vbar_a1", "default", 0.0);
+ }
+
+ get_geometry(PART:"y_vbar_down", x,y,w, h);
+ get_geometry(PART:"y_vbar_down_mapper", x1,y1,w1, h1);
+
+ if(((y1 <= (y + h)) && ((y+ h) <= (y1 + h1))) && (0 == 
get_int(loop_y)))
+ {
+set_state(PART:"arrow2_vbar", "hidden", 0.0);
+set_state(PART:"sb_vbar_a2", "hidden", 0.0);
+ }
+ else
+ {
+set_state(PART:"arrow2_vbar", "default", 0.0);
+set_state(PART:"sb_vbar_a2", "default", 0.0);
+ }
+
+ if(val < 10)
+timer(0.1,"action_on_pos_vbar", val+1);
+  }
 
-group { "efl/scroller:noclip";
-   inherit: "elm/scroller/base/noclip";
+  public action_on_pos_hbar(val) {
+ new x, y , w, h, x1, y1 , w1, h1;
+
+ get_geometry(PART:"x_hbar_left", x,y,w, h);
+ get_geometry(PART:"x_hbar_left_mapper", x1,y1,w1, h1);
+
+ if(((x1 <= x) && (x <= (x1 + w1))) && (0 == get_int(loop_x)))
+ {
+set_state(PART:"arrow1_hbar", "hidden", 0.0);
+set_state(PART:"sb_hbar_a1", "hidden", 0.0);
+ }
+ else
+ {
+set_state(PART:"arrow1_hbar", "default", 0.0);
+set_state(PART:"sb_hbar_a1", "default", 0.0);
+ }
+
+ get_geometry(PART:"x_hbar_right", x,y,w, h);
+ get_geometry(PART:"x_hbar_right_mapper", x1,y1,w1, h1);
+
+ if(((x1 <= (x + w)) && ((x + w) <= (x1 + w1))) && (0 == 
get_int(loop_x)))
+ {
+

[EGIT] [core/efl] feature/wayland/multi-output 09/31: theme: border - remove elm border inheritance

2018-04-11 Thread Amitesh Singh

devilhorns pushed a commit to branch feature/wayland/multi-output.

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

commit 31ecbb578cd7fcd864de1d5a37aa62e8164f6a4a
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Apr 11 17:33:37 2018 +0900

theme: border - remove elm border inheritance

and add full edc theme.
---
 data/elementary/themes/edc/efl/border.edc | 1214 -
 1 file changed, 1208 insertions(+), 6 deletions(-)

diff --git a/data/elementary/themes/edc/efl/border.edc 
b/data/elementary/themes/edc/efl/border.edc
index 55748268de..f6e8b8922d 100644
--- a/data/elementary/themes/edc/efl/border.edc
+++ b/data/elementary/themes/edc/efl/border.edc
@@ -7,15 +7,1217 @@
  *  - virtual keyboard
  */
 
-group { "efl/border";
-   inherit: "elm/border/base/default";
+group { name: "efl/border";
+   images.image: "vgrad_med_lighter.png" COMP;
+   images.image: "vgrad_med_dark.png" COMP;
+   images.image: "bevel_out.png" COMP;
+   images.image: "shine.png" COMP;
+   images.image: "bevel_dark_out.png" COMP;
+   images.image: "sym_close_dark_normal.png" COMP;
+   images.image: "sym_close_dark_selected.png" COMP;
+   images.image: "sym_close_light_normal.png" COMP;
+   images.image: "sym_close_light_selected.png" COMP;
+   images.image: "sym_down_dark_normal.png" COMP;
+   images.image: "sym_down_dark_selected.png" COMP;
+   images.image: "sym_down_light_normal.png" COMP;
+   images.image: "sym_down_light_selected.png" COMP;
+   images.image: "sym_up_dark_normal.png" COMP;
+   images.image: "sym_up_dark_selected.png" COMP;
+   images.image: "sym_up_light_normal.png" COMP;
+   images.image: "sym_up_light_selected.png" COMP;
+   images.image: "glow_round_corners_small.png" COMP;
+   images.image: "knob_round_small_busy.png" COMP;
+   images.image: "screen_circular_shadow.png" COMP;
+   images.image: "win_shadow.png" COMP;
+   data.item: "shadow" "1";
+   data.item: "version" "119";
+   parts {
+  /* opaque region of the window, to inform the compositor */
+  spacer { "elm.spacer.opaque";
+ desc {
+rel1.to: "top_clip";
+rel2.to: "bottom_clip";
+ }
+ desc { "max"; inherit: "default"; }
+  }
+  /* covers the entire client contents, excluding the main menu */
+  spacer { "elm.spacer.content";
+ required; // since 1.19
+ desc {
+rel1.to: "elm.swallow.menu";
+rel1.relative: 0.0 1.0;
+rel2.to: "elm.swallow.keyboard";
+rel2.relative: 1.0 0.0;
+ }
+  }
+  /* shadow spacer and clipper */
+  spacer { "shadow_spacer";
+ desc { "default";
+WIN_SHADOW_SPACER;
+ }
+ desc { "hidden";
+rel1.offset: 0 0;
+rel2.offset: -1 -1;
+ }
+  }
+  image { "shadow"; nomouse;
+ desc { "default";
+rel.to: "shadow_spacer";
+WIN_SHADOW;
+ }
+ desc { "hidden"; inherit: "default"; hid; }
+  }
+  /* window background: solid color */
+  rect { "bg_clip";
+ nomouse;
+ desc { "default";
+rel1.to: "top_clip";
+rel1.relative: 0.0 1.0;
+rel2.to: "bottom_clip";
+ }
+  }
+  rect { "elm.rect.background";
+ required; // @since 1.19
+ clip: "bg_clip";
+ desc { "default";
+color: 255 255 255 255;
+color_class: "elm/win/background"; // FIXME: color_class naming 
scheme
+visible: 0;
+ }
+ desc { "visible";
+inherit: "default";
+visible: 1;
+ }
+  }
+  /* window background: image */
+  swallow { "elm.swallow.background";
+ required; // @since 1.19
+ clip: "client_clip";
+  }
+  image { "background_bevel";
+ desc { "default";
+image {
+   normal: "bevel_dark_out.png";
+   border: 1 1 1 1;
+   middle: 0;
+}
+fill.smooth: 0;
+rel.to: "elm.spacer.content";
+visible: 0;
+ }
+ desc { "visible";
+inherit: "default";
+visible: 1;
+ }
+  }
+  spacer { "indicator_spacer";
+ desc { "de

[EGIT] [core/efl] feature/wayland/multi-output 11/31: theme: focus - remove elm focus highlight inheritance.

2018-04-11 Thread Amitesh Singh

devilhorns pushed a commit to branch feature/wayland/multi-output.

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

commit 94fe67017054789628b497063fe5c8f12d03b13c
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Apr 11 17:46:37 2018 +0900

theme: focus - remove elm focus highlight inheritance.
---
 data/elementary/themes/edc/efl/focus.edc | 178 ++-
 1 file changed, 174 insertions(+), 4 deletions(-)

diff --git a/data/elementary/themes/edc/efl/focus.edc 
b/data/elementary/themes/edc/efl/focus.edc
index d7c3b78f19..426f869399 100644
--- a/data/elementary/themes/edc/efl/focus.edc
+++ b/data/elementary/themes/edc/efl/focus.edc
@@ -1,7 +1,177 @@
-group { "efl/focus_highlight/top";
-   inherit: "elm/focus_highlight/top/default";
+group { name: "efl/focus_highlight/top";
+   images.image: "box_glow.png" COMP;
+   images.image: "box_outline.png" COMP;
+   data.item: "animate" "on";
+   script {
+  public s_x, s_y, s_w, s_h; /* source */
+  public difx, dify, difw, difh;
+  public g_anim_id;
+
+  public animator1(val, Float:pos) {
+ new x, y, w, h, dx, dy, dw, dh, Float:p;
+ p = 1.0 - ((1.0 - pos) * (1.0 - pos) * (1.0 - pos));
+ dx = round(float_mul(float(get_int(difx)), p));
+ x = get_int(s_x) + dx;
+ dy = round(float_mul(float(get_int(dify)), p));
+ y = get_int(s_y) + dy;
+ dw = round(float_mul(float(get_int(difw)), p));
+ w = get_int(s_w) + dw;
+ dh = round(float_mul(float(get_int(difh)), p));
+ h = get_int(s_h) + dh;
+ update_offset(x, y, w, h);
+
+ if (pos >= 1.0) {
+set_int(g_anim_id, 0);
+ }
+  }
+
+  public update_offset(x, y, w, h) {
+ set_state_val(PART:"base", STATE_REL1_OFFSET, x, y);
+ set_state_val(PART:"base", STATE_REL2_OFFSET, x + w, y + h);
+  }
+
+  public message(Msg_Type:type, id, ...) {
+ if ((type == MSG_INT_SET) && (id == 1)) {
+new x1, y1, w1, h1, x2, y2, w2, h2;
+new anim_id;
+
+anim_id = get_int(g_anim_id);
+if (anim_id != 0) {
+   cancel_anim(anim_id);
+}
+
+x1 = getarg(2);
+y1 = getarg(3);
+w1 = getarg(4);
+h1 = getarg(5);
+x2 = getarg(6);
+y2 = getarg(7);
+w2 = getarg(8);
+h2 = getarg(9);
+
+set_int(s_x, x1);
+set_int(s_y, y1);
+set_int(s_w, w1);
+set_int(s_h, h1);
+set_int(difx, x2 - x1);
+set_int(dify, y2 - y1);
+set_int(difw, w2 - w1);
+set_int(difh, h2 - h1);
+
+custom_state(PART:"base", "default", 0.0);
+set_state_val(PART:"base", STATE_REL1, 0.0, 0.0);
+set_state_val(PART:"base", STATE_REL2, 0.0, 0.0);
+update_offset(x1, y1, w1, h1);
+set_state(PART:"base", "custom", 0.0);
+
+anim_id = anim(0.2, "animator1", 1);
+set_int(g_anim_id, anim_id);
+ }
+  }
+   }
+   parts {
+  part { name: "base"; type: SPACER;
+ description { state: "default" 0.0;
+fixed: 1 1;
+ }
+  }
+  part { name: "clip"; type: RECT;
+ description { state: "default" 0.0;
+rel1.to: "glow";
+rel2.to: "glow";
+color: 255 255 255 0;
+ }
+ description { state: "visible" 0.0;
+inherit: "default" 0.0;
+color: 255 255 255 255;
+ }
+  }
+  part { name: "glow"; mouse_events: 0;
+ clip_to: "clip";
+ description { state: "default" 0.0;
+image.normal: "box_glow.png";
+image.border: 12 12 12 12;
+image.middle: 0;
+fill.smooth: 0;
+rel1.to: "base";
+rel1.offset: -7 -7;
+rel2.to: "base";
+rel2.offset: 5 5;
+ }
+  }
+  part { name: "sel"; mouse_events: 0;
+ clip_to: "clip";
+ description { state: "default" 0.0;
+image.normal: "box_outline.png";
+image.border: 12 12 12 12;
+image.middle: 0;
+fill.smooth: 0;
+rel1.to: "glow";
+rel2.to: "glow";
+color: 255 255 255 0;
+ }
+ description { state: "hi" 0.0;
+inherit: "default" 0.0;
+color: 255 255 255 255;
+ }
+  }
+   }
+   programs {
+  program

[EGIT] [core/efl] feature/wayland/multi-output 19/31: theme: text - use efl/scroller theme group instead.

2018-04-11 Thread Amitesh Singh

devilhorns pushed a commit to branch feature/wayland/multi-output.

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

commit 9577ce4f4efb3b13fee7c76b6f735c150dbf5a13
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Apr 11 18:17:35 2018 +0900

theme: text - use efl/scroller theme group instead.
---
 data/elementary/themes/edc/efl/text.edc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/elementary/themes/edc/efl/text.edc 
b/data/elementary/themes/edc/efl/text.edc
index 728c905399..8f8e4c30d3 100644
--- a/data/elementary/themes/edc/efl/text.edc
+++ b/data/elementary/themes/edc/efl/text.edc
@@ -1,5 +1,5 @@
 group { "efl/text/scroller";
-   inherit: "elm/scroller/base/default";
+   inherit: "efl/scroller";
image: "bg_glow_in.png" COMP;
parts {
   part { name: "elm.swallow.background"; type: SWALLOW;

--

[EGIT] [core/efl] feature/wayland/multi-output 26/31: theme: spin button - remove elm spin btn inheritance.

2018-04-11 Thread Amitesh Singh

devilhorns pushed a commit to branch feature/wayland/multi-output.

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

commit 5d33bc85be698eec49bd842ce4c865f0b02e2833
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Apr 11 19:52:09 2018 +0900

theme: spin button - remove elm spin btn inheritance.
---
 data/elementary/themes/edc/efl/spin_button.edc | 307 +++--
 1 file changed, 294 insertions(+), 13 deletions(-)

diff --git a/data/elementary/themes/edc/efl/spin_button.edc 
b/data/elementary/themes/edc/efl/spin_button.edc
index 40e9492a2e..4d502e3779 100644
--- a/data/elementary/themes/edc/efl/spin_button.edc
+++ b/data/elementary/themes/edc/efl/spin_button.edc
@@ -206,23 +206,304 @@ group { "efl/spin_button:vertical";
}
 }
 
-group { "efl/spin_button/inc_button";
-   inherit: "elm/button/base/spinner/increase/default";
-}
+group { name: "efl/spin_button/inc_button";
+  images.image: "sym_right_light_normal.png" COMP;
+  images.image: "sym_right_glow_normal.png" COMP;
+  images.image: "sym_right_dark_normal.png" COMP;
+  script {
+ public mouse_down = 0;
+ public multi_down = 0;
+  }
+  parts {
+ part { name: "arrow.image";
+scale: 1;
+description { state: "default" 0.0;
+   min: 15 15;
+   max: 15 15;
+   color_class: "F032L1";
+   image.normal: "sym_right_light_normal.png";
+}
+description { state: "pressed" 0.0;
+   inherit: "default" 0.0;
+   image.normal: "sym_right_glow_normal.png";
+}
+description { state: "disabled" 0.0;
+   inherit: "default" 0.0;
+   image.normal: "sym_right_dark_normal.png";
+}
+ }
+ part { name: "over";
+type: RECT;
+repeat_events: 1;
+description { state: "default" 0.0;
+   color: 0 0 0 0;
+}
+ }
+ part { name: "disabler";
+type: RECT;
+description { state: "default" 0.0;
+   color: 0 0 0 0;
+   visible: 0;
+}
+description { state: "disabled" 0.0;
+   inherit: "default" 0.0;
+   visible: 1;
+}
+ }
+  }
+  programs {
+ program { name: "button_press";
+signal: "mouse,down,1";
+source: "over";
+script {
+   if ((get_int(multi_down) == 0) &&
+   (get_int(mouse_down) == 0)) {
+ set_int(mouse_down, 1);
+ run_program(PROGRAM:"button_press2");
+   }
+}
+ }
+ program { name: "button_press2";
+action: SIGNAL_EMIT "elm,action,press" "";
+after: "button_press_anim";
+ }
+ program { name: "button_press_anim";
+action: STATE_SET "pressed" 0.0;
+target: "arrow.image";
+ }
+ program { name: "button_unpress";
+signal: "mouse,up,1";
+source: "over";
+script {
+   if (get_int(mouse_down) == 1) {
+ set_int(mouse_down, 0);
+ run_program(PROGRAM:"button_unpress2");
+ run_program(PROGRAM:"button_unpress_anim");
+   }
+}
+ }
+ program { name: "button_unpress2";
+action: SIGNAL_EMIT "elm,action,unpress" "";
+ }
+ program { name: "button_unpress_anim";
+action: STATE_SET "default" 0.0;
+target: "arrow.image";
+ }
+ program { name: "button_click";
+signal: "mouse,clicked,1";
+source: "over";
+script {
+   if (get_int(multi_down) == 0) {
+ run_program(PROGRAM:"button_click2");
+   }
+}
+ }
+ program { name: "action_unpressed";
+signal: "elm,action,unpressed";
+source: "elm";
+after: "button_unpress_anim";
+ }
+ program { name: "action_pressed";
+signal: "elm,action,pressed";
+source: "elm";
+after: "button_press_anim";
+ }
+ program { name: "button_click2&

[EGIT] [core/efl] feature/wayland/multi-output 13/31: themes: cursor - remove elm cursor inheritance.

2018-04-11 Thread Amitesh Singh

devilhorns pushed a commit to branch feature/wayland/multi-output.

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

commit 355e16020a2c1fb00f8f52d578e92bed6182e240
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Apr 11 18:01:50 2018 +0900

themes: cursor - remove elm cursor inheritance.
---
 data/elementary/themes/edc/efl/cursor.edc | 78 ---
 1 file changed, 72 insertions(+), 6 deletions(-)

diff --git a/data/elementary/themes/edc/efl/cursor.edc 
b/data/elementary/themes/edc/efl/cursor.edc
index 1302e4c228..78b8590531 100644
--- a/data/elementary/themes/edc/efl/cursor.edc
+++ b/data/elementary/themes/edc/efl/cursor.edc
@@ -78,14 +78,80 @@
 // "watch"
 // "xterm"
 
-group { "efl/cursor/hand1";
-   inherit: "elm/cursor/hand1/default";
+group { name: "efl/cursor/hand1";
+   images.image: "pointer_hand1.png" COMP;
+   parts {
+  part { name: "base"; mouse_events: 0; scale: 1;
+ description { state: "default" 0.0;
+FIXED_SIZE(32, 32)
+image.normal: "pointer_hand1.png";
+ }
+  }
+  part { name: "elm.swallow.hotspot"; type: SWALLOW;
+ description { state: "default" 0.0;
+visible: 0;
+fixed: 1 1;
+rel1.relative: (26/32) (9/32);
+rel1.to: "base";
+rel2.to: "base";
+rel2.relative: (26/32) (9/32);
+rel2.offset: 0 0;
+ }
+  }
+  /* elm.content.hotspot is the old name for the above part */
+  alias: "elm.content.hotspot" "elm.swallow.hotspot";
+   }
 }
 
-group { "efl/cursor/blank";
-   inherit: "elm/cursor/blank/default";
+group { name: "efl/cursor/blank";
+   parts {
+  part { name: "elm.swallow.hotspot"; type: SWALLOW;
+ description { state: "default" 0.0;
+visible: 0;
+max: 1 1;
+ }
+  }
+  /* elm.content.hotspot is the old name for the above part */
+  alias: "elm.content.hotspot" "elm.swallow.hotspot";
+   }
 }
 
-group { "efl/cursor/xterm";
-   inherit: "elm/cursor/xterm/default";
+group { name: "efl/cursor/xterm";
+   images.image: "pointer_entry_bar.png" COMP;
+   images.image: "led_dot_white.png" COMP;
+   parts {
+  part { name: "base"; mouse_events: 0; scale: 1;
+ description { state: "default" 0.0;
+min: 15 20;
+max: 15 9;
+image.normal: "pointer_entry_bar.png";
+image.border: 0 0 10 10;
+rel1.offset: 0 2;
+rel2.offset: -1 -3;
+ }
+  }
+  part { name: "elm.swallow.hotspot"; type: SWALLOW;
+ description { state: "default" 0.0;
+visible: 0;
+fixed: 1 1;
+rel1.to: "base";
+rel2.to: "base";
+rel1.relative: 0.5 0.5;
+rel2.relative: 0.5 0.5;
+rel2.offset: 0 0;
+ }
+  }
+  /* elm.content.hotspot is the old name for the above part */
+  alias: "elm.content.hotspot" "elm.swallow.hotspot";
+  part { name: "shine";
+ description { state: "default" 0.0;
+rel1.to: "base";
+rel2.to: "base";
+image.normal: "led_dot_white.png";
+max: 27 27;
+aspect: 1.0 1.0;
+aspect_preference: VERTICAL;
+ }
+  }
+   }
 }

--

[EGIT] [core/efl] feature/wayland/multi-output 16/31: theme: win - remove elm win inheritance

2018-04-11 Thread Amitesh Singh

devilhorns pushed a commit to branch feature/wayland/multi-output.

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

commit e089255c4b853787e244a92f24f67afbab352e6b
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Apr 11 18:10:57 2018 +0900

theme: win - remove elm win inheritance
---
 data/elementary/themes/edc/efl/win.edc | 34 +++---
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/data/elementary/themes/edc/efl/win.edc 
b/data/elementary/themes/edc/efl/win.edc
index d0b66110f7..c217f62b16 100644
--- a/data/elementary/themes/edc/efl/win.edc
+++ b/data/elementary/themes/edc/efl/win.edc
@@ -1,3 +1,31 @@
-group { "efl/win";
-   inherit: "elm/win/base/default";
-}
+group { name: "efl/win";
+   data.item: "version" "119";
+   parts {
+  rect { "client_clip"; nomouse; }
+  swallow { "elm.swallow.menu";
+ clip_to: "client_clip";
+ desc { "default";
+rel2.relative: 1 0;
+link.base: "elm,action,hide" "elm";
+align: 0.5 0.0;
+hid;
+ }
+ desc { "visible";
+inherit: "default";
+link.base: "elm,action,show_menu" "elm";
+fixed: 0 1;
+vis;
+ }
+  }
+  swallow { "elm.swallow.contents";
+ clip_to: "client_clip";
+ desc { "default";
+ }
+ desc { "with_menu";
+rel1.to: "elm.swallow.menu";
+rel1.relative: 0 1;
+link.base: "elm,action,show_menu" "elm";
+ }
+  }
+   }
+}
\ No newline at end of file

--

[EGIT] [core/efl] feature/wayland/multi-output 22/31: theme: photocam: define theme based on new theme components.

2018-04-11 Thread Amitesh Singh

devilhorns pushed a commit to branch feature/wayland/multi-output.

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

commit c3b2b85594d9aa3b3e88b8a05c0b6d1a51651de9
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Apr 11 19:00:58 2018 +0900

theme: photocam: define theme based on new theme components.
---
 data/elementary/themes/edc/efl/photocam.edc | 101 +++-
 1 file changed, 99 insertions(+), 2 deletions(-)

diff --git a/data/elementary/themes/edc/efl/photocam.edc 
b/data/elementary/themes/edc/efl/photocam.edc
index ccc226ed39..df5e1e5e51 100644
--- a/data/elementary/themes/edc/efl/photocam.edc
+++ b/data/elementary/themes/edc/efl/photocam.edc
@@ -1,3 +1,100 @@
-group { "efl/photocam";
-   inherit: "elm/photocam/base/default";
+group { name: "efl/photocam";
+   inherit: "efl/scroller";
+   images.image: "knob_round_busy.png" COMP;
+   images.image: "glow_round_corners.png" COMP;
+   parts {
+  part { name: "busy_clip"; type: RECT;
+ description { state: "default" 0.0;
+visible: 0;
+color: 255 255 255 0;
+ }
+ description { state: "active" 0.0;
+visible: 1;
+color: 255 255 255 255;
+ }
+  }
+  part { name: "knob"; mouse_events: 0;
+ clip_to: "busy_clip";
+ scale: 1;
+ description { state: "default" 0.0;
+image.normal: "knob_round_busy.png";
+min: 40 40;
+max: 40 40;
+align: 0.0 0.0;
+rel1.offset: 3 3;
+rel2.offset: 3 3;
+fixed: 1 1;
+ }
+  }
+  part { name: "knob_spinner"; mouse_events: 0;
+ clip_to: "busy_clip";
+ description { state: "default" 0.0;
+fixed: 1 1;
+rel1.to: "knob";
+rel2.to: "knob";
+image.normal: "glow_round_corners.png";
+map.on: 1;
+map.smooth: 1;
+map.rotation.center: "knob";
+ }
+ description { state: "spin" 0.0;
+inherit: "default" 0.0;
+map.rotation.z: 360;
+ }
+  }
+   }
+   programs {
+  program { name: "spin";
+ signal: "elm,state,busy,start"; source: "elm";
+ action: ACTION_STOP;
+ target: "spin";
+ target: "spin0";
+ target: "spin1";
+ target: "spin2";
+ target: "spin3";
+ target: "spin4";
+ after: "spin0";
+  }
+  program { name: "spin0";
+ action: STATE_SET "default" 0.0;
+ target: "knob_spinner";
+ after: "spin1";
+  }
+  program { name: "spin1";
+ action: STATE_SET "spin" 0.0;
+ transition: LINEAR 1.0;
+ target: "knob_spinner";
+ after: "spin2";
+  }
+  program { name: "spin2";
+ action: STATE_SET "default" 0.0;
+ target: "knob_spinner";
+ after: "spin1";
+  }
+  
+  program {
+ signal: "elm,state,busy,start"; source: "elm";
+ action: STATE_SET "active" 0.0;
+ transition: SINUSOIDAL 0.25;
+ target: "busy_clip";
+  }
+  
+  program {
+ signal: "elm,state,busy,stop"; source: "elm";
+ action: STATE_SET "default" 0.0;
+ transition: SINUSOIDAL 1.0;
+ target: "busy_clip";
+ after: "spin3";
+  }
+  program { name: "spin3";
+ action: ACTION_STOP;
+ target: "spin";
+ target: "spin2";
+ after: "spin4";
+  }
+  program { name: "spin4";
+ action: STATE_SET "default" 0.0;
+ target: "knob_spinner";
+  }
+   }
 }

--

[EGIT] [core/efl] feature/wayland/multi-output 15/31: theme: slider - remove elm slider inheritance.

2018-04-11 Thread Amitesh Singh

devilhorns pushed a commit to branch feature/wayland/multi-output.

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

commit 7552aaac5abe30603070b46ddad85081fb14d104
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Apr 11 18:09:32 2018 +0900

theme: slider - remove elm slider inheritance.
---
 data/elementary/themes/edc/efl/slider.edc | 31 +--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/data/elementary/themes/edc/efl/slider.edc 
b/data/elementary/themes/edc/efl/slider.edc
index 8bd19ec16f..0c0609668b 100644
--- a/data/elementary/themes/edc/efl/slider.edc
+++ b/data/elementary/themes/edc/efl/slider.edc
@@ -1,5 +1,32 @@
-group { "efl/slider/hidden/limit";
-   inherit: "elm/slider/hidden/limit";
+group { name: "efl/slider/hidden/limit";
+   parts {
+  part { name: "elm.units.min"; type: TEXT; mouse_events: 0;
+ scale: 1;
+ description { state: "default" 0.0;
+visible: 0;
+align: 1.0 0.5;
+text { font: FN; size: 10;
+   text_class: "slider_text";
+   min: 1 1;
+   align: 0.0 0.5;
+   ellipsis: -1;
+}
+ }
+  }
+  part { name: "elm.units.max"; type: TEXT; mouse_events: 0;
+ scale: 1;
+ description { state: "default" 0.0;
+visible: 0;
+align: 1.0 0.5;
+text { font: FN; size: 10;
+   text_class: "slider_text";
+   min: 1 1;
+   align: 0.0 0.5;
+   ellipsis: -1;
+}
+ }
+  }
+   }
 }
 
 group { "efl/slider/horizontal/indicator";

--

[EGIT] [core/efl] feature/wayland/multi-output 18/31: theme: textpath - remove elm textpath inheritance.

2018-04-11 Thread Amitesh Singh

devilhorns pushed a commit to branch feature/wayland/multi-output.

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

commit 5ed12ebad6be2e630c1dd0e3102958e366d780db
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Apr 11 18:14:38 2018 +0900

theme: textpath - remove elm textpath inheritance.
---
 data/elementary/themes/edc/efl/textpath.edc | 25 +++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/data/elementary/themes/edc/efl/textpath.edc 
b/data/elementary/themes/edc/efl/textpath.edc
index ed4924f9fb..dd597a55ac 100644
--- a/data/elementary/themes/edc/efl/textpath.edc
+++ b/data/elementary/themes/edc/efl/textpath.edc
@@ -1,3 +1,24 @@
-group { "efl/textpath";
-   inherit: "elm/textpath/base/default";
+group { name: "efl/textpath";
+   styles {
+  style { name: "textpath_style2";
+ base: "font="FN" font_size=16 text_class=tb_plain wrap=none 
align=left color=# style=shadow,bottom shadow_color=#0080";
+ tag: "br" "\n";
+ tag: "b" "+ font="FNBD" text_class=tb_light";
+ ENABLED_TEXTBLOCK_TAGS
+  }
+   }
+   parts {
+  part { name: "elm.text";
+ type: TEXTBLOCK;
+ scale: 1;
+ description { state: "default" 0.0;
+align: 0.0 0.0;
+text {
+   style: "textpath_style2";
+   min: 0 1;
+   align: 0.0 0.5;
+}
+ }
+  }
+   }
 }

--

[EGIT] [core/efl] feature/wayland/multi-output 21/31: theme: popup - define popup alert theme based on new theme

2018-04-11 Thread Amitesh Singh

devilhorns pushed a commit to branch feature/wayland/multi-output.

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

commit 7020cbed0313b768df62f5e75c236a13dda454b1
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Apr 11 18:56:55 2018 +0900

theme: popup - define popup alert theme based on new theme
---
 data/elementary/themes/edc/efl/popup.edc | 22 --
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/data/elementary/themes/edc/efl/popup.edc 
b/data/elementary/themes/edc/efl/popup.edc
index 491d483b42..50fb460f09 100644
--- a/data/elementary/themes/edc/efl/popup.edc
+++ b/data/elementary/themes/edc/efl/popup.edc
@@ -250,9 +250,27 @@ group { "efl/popup_alert/button";
alias: "efl/popup_alert_text/button";
 }
 
-group { "efl/popup_alert_scroll/scroller";
-   inherit: "elm/scroller/base/popup/no_inset_shadow";
+group { name: "efl/popup_alert_scroll/scroller";
+   inherit: "efl/scroller";
alias: "efl/popup_alert_text/scroller";
+   parts {
+  part { name: "elm.swallow.content"; type: SWALLOW;
+ description { state: "default" 0.0;
+rel1.offset: 0 0;
+rel2.offset: 0 0;
+ }
+  }
+  part { name: "inset";
+ description { state: "default" 0.0;
+visible: 0;
+ }
+  }
+  part { name: "shadow";
+ description { state: "default" 0.0;
+visible: 0;
+ }
+  }
+   }
 }
 
 group { "efl/popup_alert_text/text";

--

[EGIT] [core/efl] feature/wayland/multi-output 23/31: themes: tooltip - remove elm tooltip inheritance.

2018-04-11 Thread Amitesh Singh

devilhorns pushed a commit to branch feature/wayland/multi-output.

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

commit c1eeba7010f5c5de7429402e2b39511c404966ac
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Apr 11 19:07:11 2018 +0900

themes: tooltip - remove elm tooltip inheritance.
---
 data/elementary/themes/edc/efl/tooltip.edc | 428 -
 1 file changed, 422 insertions(+), 6 deletions(-)

diff --git a/data/elementary/themes/edc/efl/tooltip.edc 
b/data/elementary/themes/edc/efl/tooltip.edc
index 204b2b4ddc..389d3894e6 100644
--- a/data/elementary/themes/edc/efl/tooltip.edc
+++ b/data/elementary/themes/edc/efl/tooltip.edc
@@ -1,15 +1,431 @@
-group { "efl/label/tooltip";
-   inherit: "elm/label/base/tooltip/default";
+group { name: "efl/label/tooltip";
alias: "efl/label/base/tooltip"; //XXX: Remove it in EFL 2.0
alias: "efl/label/base/tooltip/transparent";
+   styles {
+  style { name: "tooltip_style2";
+ base: "font="FN" font_size=10 color=#ff style=shadow,bottom 
shadow_color=#0080 text_class=bubble";
+ tag:  "br" "\n";
+ tag: "hilight" "+ font="FN" text_class=bubble";
+ tag: "b" "+ font="FN" text_class=bubble";
+ tag:  "tab" "\t";
+  }
+   }
+   parts {
+  part { name: "elm.text"; type: TEXTBLOCK; mouse_events: 0;
+ scale: 1;
+ description { state: "default" 0.0;
+text {
+   style: "tooltip_style2";
+   min: 1 1;
+   ellipsis: -1;
+}
+ }
+  }
+   }
 }
 
-group { "efl/tooltip";
-   inherit: "elm/tooltip/base/default";
+group { name: "efl/tooltip";
+   min: 30 30;
+   data.item: "pad_x" "10";
+   data.item: "pad_y" "10";
+   data.item: "pad_border_x" "1";
+   data.item: "pad_border_y" "1";
+   /* tooltip is hidden after this amount.
+Keep in sync with hide animations */
+   data.item: "hide_timeout" "0.35";
+   // if in a window... it's transparent!
+   data.item: "transparent" "enabled";
+   images.image: "tooltip-base.png" COMP;
+   images.image: "tooltip-corner-top-left-tip.png" COMP;
+   images.image: "tooltip-corner-top-right-tip.png" COMP;
+   images.image: "tooltip-corner-bottom-left-tip.png" COMP;
+   images.image: "tooltip-corner-bottom-right-tip.png" COMP;
+   images.image: "tooltip-edge-left-tip.png" COMP;
+   images.image: "tooltip-edge-right-tip.png" COMP;
+   images.image: "tooltip-edge-bottom-tip.png" COMP;
+   images.image: "tooltip-edge-top-tip.png" COMP;
+   script {
+  hide_corners() {
+ set_state(PART:"corner-top-left", "default", 0.0);
+ set_state(PART:"corner-top-right", "default", 0.0);
+ set_state(PART:"corner-bottom-left", "default", 0.0);
+ set_state(PART:"corner-bottom-right", "default", 0.0);
+  }
+  hide_edges() {
+ set_state(PART:"clipper-edge-left", "default", 0.0);
+ set_state(PART:"clipper-edge-right", "default", 0.0);
+ set_state(PART:"clipper-edge-top", "default", 0.0);
+ set_state(PART:"clipper-edge-bottom", "default", 0.0);
+  }
+  show_corner_top_left() {
+ set_state(PART:"corner-top-left", "visible", 0.0);
+ set_state(PART:"corner-top-right", "default", 0.0);
+ set_state(PART:"corner-bottom-left", "default", 0.0);
+ set_state(PART:"corner-bottom-right", "default", 0.0);
+ hide_edges();
+  }
+  show_corner_top_right() {
+ set_state(PART:"corner-top-right", "visible", 0.0);
+ set_state(PART:"corner-top-left", "default", 0.0);
+ set_state(PART:"corner-bottom-left", "default", 0.0);
+ set_state(PART:"corner-bottom-right", "default", 0.0);
+ hide_edges();
+  }
+  show_corner_bottom_left() {
+ set_state(PART:"corner-bottom-left", "visible", 0.0);
+ set_state(PART:"corner-bottom-right", "default", 0.0);
+ set_state(PART:"corner-top-left", "default", 0.0);
+ set_state(PART:"corner-top-right", "default", 0.0);
+ hide_edges();
+  }
+  show_corner_bottom_right()

[EGIT] [core/efl] feature/wayland/multi-output 27/31: theme: button - fix the warning.

2018-04-11 Thread Amitesh Singh

devilhorns pushed a commit to branch feature/wayland/multi-output.

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

commit c6e8d9cddf87ece46b83612895319c1e2852673f
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Apr 11 20:03:41 2018 +0900

theme: button - fix the warning.

This fixed following warning

elementary/themes/edc/efl/button.edc:4:19: warning: `ICON' redefined
---
 data/elementary/themes/edc/efl/button.edc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/data/elementary/themes/edc/efl/button.edc 
b/data/elementary/themes/edc/efl/button.edc
index cf4333bea2..9853358e67 100644
--- a/data/elementary/themes/edc/efl/button.edc
+++ b/data/elementary/themes/edc/efl/button.edc
@@ -1,6 +1,8 @@
 group { name: "efl/button";
images.image: "button_normal.png" COMP;
images.image: "button_clicked.png" COMP;
+
+#undef ICON
 #define ICON 1
 #define LABEL2
 #define MASK 3

--

[EGIT] [core/efl] feature/wayland/multi-output 24/31: theme: pointer - remove elm pointer inheritance.

2018-04-11 Thread Amitesh Singh

devilhorns pushed a commit to branch feature/wayland/multi-output.

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

commit 313b9e286b8c1654b79cbf994bb5eddff41c423e
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Apr 11 19:19:41 2018 +0900

theme: pointer - remove elm pointer inheritance.
---
 data/elementary/themes/edc/efl/pointer.edc | 224 +++--
 1 file changed, 209 insertions(+), 15 deletions(-)

diff --git a/data/elementary/themes/edc/efl/pointer.edc 
b/data/elementary/themes/edc/efl/pointer.edc
index 57bdfbfcee..a101aa73c7 100644
--- a/data/elementary/themes/edc/efl/pointer.edc
+++ b/data/elementary/themes/edc/efl/pointer.edc
@@ -1,27 +1,221 @@
-group { "efl/pointer";
-   inherit: "elm/pointer/base/default";
+group { name: "efl/pointer";
+   images {
+  image: "pointer.png" COMP;
+  image: "pointer_glow.png" COMP;
+   }
+   parts {
+  part {
+ name: "base";
+ mouse_events: 0;
+ description {
+state: "default" 0.0;
+aspect: 1.0 1.0;
+min: 32 32;
+/* force a specific aspect ratio so
+ * when it gets scaled it wont squash
+ * or stretch */
+aspect_preference: BOTH;
+/* both axes control aspect - thus it
+ * will be WITHIN the bounds the axes
+ * of thre part describe */
+image {
+   normal: "pointer.png";
+}
+ }
+  }
+  part { name: "glow";
+ description { state: "default" 0.0;
+image.normal: "pointer_glow.png";
+color: 255 255 255 0;
+ }
+ description { state: "visible" 0.0;
+inherit: "default" 0.0;
+color: 255 255 255 255;
+ }
+ description { state: "faded" 0.0;
+inherit: "default" 0.0;
+color: 255 255 255 128;
+ }
+  }
+  part {
+ name: "elm.swallow.hotspot";
+ /* this is a "fake" swallow part
+  * that is used by e to determine
+  * the pointer hotspot - or where
+  * the actual mouse events get
+  * reported from on the cursor */
+ type: SWALLOW;
+ description {
+state: "default" 0.0;
+visible: 0;
+fixed: 1 1;
+rel1 {
+   /* the hotspot will scale with the cursor here */
+   to: "base";
+   relative: 0.1875 0.1875;
+   offset: 0 0;
+}
+rel2 {
+   to: "base";
+   relative: 0.1875 0.1875;
+   offset: 0 0;
+}
+ }
+  }
+   }
+   programs {
+  program {
+ signal: "elm,action,mouse,down"; source: "elm";
+ action: STATE_SET "visible" 0.0;
+ target: "glow";
+ after: "fade";
+  }
+  program { name: "fade";
+ action: STATE_SET "default" 0.0;
+ transition: SINUSOIDAL 0.5;
+ target: "glow";
+  }
+  program { name: "pulse";
+ signal: "e,state,mouse,idle"; source: "e";
+ in: 10.0 0.0;
+ action: STATE_SET "faded" 0.0;
+ transition: SINUSOIDAL 0.25;
+ target: "glow";
+ after: "pulse2";
+  }
+  program { name: "pulse2";
+ action: STATE_SET "default" 0.0;
+ transition: SINUSOIDAL 0.5;
+ target: "glow";
+ after: "pulse";
+  }
+  program {
+ signal: "elm,action,mouse,move"; source: "elm";
+ action: STATE_SET "default" 0.0;
+ target: "glow";
+ after: "stop2";
+  }
+  program { name: "stop2";
+ action: ACTION_STOP;
+ target: "pulse";
+ target: "pulse2";
+  }
+   }
 }
 
-group { "efl/pointer:bottom_right_corner";
-   inherit: "elm/pointer/base/bottom_right_corner";
+group { name: "efl/pointer:bottom_right_corner";
+   inherit: "efl/pointer";
+   images.image: "mini_box_glow.png" COMP;
+   parts {
+  part { name: "box";
+ insert_after: "glow";
+ description { state: "default" 0.0;
+image.normal: "mini_box_glow.png";
+image.border: 7 7 7 7;
+rel1.relative: 0.3 0.3;
+rel2.relative: 0.7 0.7;
+ }
+ description { state: "p1" 0.0;
+inherit: "default" 0.0;
+rel1.

[EGIT] [core/efl] feature/wayland/multi-output 10/31: theme: calendar - remove elm btn inheritance.

2018-04-11 Thread Amitesh Singh

devilhorns pushed a commit to branch feature/wayland/multi-output.

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

commit 9cd04445fff7e6ecaa7510ba8abb23f89a1a858e
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Apr 11 17:42:19 2018 +0900

theme: calendar - remove elm btn inheritance.
---
 data/elementary/themes/edc/efl/calendar.edc | 180 ++--
 1 file changed, 173 insertions(+), 7 deletions(-)

diff --git a/data/elementary/themes/edc/efl/calendar.edc 
b/data/elementary/themes/edc/efl/calendar.edc
index 86aee2ce42..2fd7e95233 100644
--- a/data/elementary/themes/edc/efl/calendar.edc
+++ b/data/elementary/themes/edc/efl/calendar.edc
@@ -541,11 +541,177 @@ group { "efl/calendar";
 #undef CIT
 #undef CH
 
+ group { name: "efl/calendar/inc_button";
+  images.image: "sym_right_light_normal.png" COMP;
+  images.image: "sym_right_glow_normal.png" COMP;
+  images.image: "sym_right_dark_normal.png" COMP;
+  script {
+ public mouse_down = 0;
+ public multi_down = 0;
+  }
+  parts {
+ part { name: "arrow.image";
+scale: 1;
+description { state: "default" 0.0;
+   min: 15 15;
+   max: 15 15;
+   color_class: "F032L1";
+   image.normal: "sym_right_light_normal.png";
+}
+description { state: "pressed" 0.0;
+   inherit: "default" 0.0;
+   image.normal: "sym_right_glow_normal.png";
+}
+description { state: "disabled" 0.0;
+   inherit: "default" 0.0;
+   image.normal: "sym_right_dark_normal.png";
+}
+ }
+ part { name: "over";
+type: RECT;
+repeat_events: 1;
+description { state: "default" 0.0;
+   color: 0 0 0 0;
+}
+ }
+ part { name: "disabler";
+type: RECT;
+description { state: "default" 0.0;
+   color: 0 0 0 0;
+   visible: 0;
+}
+description { state: "disabled" 0.0;
+   inherit: "default" 0.0;
+   visible: 1;
+}
+ }
+  }
+  programs {
+ program { name: "button_press";
+signal: "mouse,down,1";
+source: "over";
+script {
+   if ((get_int(multi_down) == 0) &&
+   (get_int(mouse_down) == 0)) {
+ set_int(mouse_down, 1);
+ run_program(PROGRAM:"button_press2");
+   }
+}
+ }
+ program { name: "button_press2";
+action: SIGNAL_EMIT "elm,action,press" "";
+after: "button_press_anim";
+ }
+ program { name: "button_press_anim";
+action: STATE_SET "pressed" 0.0;
+target: "arrow.image";
+ }
+ program { name: "button_unpress";
+signal: "mouse,up,1";
+source: "over";
+script {
+   if (get_int(mouse_down) == 1) {
+ set_int(mouse_down, 0);
+ run_program(PROGRAM:"button_unpress2");
+ run_program(PROGRAM:"button_unpress_anim");
+   }
+}
+ }
+ program { name: "button_unpress2";
+action: SIGNAL_EMIT "elm,action,unpress" "";
+ }
+ program { name: "button_unpress_anim";
+action: STATE_SET "default" 0.0;
+target: "arrow.image";
+ }
+ program { name: "button_click";
+signal: "mouse,clicked,1";
+source: "over";
+script {
+   if (get_int(multi_down) == 0) {
+ run_program(PROGRAM:"button_click2");
+   }
+}
+ }
+ program { name: "action_unpressed";
+signal: "elm,action,unpressed";
+source: "elm";
+after: "button_unpress_anim";
+ }
+ program { name: "action_pressed";
+signal: "elm,action,pressed";
+source: "elm";
+after: "button_press_anim";
+ }
+ program { name: "button_click2";
+action: SIGNAL_EMIT "elm,action,click" "";
+ }
+ program { name: "access_pressed";
+

[EGIT] [core/efl] master 01/01: theme: button - fix the warning.

2018-04-11 Thread Amitesh Singh

ami pushed a commit to branch master.

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

commit 97d777ee5d146a80d2c5d56b291ff42884c2a7b4
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Apr 11 20:03:41 2018 +0900

theme: button - fix the warning.

This fixed following warning

elementary/themes/edc/efl/button.edc:4:19: warning: `ICON' redefined
---
 data/elementary/themes/edc/efl/button.edc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/data/elementary/themes/edc/efl/button.edc 
b/data/elementary/themes/edc/efl/button.edc
index cf4333bea2..9853358e67 100644
--- a/data/elementary/themes/edc/efl/button.edc
+++ b/data/elementary/themes/edc/efl/button.edc
@@ -1,6 +1,8 @@
 group { name: "efl/button";
images.image: "button_normal.png" COMP;
images.image: "button_clicked.png" COMP;
+
+#undef ICON
 #define ICON 1
 #define LABEL2
 #define MASK 3

--

[EGIT] [core/efl] master 02/19: theme: border - remove elm border inheritance

2018-04-11 Thread Amitesh Singh

ami pushed a commit to branch master.

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

commit dd712c011a35effd2e87c770c0dd86d59a3d7e60
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Apr 11 17:33:37 2018 +0900

theme: border - remove elm border inheritance

and add full edc theme.
---
 data/elementary/themes/edc/efl/border.edc | 1214 -
 1 file changed, 1208 insertions(+), 6 deletions(-)

diff --git a/data/elementary/themes/edc/efl/border.edc 
b/data/elementary/themes/edc/efl/border.edc
index 55748268de..f6e8b8922d 100644
--- a/data/elementary/themes/edc/efl/border.edc
+++ b/data/elementary/themes/edc/efl/border.edc
@@ -7,15 +7,1217 @@
  *  - virtual keyboard
  */
 
-group { "efl/border";
-   inherit: "elm/border/base/default";
+group { name: "efl/border";
+   images.image: "vgrad_med_lighter.png" COMP;
+   images.image: "vgrad_med_dark.png" COMP;
+   images.image: "bevel_out.png" COMP;
+   images.image: "shine.png" COMP;
+   images.image: "bevel_dark_out.png" COMP;
+   images.image: "sym_close_dark_normal.png" COMP;
+   images.image: "sym_close_dark_selected.png" COMP;
+   images.image: "sym_close_light_normal.png" COMP;
+   images.image: "sym_close_light_selected.png" COMP;
+   images.image: "sym_down_dark_normal.png" COMP;
+   images.image: "sym_down_dark_selected.png" COMP;
+   images.image: "sym_down_light_normal.png" COMP;
+   images.image: "sym_down_light_selected.png" COMP;
+   images.image: "sym_up_dark_normal.png" COMP;
+   images.image: "sym_up_dark_selected.png" COMP;
+   images.image: "sym_up_light_normal.png" COMP;
+   images.image: "sym_up_light_selected.png" COMP;
+   images.image: "glow_round_corners_small.png" COMP;
+   images.image: "knob_round_small_busy.png" COMP;
+   images.image: "screen_circular_shadow.png" COMP;
+   images.image: "win_shadow.png" COMP;
+   data.item: "shadow" "1";
+   data.item: "version" "119";
+   parts {
+  /* opaque region of the window, to inform the compositor */
+  spacer { "elm.spacer.opaque";
+ desc {
+rel1.to: "top_clip";
+rel2.to: "bottom_clip";
+ }
+ desc { "max"; inherit: "default"; }
+  }
+  /* covers the entire client contents, excluding the main menu */
+  spacer { "elm.spacer.content";
+ required; // since 1.19
+ desc {
+rel1.to: "elm.swallow.menu";
+rel1.relative: 0.0 1.0;
+rel2.to: "elm.swallow.keyboard";
+rel2.relative: 1.0 0.0;
+ }
+  }
+  /* shadow spacer and clipper */
+  spacer { "shadow_spacer";
+ desc { "default";
+WIN_SHADOW_SPACER;
+ }
+ desc { "hidden";
+rel1.offset: 0 0;
+rel2.offset: -1 -1;
+ }
+  }
+  image { "shadow"; nomouse;
+ desc { "default";
+rel.to: "shadow_spacer";
+WIN_SHADOW;
+ }
+ desc { "hidden"; inherit: "default"; hid; }
+  }
+  /* window background: solid color */
+  rect { "bg_clip";
+ nomouse;
+ desc { "default";
+rel1.to: "top_clip";
+rel1.relative: 0.0 1.0;
+rel2.to: "bottom_clip";
+ }
+  }
+  rect { "elm.rect.background";
+ required; // @since 1.19
+ clip: "bg_clip";
+ desc { "default";
+color: 255 255 255 255;
+color_class: "elm/win/background"; // FIXME: color_class naming 
scheme
+visible: 0;
+ }
+ desc { "visible";
+inherit: "default";
+visible: 1;
+ }
+  }
+  /* window background: image */
+  swallow { "elm.swallow.background";
+ required; // @since 1.19
+ clip: "client_clip";
+  }
+  image { "background_bevel";
+ desc { "default";
+image {
+   normal: "bevel_dark_out.png";
+   border: 1 1 1 1;
+   middle: 0;
+}
+fill.smooth: 0;
+rel.to: "elm.spacer.content";
+visible: 0;
+ }
+ desc { "visible";
+inherit: "default";
+visible: 1;
+ }
+  }
+  spacer { "indicator_spacer";
+ desc { "default";
+rel.to: "elm.s

[EGIT] [core/efl] master 09/19: theme: win - remove elm win inheritance

2018-04-11 Thread Amitesh Singh

ami pushed a commit to branch master.

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

commit d4a00636b246857e305fdb9a1cf714746a9f82c4
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Apr 11 18:10:57 2018 +0900

theme: win - remove elm win inheritance
---
 data/elementary/themes/edc/efl/win.edc | 34 +++---
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/data/elementary/themes/edc/efl/win.edc 
b/data/elementary/themes/edc/efl/win.edc
index d0b66110f7..c217f62b16 100644
--- a/data/elementary/themes/edc/efl/win.edc
+++ b/data/elementary/themes/edc/efl/win.edc
@@ -1,3 +1,31 @@
-group { "efl/win";
-   inherit: "elm/win/base/default";
-}
+group { name: "efl/win";
+   data.item: "version" "119";
+   parts {
+  rect { "client_clip"; nomouse; }
+  swallow { "elm.swallow.menu";
+ clip_to: "client_clip";
+ desc { "default";
+rel2.relative: 1 0;
+link.base: "elm,action,hide" "elm";
+align: 0.5 0.0;
+hid;
+ }
+ desc { "visible";
+inherit: "default";
+link.base: "elm,action,show_menu" "elm";
+fixed: 0 1;
+vis;
+ }
+  }
+  swallow { "elm.swallow.contents";
+ clip_to: "client_clip";
+ desc { "default";
+ }
+ desc { "with_menu";
+rel1.to: "elm.swallow.menu";
+rel1.relative: 0 1;
+link.base: "elm,action,show_menu" "elm";
+ }
+  }
+   }
+}
\ No newline at end of file

--

[EGIT] [core/efl] master 17/19: theme: pointer - remove elm pointer inheritance.

2018-04-11 Thread Amitesh Singh

ami pushed a commit to branch master.

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

commit 11c3b67e45f2c8e93aa97899f4bc4715369934f9
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Apr 11 19:19:41 2018 +0900

theme: pointer - remove elm pointer inheritance.
---
 data/elementary/themes/edc/efl/pointer.edc | 224 +++--
 1 file changed, 209 insertions(+), 15 deletions(-)

diff --git a/data/elementary/themes/edc/efl/pointer.edc 
b/data/elementary/themes/edc/efl/pointer.edc
index 57bdfbfcee..a101aa73c7 100644
--- a/data/elementary/themes/edc/efl/pointer.edc
+++ b/data/elementary/themes/edc/efl/pointer.edc
@@ -1,27 +1,221 @@
-group { "efl/pointer";
-   inherit: "elm/pointer/base/default";
+group { name: "efl/pointer";
+   images {
+  image: "pointer.png" COMP;
+  image: "pointer_glow.png" COMP;
+   }
+   parts {
+  part {
+ name: "base";
+ mouse_events: 0;
+ description {
+state: "default" 0.0;
+aspect: 1.0 1.0;
+min: 32 32;
+/* force a specific aspect ratio so
+ * when it gets scaled it wont squash
+ * or stretch */
+aspect_preference: BOTH;
+/* both axes control aspect - thus it
+ * will be WITHIN the bounds the axes
+ * of thre part describe */
+image {
+   normal: "pointer.png";
+}
+ }
+  }
+  part { name: "glow";
+ description { state: "default" 0.0;
+image.normal: "pointer_glow.png";
+color: 255 255 255 0;
+ }
+ description { state: "visible" 0.0;
+inherit: "default" 0.0;
+color: 255 255 255 255;
+ }
+ description { state: "faded" 0.0;
+inherit: "default" 0.0;
+color: 255 255 255 128;
+ }
+  }
+  part {
+ name: "elm.swallow.hotspot";
+ /* this is a "fake" swallow part
+  * that is used by e to determine
+  * the pointer hotspot - or where
+  * the actual mouse events get
+  * reported from on the cursor */
+ type: SWALLOW;
+ description {
+state: "default" 0.0;
+visible: 0;
+fixed: 1 1;
+rel1 {
+   /* the hotspot will scale with the cursor here */
+   to: "base";
+   relative: 0.1875 0.1875;
+   offset: 0 0;
+}
+rel2 {
+   to: "base";
+   relative: 0.1875 0.1875;
+   offset: 0 0;
+}
+ }
+  }
+   }
+   programs {
+  program {
+ signal: "elm,action,mouse,down"; source: "elm";
+ action: STATE_SET "visible" 0.0;
+ target: "glow";
+ after: "fade";
+  }
+  program { name: "fade";
+ action: STATE_SET "default" 0.0;
+ transition: SINUSOIDAL 0.5;
+ target: "glow";
+  }
+  program { name: "pulse";
+ signal: "e,state,mouse,idle"; source: "e";
+ in: 10.0 0.0;
+ action: STATE_SET "faded" 0.0;
+ transition: SINUSOIDAL 0.25;
+ target: "glow";
+ after: "pulse2";
+  }
+  program { name: "pulse2";
+ action: STATE_SET "default" 0.0;
+ transition: SINUSOIDAL 0.5;
+ target: "glow";
+ after: "pulse";
+  }
+  program {
+ signal: "elm,action,mouse,move"; source: "elm";
+ action: STATE_SET "default" 0.0;
+ target: "glow";
+ after: "stop2";
+  }
+  program { name: "stop2";
+ action: ACTION_STOP;
+ target: "pulse";
+ target: "pulse2";
+  }
+   }
 }
 
-group { "efl/pointer:bottom_right_corner";
-   inherit: "elm/pointer/base/bottom_right_corner";
+group { name: "efl/pointer:bottom_right_corner";
+   inherit: "efl/pointer";
+   images.image: "mini_box_glow.png" COMP;
+   parts {
+  part { name: "box";
+ insert_after: "glow";
+ description { state: "default" 0.0;
+image.normal: "mini_box_glow.png";
+image.border: 7 7 7 7;
+rel1.relative: 0.3 0.3;
+rel2.relative: 0.7 0.7;
+ }
+ description { state: "p1" 0.0;
+inherit: "default" 0.0;
+rel1.relative: 0.3 0.3;
+

[EGIT] [core/efl] master 11/19: theme: textpath - remove elm textpath inheritance.

2018-04-11 Thread Amitesh Singh

ami pushed a commit to branch master.

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

commit d4dd7e5962a6a4a22b23d7130e48cef3471585f6
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Apr 11 18:14:38 2018 +0900

theme: textpath - remove elm textpath inheritance.
---
 data/elementary/themes/edc/efl/textpath.edc | 25 +++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/data/elementary/themes/edc/efl/textpath.edc 
b/data/elementary/themes/edc/efl/textpath.edc
index ed4924f9fb..dd597a55ac 100644
--- a/data/elementary/themes/edc/efl/textpath.edc
+++ b/data/elementary/themes/edc/efl/textpath.edc
@@ -1,3 +1,24 @@
-group { "efl/textpath";
-   inherit: "elm/textpath/base/default";
+group { name: "efl/textpath";
+   styles {
+  style { name: "textpath_style2";
+ base: "font="FN" font_size=16 text_class=tb_plain wrap=none 
align=left color=# style=shadow,bottom shadow_color=#0080";
+ tag: "br" "\n";
+ tag: "b" "+ font="FNBD" text_class=tb_light";
+ ENABLED_TEXTBLOCK_TAGS
+  }
+   }
+   parts {
+  part { name: "elm.text";
+ type: TEXTBLOCK;
+ scale: 1;
+ description { state: "default" 0.0;
+align: 0.0 0.0;
+text {
+   style: "textpath_style2";
+   min: 0 1;
+   align: 0.0 0.5;
+}
+ }
+  }
+   }
 }

--

[EGIT] [core/efl] master 16/19: themes: tooltip - remove elm tooltip inheritance.

2018-04-11 Thread Amitesh Singh

ami pushed a commit to branch master.

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

commit 29240037a6a270fdd6950de04901d01a0de27a47
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Apr 11 19:07:11 2018 +0900

themes: tooltip - remove elm tooltip inheritance.
---
 data/elementary/themes/edc/efl/tooltip.edc | 428 -
 1 file changed, 422 insertions(+), 6 deletions(-)

diff --git a/data/elementary/themes/edc/efl/tooltip.edc 
b/data/elementary/themes/edc/efl/tooltip.edc
index 204b2b4ddc..389d3894e6 100644
--- a/data/elementary/themes/edc/efl/tooltip.edc
+++ b/data/elementary/themes/edc/efl/tooltip.edc
@@ -1,15 +1,431 @@
-group { "efl/label/tooltip";
-   inherit: "elm/label/base/tooltip/default";
+group { name: "efl/label/tooltip";
alias: "efl/label/base/tooltip"; //XXX: Remove it in EFL 2.0
alias: "efl/label/base/tooltip/transparent";
+   styles {
+  style { name: "tooltip_style2";
+ base: "font="FN" font_size=10 color=#ff style=shadow,bottom 
shadow_color=#0080 text_class=bubble";
+ tag:  "br" "\n";
+ tag: "hilight" "+ font="FN" text_class=bubble";
+ tag: "b" "+ font="FN" text_class=bubble";
+ tag:  "tab" "\t";
+  }
+   }
+   parts {
+  part { name: "elm.text"; type: TEXTBLOCK; mouse_events: 0;
+ scale: 1;
+ description { state: "default" 0.0;
+text {
+   style: "tooltip_style2";
+   min: 1 1;
+   ellipsis: -1;
+}
+ }
+  }
+   }
 }
 
-group { "efl/tooltip";
-   inherit: "elm/tooltip/base/default";
+group { name: "efl/tooltip";
+   min: 30 30;
+   data.item: "pad_x" "10";
+   data.item: "pad_y" "10";
+   data.item: "pad_border_x" "1";
+   data.item: "pad_border_y" "1";
+   /* tooltip is hidden after this amount.
+Keep in sync with hide animations */
+   data.item: "hide_timeout" "0.35";
+   // if in a window... it's transparent!
+   data.item: "transparent" "enabled";
+   images.image: "tooltip-base.png" COMP;
+   images.image: "tooltip-corner-top-left-tip.png" COMP;
+   images.image: "tooltip-corner-top-right-tip.png" COMP;
+   images.image: "tooltip-corner-bottom-left-tip.png" COMP;
+   images.image: "tooltip-corner-bottom-right-tip.png" COMP;
+   images.image: "tooltip-edge-left-tip.png" COMP;
+   images.image: "tooltip-edge-right-tip.png" COMP;
+   images.image: "tooltip-edge-bottom-tip.png" COMP;
+   images.image: "tooltip-edge-top-tip.png" COMP;
+   script {
+  hide_corners() {
+ set_state(PART:"corner-top-left", "default", 0.0);
+ set_state(PART:"corner-top-right", "default", 0.0);
+ set_state(PART:"corner-bottom-left", "default", 0.0);
+ set_state(PART:"corner-bottom-right", "default", 0.0);
+  }
+  hide_edges() {
+ set_state(PART:"clipper-edge-left", "default", 0.0);
+ set_state(PART:"clipper-edge-right", "default", 0.0);
+ set_state(PART:"clipper-edge-top", "default", 0.0);
+ set_state(PART:"clipper-edge-bottom", "default", 0.0);
+  }
+  show_corner_top_left() {
+ set_state(PART:"corner-top-left", "visible", 0.0);
+ set_state(PART:"corner-top-right", "default", 0.0);
+ set_state(PART:"corner-bottom-left", "default", 0.0);
+ set_state(PART:"corner-bottom-right", "default", 0.0);
+ hide_edges();
+  }
+  show_corner_top_right() {
+ set_state(PART:"corner-top-right", "visible", 0.0);
+ set_state(PART:"corner-top-left", "default", 0.0);
+ set_state(PART:"corner-bottom-left", "default", 0.0);
+ set_state(PART:"corner-bottom-right", "default", 0.0);
+ hide_edges();
+  }
+  show_corner_bottom_left() {
+ set_state(PART:"corner-bottom-left", "visible", 0.0);
+ set_state(PART:"corner-bottom-right", "default", 0.0);
+ set_state(PART:"corner-top-left", "default", 0.0);
+ set_state(PART:"corner-top-right", "default", 0.0);
+ hide_edges();
+  }
+  show_corner_bottom_right() {
+ set_state(

[EGIT] [core/efl] master 15/19: theme: photocam: define theme based on new theme components.

2018-04-11 Thread Amitesh Singh

ami pushed a commit to branch master.

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

commit cbebbec85251d1404081a559dd482b2ba93bb589
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Apr 11 19:00:58 2018 +0900

theme: photocam: define theme based on new theme components.
---
 data/elementary/themes/edc/efl/photocam.edc | 101 +++-
 1 file changed, 99 insertions(+), 2 deletions(-)

diff --git a/data/elementary/themes/edc/efl/photocam.edc 
b/data/elementary/themes/edc/efl/photocam.edc
index ccc226ed39..df5e1e5e51 100644
--- a/data/elementary/themes/edc/efl/photocam.edc
+++ b/data/elementary/themes/edc/efl/photocam.edc
@@ -1,3 +1,100 @@
-group { "efl/photocam";
-   inherit: "elm/photocam/base/default";
+group { name: "efl/photocam";
+   inherit: "efl/scroller";
+   images.image: "knob_round_busy.png" COMP;
+   images.image: "glow_round_corners.png" COMP;
+   parts {
+  part { name: "busy_clip"; type: RECT;
+ description { state: "default" 0.0;
+visible: 0;
+color: 255 255 255 0;
+ }
+ description { state: "active" 0.0;
+visible: 1;
+color: 255 255 255 255;
+ }
+  }
+  part { name: "knob"; mouse_events: 0;
+ clip_to: "busy_clip";
+ scale: 1;
+ description { state: "default" 0.0;
+image.normal: "knob_round_busy.png";
+min: 40 40;
+max: 40 40;
+align: 0.0 0.0;
+rel1.offset: 3 3;
+rel2.offset: 3 3;
+fixed: 1 1;
+ }
+  }
+  part { name: "knob_spinner"; mouse_events: 0;
+ clip_to: "busy_clip";
+ description { state: "default" 0.0;
+fixed: 1 1;
+rel1.to: "knob";
+rel2.to: "knob";
+image.normal: "glow_round_corners.png";
+map.on: 1;
+map.smooth: 1;
+map.rotation.center: "knob";
+ }
+ description { state: "spin" 0.0;
+inherit: "default" 0.0;
+map.rotation.z: 360;
+ }
+  }
+   }
+   programs {
+  program { name: "spin";
+ signal: "elm,state,busy,start"; source: "elm";
+ action: ACTION_STOP;
+ target: "spin";
+ target: "spin0";
+ target: "spin1";
+ target: "spin2";
+ target: "spin3";
+ target: "spin4";
+ after: "spin0";
+  }
+  program { name: "spin0";
+ action: STATE_SET "default" 0.0;
+ target: "knob_spinner";
+ after: "spin1";
+  }
+  program { name: "spin1";
+ action: STATE_SET "spin" 0.0;
+ transition: LINEAR 1.0;
+ target: "knob_spinner";
+ after: "spin2";
+  }
+  program { name: "spin2";
+ action: STATE_SET "default" 0.0;
+ target: "knob_spinner";
+ after: "spin1";
+  }
+  
+  program {
+ signal: "elm,state,busy,start"; source: "elm";
+ action: STATE_SET "active" 0.0;
+ transition: SINUSOIDAL 0.25;
+ target: "busy_clip";
+  }
+  
+  program {
+ signal: "elm,state,busy,stop"; source: "elm";
+ action: STATE_SET "default" 0.0;
+ transition: SINUSOIDAL 1.0;
+ target: "busy_clip";
+ after: "spin3";
+  }
+  program { name: "spin3";
+ action: ACTION_STOP;
+ target: "spin";
+ target: "spin2";
+ after: "spin4";
+  }
+  program { name: "spin4";
+ action: STATE_SET "default" 0.0;
+ target: "knob_spinner";
+  }
+   }
 }

--

[EGIT] [core/efl] master 12/19: theme: text - use efl/scroller theme group instead.

2018-04-11 Thread Amitesh Singh

ami pushed a commit to branch master.

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

commit 1dee128daa72cc8516640fd7be973f5db6b9ad16
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Apr 11 18:17:35 2018 +0900

theme: text - use efl/scroller theme group instead.
---
 data/elementary/themes/edc/efl/text.edc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/elementary/themes/edc/efl/text.edc 
b/data/elementary/themes/edc/efl/text.edc
index 728c905399..8f8e4c30d3 100644
--- a/data/elementary/themes/edc/efl/text.edc
+++ b/data/elementary/themes/edc/efl/text.edc
@@ -1,5 +1,5 @@
 group { "efl/text/scroller";
-   inherit: "elm/scroller/base/default";
+   inherit: "efl/scroller";
image: "bg_glow_in.png" COMP;
parts {
   part { name: "elm.swallow.background"; type: SWALLOW;

--

[EGIT] [core/efl] master 01/19: theme: bg - remove the elm bg inheritance

2018-04-11 Thread Amitesh Singh

ami pushed a commit to branch master.

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

commit ae88f49561ca68e2434bb4305f762bbad9a2e6df
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Apr 11 12:47:03 2018 +0900

theme: bg - remove the elm bg inheritance
---
 data/elementary/themes/edc/efl/bg.edc | 41 ---
 1 file changed, 38 insertions(+), 3 deletions(-)

diff --git a/data/elementary/themes/edc/efl/bg.edc 
b/data/elementary/themes/edc/efl/bg.edc
index 43547d3033..3c57ac81b3 100644
--- a/data/elementary/themes/edc/efl/bg.edc
+++ b/data/elementary/themes/edc/efl/bg.edc
@@ -6,6 +6,41 @@
   elm.swallow.content: Used for elm_layout_part_content_set(bg, "overlay", 
content).
 */
 
-group { "efl/bg";
-   inherit: "elm/bg/base/default";
-}
+group { name: "efl/bg";
+   data.item: "version" "119";
+   images.image: "bevel_dark_out.png" COMP;
+   parts {
+  part { name: "clipper"; type: RECT;
+ description { state: "default" 0.0;
+ }
+  }
+  part { name: "base"; type: RECT;
+ description { state: "default" 0.0;
+color_class: "dialog_base";
+color: 64 64 64 255;
+ }
+  }
+  part { name: "elm.swallow.rectangle"; type: SWALLOW;
+ description { state: "default" 0.0;
+ }
+  }
+  part { name: "elm.swallow.background"; type: SWALLOW;
+ clip_to: "clipper";
+ description { state: "default" 0.0;
+fixed: 1 1;
+ }
+  }
+  part { name: "bevel";
+ description { state: "default" 0.0;
+image.normal: "bevel_dark_out.png";
+image.border: 1 1 1 1;
+image.middle: 0;
+fill.smooth: 0;
+ }
+  }
+  part { name: "elm.swallow.content"; type: SWALLOW;
+ description { state: "default" 0.0;
+ }
+  }
+   }
+}
\ No newline at end of file

--

[EGIT] [core/efl] master 08/19: theme: slider - remove elm slider inheritance.

2018-04-11 Thread Amitesh Singh

ami pushed a commit to branch master.

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

commit e38962b06aba87d88d316b9e87aa8054b7980194
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Apr 11 18:09:32 2018 +0900

theme: slider - remove elm slider inheritance.
---
 data/elementary/themes/edc/efl/slider.edc | 31 +--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/data/elementary/themes/edc/efl/slider.edc 
b/data/elementary/themes/edc/efl/slider.edc
index 8bd19ec16f..0c0609668b 100644
--- a/data/elementary/themes/edc/efl/slider.edc
+++ b/data/elementary/themes/edc/efl/slider.edc
@@ -1,5 +1,32 @@
-group { "efl/slider/hidden/limit";
-   inherit: "elm/slider/hidden/limit";
+group { name: "efl/slider/hidden/limit";
+   parts {
+  part { name: "elm.units.min"; type: TEXT; mouse_events: 0;
+ scale: 1;
+ description { state: "default" 0.0;
+visible: 0;
+align: 1.0 0.5;
+text { font: FN; size: 10;
+   text_class: "slider_text";
+   min: 1 1;
+   align: 0.0 0.5;
+   ellipsis: -1;
+}
+ }
+  }
+  part { name: "elm.units.max"; type: TEXT; mouse_events: 0;
+ scale: 1;
+ description { state: "default" 0.0;
+visible: 0;
+align: 1.0 0.5;
+text { font: FN; size: 10;
+   text_class: "slider_text";
+   min: 1 1;
+   align: 0.0 0.5;
+   ellipsis: -1;
+}
+ }
+  }
+   }
 }
 
 group { "efl/slider/horizontal/indicator";

--

[EGIT] [core/efl] master 04/19: theme: focus - remove elm focus highlight inheritance.

2018-04-11 Thread Amitesh Singh

ami pushed a commit to branch master.

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

commit 5cf383ee5addab4dc8b65c2bf2aa675c89e94d1b
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Apr 11 17:46:37 2018 +0900

theme: focus - remove elm focus highlight inheritance.
---
 data/elementary/themes/edc/efl/focus.edc | 178 ++-
 1 file changed, 174 insertions(+), 4 deletions(-)

diff --git a/data/elementary/themes/edc/efl/focus.edc 
b/data/elementary/themes/edc/efl/focus.edc
index d7c3b78f19..426f869399 100644
--- a/data/elementary/themes/edc/efl/focus.edc
+++ b/data/elementary/themes/edc/efl/focus.edc
@@ -1,7 +1,177 @@
-group { "efl/focus_highlight/top";
-   inherit: "elm/focus_highlight/top/default";
+group { name: "efl/focus_highlight/top";
+   images.image: "box_glow.png" COMP;
+   images.image: "box_outline.png" COMP;
+   data.item: "animate" "on";
+   script {
+  public s_x, s_y, s_w, s_h; /* source */
+  public difx, dify, difw, difh;
+  public g_anim_id;
+
+  public animator1(val, Float:pos) {
+ new x, y, w, h, dx, dy, dw, dh, Float:p;
+ p = 1.0 - ((1.0 - pos) * (1.0 - pos) * (1.0 - pos));
+ dx = round(float_mul(float(get_int(difx)), p));
+ x = get_int(s_x) + dx;
+ dy = round(float_mul(float(get_int(dify)), p));
+ y = get_int(s_y) + dy;
+ dw = round(float_mul(float(get_int(difw)), p));
+ w = get_int(s_w) + dw;
+ dh = round(float_mul(float(get_int(difh)), p));
+ h = get_int(s_h) + dh;
+ update_offset(x, y, w, h);
+
+ if (pos >= 1.0) {
+set_int(g_anim_id, 0);
+ }
+  }
+
+  public update_offset(x, y, w, h) {
+ set_state_val(PART:"base", STATE_REL1_OFFSET, x, y);
+ set_state_val(PART:"base", STATE_REL2_OFFSET, x + w, y + h);
+  }
+
+  public message(Msg_Type:type, id, ...) {
+ if ((type == MSG_INT_SET) && (id == 1)) {
+new x1, y1, w1, h1, x2, y2, w2, h2;
+new anim_id;
+
+anim_id = get_int(g_anim_id);
+if (anim_id != 0) {
+   cancel_anim(anim_id);
+}
+
+x1 = getarg(2);
+y1 = getarg(3);
+w1 = getarg(4);
+h1 = getarg(5);
+x2 = getarg(6);
+y2 = getarg(7);
+w2 = getarg(8);
+h2 = getarg(9);
+
+set_int(s_x, x1);
+set_int(s_y, y1);
+set_int(s_w, w1);
+set_int(s_h, h1);
+set_int(difx, x2 - x1);
+set_int(dify, y2 - y1);
+set_int(difw, w2 - w1);
+set_int(difh, h2 - h1);
+
+custom_state(PART:"base", "default", 0.0);
+set_state_val(PART:"base", STATE_REL1, 0.0, 0.0);
+set_state_val(PART:"base", STATE_REL2, 0.0, 0.0);
+update_offset(x1, y1, w1, h1);
+set_state(PART:"base", "custom", 0.0);
+
+anim_id = anim(0.2, "animator1", 1);
+set_int(g_anim_id, anim_id);
+ }
+  }
+   }
+   parts {
+  part { name: "base"; type: SPACER;
+ description { state: "default" 0.0;
+fixed: 1 1;
+ }
+  }
+  part { name: "clip"; type: RECT;
+ description { state: "default" 0.0;
+rel1.to: "glow";
+rel2.to: "glow";
+color: 255 255 255 0;
+ }
+ description { state: "visible" 0.0;
+inherit: "default" 0.0;
+color: 255 255 255 255;
+ }
+  }
+  part { name: "glow"; mouse_events: 0;
+ clip_to: "clip";
+ description { state: "default" 0.0;
+image.normal: "box_glow.png";
+image.border: 12 12 12 12;
+image.middle: 0;
+fill.smooth: 0;
+rel1.to: "base";
+rel1.offset: -7 -7;
+rel2.to: "base";
+rel2.offset: 5 5;
+ }
+  }
+  part { name: "sel"; mouse_events: 0;
+ clip_to: "clip";
+ description { state: "default" 0.0;
+image.normal: "box_outline.png";
+image.border: 12 12 12 12;
+image.middle: 0;
+fill.smooth: 0;
+rel1.to: "glow";
+rel2.to: "glow";
+color: 255 255 255 0;
+ }
+ description { state: "hi" 0.0;
+inherit: "default" 0.0;
+color: 255 255 255 255;
+ }
+  }
+   }
+   programs {
+  program {
+ signal: &quo

[EGIT] [core/efl] master 03/19: theme: calendar - remove elm btn inheritance.

2018-04-11 Thread Amitesh Singh

ami pushed a commit to branch master.

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

commit c7cd5c0a14b66e91c3176ce262cabfccbdbbafef
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Apr 11 17:42:19 2018 +0900

theme: calendar - remove elm btn inheritance.
---
 data/elementary/themes/edc/efl/calendar.edc | 180 ++--
 1 file changed, 173 insertions(+), 7 deletions(-)

diff --git a/data/elementary/themes/edc/efl/calendar.edc 
b/data/elementary/themes/edc/efl/calendar.edc
index 86aee2ce42..2fd7e95233 100644
--- a/data/elementary/themes/edc/efl/calendar.edc
+++ b/data/elementary/themes/edc/efl/calendar.edc
@@ -541,11 +541,177 @@ group { "efl/calendar";
 #undef CIT
 #undef CH
 
+ group { name: "efl/calendar/inc_button";
+  images.image: "sym_right_light_normal.png" COMP;
+  images.image: "sym_right_glow_normal.png" COMP;
+  images.image: "sym_right_dark_normal.png" COMP;
+  script {
+ public mouse_down = 0;
+ public multi_down = 0;
+  }
+  parts {
+ part { name: "arrow.image";
+scale: 1;
+description { state: "default" 0.0;
+   min: 15 15;
+   max: 15 15;
+   color_class: "F032L1";
+   image.normal: "sym_right_light_normal.png";
+}
+description { state: "pressed" 0.0;
+   inherit: "default" 0.0;
+   image.normal: "sym_right_glow_normal.png";
+}
+description { state: "disabled" 0.0;
+   inherit: "default" 0.0;
+   image.normal: "sym_right_dark_normal.png";
+}
+ }
+ part { name: "over";
+type: RECT;
+repeat_events: 1;
+description { state: "default" 0.0;
+   color: 0 0 0 0;
+}
+ }
+ part { name: "disabler";
+type: RECT;
+description { state: "default" 0.0;
+   color: 0 0 0 0;
+   visible: 0;
+}
+description { state: "disabled" 0.0;
+   inherit: "default" 0.0;
+   visible: 1;
+}
+ }
+  }
+  programs {
+ program { name: "button_press";
+signal: "mouse,down,1";
+source: "over";
+script {
+   if ((get_int(multi_down) == 0) &&
+   (get_int(mouse_down) == 0)) {
+ set_int(mouse_down, 1);
+ run_program(PROGRAM:"button_press2");
+   }
+}
+ }
+ program { name: "button_press2";
+action: SIGNAL_EMIT "elm,action,press" "";
+after: "button_press_anim";
+ }
+ program { name: "button_press_anim";
+action: STATE_SET "pressed" 0.0;
+target: "arrow.image";
+ }
+ program { name: "button_unpress";
+signal: "mouse,up,1";
+source: "over";
+script {
+   if (get_int(mouse_down) == 1) {
+ set_int(mouse_down, 0);
+ run_program(PROGRAM:"button_unpress2");
+ run_program(PROGRAM:"button_unpress_anim");
+   }
+}
+ }
+ program { name: "button_unpress2";
+action: SIGNAL_EMIT "elm,action,unpress" "";
+ }
+ program { name: "button_unpress_anim";
+action: STATE_SET "default" 0.0;
+target: "arrow.image";
+ }
+ program { name: "button_click";
+signal: "mouse,clicked,1";
+source: "over";
+script {
+   if (get_int(multi_down) == 0) {
+ run_program(PROGRAM:"button_click2");
+   }
+}
+ }
+ program { name: "action_unpressed";
+signal: "elm,action,unpressed";
+source: "elm";
+after: "button_unpress_anim";
+ }
+ program { name: "action_pressed";
+signal: "elm,action,pressed";
+source: "elm";
+after: "button_press_anim";
+ }
+ program { name: "button_click2";
+action: SIGNAL_EMIT "elm,action,click" "";
+ }
+ program { name: "access_pressed";
+si

[EGIT] [core/efl] master 10/19: theme: video - remove elm video inheritance

2018-04-11 Thread Amitesh Singh

ami pushed a commit to branch master.

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

commit c567e1d2e57d9b0673110402f770f9a73ad70745
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Apr 11 18:12:09 2018 +0900

theme: video - remove elm video inheritance
---
 data/elementary/themes/edc/efl/video.edc | 46 +---
 1 file changed, 43 insertions(+), 3 deletions(-)

diff --git a/data/elementary/themes/edc/efl/video.edc 
b/data/elementary/themes/edc/efl/video.edc
index 3a2a658b06..1f943a8096 100644
--- a/data/elementary/themes/edc/efl/video.edc
+++ b/data/elementary/themes/edc/efl/video.edc
@@ -1,3 +1,43 @@
-group { "efl/video";
-   inherit: "elm/video/base/default";
-}
+group { name: "efl/video";
+   parts {
+  part { name: "clipper"; type: RECT;
+ description { state: "default" 0.0;
+color: 255 255 255 255;
+ }
+ description { state: "darker" 0.0;
+color: 128 128 128 255;
+ }
+  }
+  part { name: "elm.swallow.video"; type: SWALLOW;  mouse_events: 1;
+ clip_to: "clipper";
+ description { state: "default" 0.0;
+aspect: 1.0 1.0; aspect_preference: BOTH;
+ }
+  }
+   }
+   programs {
+  program {
+ signal: "elm,video,load"; source: "elm";
+ action: STATE_SET "darker" 0.0;
+ target: "clipper";
+  }
+  program {
+ signal: "elm,video,play"; source: "elm";
+ action: STATE_SET "default" 0.0;
+ transition: SINUSOIDAL 0.2 CURRENT;
+ target: "clipper";
+  }
+  program {
+ signal: "elm,video,end"; source: "elm";
+ action: STATE_SET "darker" 0.0;
+ transition: SINUSOIDAL 0.5 CURRENT;
+ target: "clipper";
+  }
+  program {
+ signal: "elm,video,pause"; source: "elm";
+ action: STATE_SET "darker" 0.0;
+ transition: SINUSOIDAL 0.7 CURRENT;
+ target: "clipper";
+  }
+   }
+}
\ No newline at end of file

--

[EGIT] [core/efl] master 05/19: themes: frame - remove elm frame inheritance.

2018-04-11 Thread Amitesh Singh

ami pushed a commit to branch master.

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

commit c76ec302ca357550e85b04a69fff850040af3369
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Apr 11 17:58:30 2018 +0900

themes: frame - remove elm frame inheritance.
---
 data/elementary/themes/edc/efl/frame.edc | 169 ++-
 1 file changed, 166 insertions(+), 3 deletions(-)

diff --git a/data/elementary/themes/edc/efl/frame.edc 
b/data/elementary/themes/edc/efl/frame.edc
index f8b4690b24..729177ad98 100644
--- a/data/elementary/themes/edc/efl/frame.edc
+++ b/data/elementary/themes/edc/efl/frame.edc
@@ -1,3 +1,166 @@
-group { "efl/frame";
-   inherit: "elm/frame/base/default";
-}
+group { name: "efl/frame";
+   images.image: "shadow_square_tiny.png" COMP;
+   images.image: "vgrad_med_curved.png" COMP;
+   images.image: "bevel_out.png" COMP;
+   images.image: "holes_tiny_vert.png" COMP;
+   parts {
+  part { name: "shadow"; mouse_events: 0;
+ description { state: "default" 0.0;
+rel1.offset: -1 0;
+rel2.offset: 0 1;
+image.normal: "shadow_square_tiny.png";
+image.border: 6 6 6 6;
+fill.smooth: 0;
+ }
+  }
+  part { name: "base"; type: RECT;
+ description { state: "default" 0.0;
+rel1.relative: 0.0 1.0;
+rel1.offset: 2 0;
+rel1.to_y: "top";
+rel2.offset: -3 -3;
+color: 64 64 64 255;
+ }
+  }
+  part { name: "top";
+ description { state: "default" 0.0;
+image.normal: "vgrad_med_curved.png";
+rel1.offset: 2 2;
+rel2.to_y: "elm.text";
+rel2.offset: -3 -1;
+fill.smooth: 0;
+TILED_HORIZ(120)
+ }
+  }
+  part { name: "edge1";
+ description { state: "default" 0.0;
+image.normal: "holes_tiny_vert.png";
+rel1.offset: 4 0;
+rel1.to_y: "elm.text";
+rel2.offset: 4 -1;
+rel2.relative: 0.0 1.0;
+rel2.to_y: "elm.text";
+align: 0.0 0.5;
+FIXED_SIZE(3, 11)
+ }
+  }
+  part { name: "edge2";
+ description { state: "default" 0.0;
+image.normal: "holes_tiny_vert.png";
+rel1.offset: -5 0;
+rel1.to_y: "elm.text";
+rel1.relative: 1.0 0.0;
+rel2.offset: -5 -1;
+rel2.relative: 1.0 1.0;
+rel2.to_y: "elm.text";
+align: 1.0 0.5;
+FIXED_SIZE(3, 11)
+ }
+  }
+  part { name: "elm.text"; type: TEXT;
+ scale: 1;
+ effect: SHADOW BOTTOM;
+ description { state: "default" 0.0;
+color_class: "frame";
+rel1.relative: 1.0 0.0;
+rel1.offset: 1 2;
+rel1.to_x: "edge1";
+rel2.relative: 0.0 0.0;
+rel2.offset: -3 1;
+rel2.to_x: "edge2";
+align: 0.0 0.0;
+color: FN_COL_DISABLE;
+text { font: FNBD; size: 10;
+   text_class: "frame";
+   align: 0.0 0.0;
+   min: 0 1;
+}
+fixed: 0 1;
+ }
+  }
+  part { name: "clip"; type: RECT;
+ description { state: "default" 0.0;
+rel1.relative: 0.0 1.0;
+rel1.offset: 5 0;
+rel1.to_y: "elm.text";
+rel2.offset: -7 -7;
+ }
+  }
+  part { name: "elm.swallow.content"; type: SWALLOW;
+ clip_to: "clip";
+ description { state: "default" 0.0;
+align: 0.0 1.0;
+rel1.relative: 0.0 1.0;
+rel1.offset: 5 0;
+rel1.to_y: "elm.text";
+rel2.offset: -7 -7;
+ }
+ description { state: "collapsed" 0.0;
+inherit: "default" 0.0;
+minmul: 1.0 0.0;
+ }
+  }
+  part { name: "bevel"; mouse_events: 0;
+ description { state: "default" 0.0;
+rel1.offset: 2 2;
+rel2.offset: -3 -3;
+image.normal: "bevel_out.png";
+image.border: 1 1 1 1;
+image.middle: 0;
+fill.smooth: 0;
+ }
+  }
+  part { name: "event"; type: RECT; ignore_flags: ON_HOLD;
+ description { state: "default" 0.0;
+color: 0 0 0 0;
+rel1.to_y: "elm.text";
+rel2.to_y: &qu

[EGIT] [core/efl] master 14/19: theme: popup - define popup alert theme based on new theme

2018-04-11 Thread Amitesh Singh

ami pushed a commit to branch master.

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

commit 8b7ed085f8e544a370a300cb2924e037e6d6e2ce
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Apr 11 18:56:55 2018 +0900

theme: popup - define popup alert theme based on new theme
---
 data/elementary/themes/edc/efl/popup.edc | 22 --
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/data/elementary/themes/edc/efl/popup.edc 
b/data/elementary/themes/edc/efl/popup.edc
index 491d483b42..50fb460f09 100644
--- a/data/elementary/themes/edc/efl/popup.edc
+++ b/data/elementary/themes/edc/efl/popup.edc
@@ -250,9 +250,27 @@ group { "efl/popup_alert/button";
alias: "efl/popup_alert_text/button";
 }
 
-group { "efl/popup_alert_scroll/scroller";
-   inherit: "elm/scroller/base/popup/no_inset_shadow";
+group { name: "efl/popup_alert_scroll/scroller";
+   inherit: "efl/scroller";
alias: "efl/popup_alert_text/scroller";
+   parts {
+  part { name: "elm.swallow.content"; type: SWALLOW;
+ description { state: "default" 0.0;
+rel1.offset: 0 0;
+rel2.offset: 0 0;
+ }
+  }
+  part { name: "inset";
+ description { state: "default" 0.0;
+visible: 0;
+ }
+  }
+  part { name: "shadow";
+ description { state: "default" 0.0;
+visible: 0;
+ }
+  }
+   }
 }
 
 group { "efl/popup_alert_text/text";

--

[EGIT] [core/efl] master 06/19: themes: cursor - remove elm cursor inheritance.

2018-04-11 Thread Amitesh Singh

ami pushed a commit to branch master.

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

commit 4337206acb1557cfa15aee3f2f5b8aa740d30412
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Apr 11 18:01:50 2018 +0900

themes: cursor - remove elm cursor inheritance.
---
 data/elementary/themes/edc/efl/cursor.edc | 78 ---
 1 file changed, 72 insertions(+), 6 deletions(-)

diff --git a/data/elementary/themes/edc/efl/cursor.edc 
b/data/elementary/themes/edc/efl/cursor.edc
index 1302e4c228..78b8590531 100644
--- a/data/elementary/themes/edc/efl/cursor.edc
+++ b/data/elementary/themes/edc/efl/cursor.edc
@@ -78,14 +78,80 @@
 // "watch"
 // "xterm"
 
-group { "efl/cursor/hand1";
-   inherit: "elm/cursor/hand1/default";
+group { name: "efl/cursor/hand1";
+   images.image: "pointer_hand1.png" COMP;
+   parts {
+  part { name: "base"; mouse_events: 0; scale: 1;
+ description { state: "default" 0.0;
+FIXED_SIZE(32, 32)
+image.normal: "pointer_hand1.png";
+ }
+  }
+  part { name: "elm.swallow.hotspot"; type: SWALLOW;
+ description { state: "default" 0.0;
+visible: 0;
+fixed: 1 1;
+rel1.relative: (26/32) (9/32);
+rel1.to: "base";
+rel2.to: "base";
+rel2.relative: (26/32) (9/32);
+rel2.offset: 0 0;
+ }
+  }
+  /* elm.content.hotspot is the old name for the above part */
+  alias: "elm.content.hotspot" "elm.swallow.hotspot";
+   }
 }
 
-group { "efl/cursor/blank";
-   inherit: "elm/cursor/blank/default";
+group { name: "efl/cursor/blank";
+   parts {
+  part { name: "elm.swallow.hotspot"; type: SWALLOW;
+ description { state: "default" 0.0;
+visible: 0;
+max: 1 1;
+ }
+  }
+  /* elm.content.hotspot is the old name for the above part */
+  alias: "elm.content.hotspot" "elm.swallow.hotspot";
+   }
 }
 
-group { "efl/cursor/xterm";
-   inherit: "elm/cursor/xterm/default";
+group { name: "efl/cursor/xterm";
+   images.image: "pointer_entry_bar.png" COMP;
+   images.image: "led_dot_white.png" COMP;
+   parts {
+  part { name: "base"; mouse_events: 0; scale: 1;
+ description { state: "default" 0.0;
+min: 15 20;
+max: 15 9;
+image.normal: "pointer_entry_bar.png";
+image.border: 0 0 10 10;
+rel1.offset: 0 2;
+rel2.offset: -1 -3;
+ }
+  }
+  part { name: "elm.swallow.hotspot"; type: SWALLOW;
+ description { state: "default" 0.0;
+visible: 0;
+fixed: 1 1;
+rel1.to: "base";
+rel2.to: "base";
+rel1.relative: 0.5 0.5;
+rel2.relative: 0.5 0.5;
+rel2.offset: 0 0;
+ }
+  }
+  /* elm.content.hotspot is the old name for the above part */
+  alias: "elm.content.hotspot" "elm.swallow.hotspot";
+  part { name: "shine";
+ description { state: "default" 0.0;
+rel1.to: "base";
+rel2.to: "base";
+image.normal: "led_dot_white.png";
+max: 27 27;
+aspect: 1.0 1.0;
+aspect_preference: VERTICAL;
+ }
+  }
+   }
 }

--

[EGIT] [core/efl] master 19/19: theme: spin button - remove elm spin btn inheritance.

2018-04-11 Thread Amitesh Singh

ami pushed a commit to branch master.

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

commit dda15b88e37b271f1fb4069dae84cd6b131afd9b
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Apr 11 19:52:09 2018 +0900

theme: spin button - remove elm spin btn inheritance.
---
 data/elementary/themes/edc/efl/spin_button.edc | 307 +++--
 1 file changed, 294 insertions(+), 13 deletions(-)

diff --git a/data/elementary/themes/edc/efl/spin_button.edc 
b/data/elementary/themes/edc/efl/spin_button.edc
index 40e9492a2e..4d502e3779 100644
--- a/data/elementary/themes/edc/efl/spin_button.edc
+++ b/data/elementary/themes/edc/efl/spin_button.edc
@@ -206,23 +206,304 @@ group { "efl/spin_button:vertical";
}
 }
 
-group { "efl/spin_button/inc_button";
-   inherit: "elm/button/base/spinner/increase/default";
-}
+group { name: "efl/spin_button/inc_button";
+  images.image: "sym_right_light_normal.png" COMP;
+  images.image: "sym_right_glow_normal.png" COMP;
+  images.image: "sym_right_dark_normal.png" COMP;
+  script {
+ public mouse_down = 0;
+ public multi_down = 0;
+  }
+  parts {
+ part { name: "arrow.image";
+scale: 1;
+description { state: "default" 0.0;
+   min: 15 15;
+   max: 15 15;
+   color_class: "F032L1";
+   image.normal: "sym_right_light_normal.png";
+}
+description { state: "pressed" 0.0;
+   inherit: "default" 0.0;
+   image.normal: "sym_right_glow_normal.png";
+}
+description { state: "disabled" 0.0;
+   inherit: "default" 0.0;
+   image.normal: "sym_right_dark_normal.png";
+}
+ }
+ part { name: "over";
+type: RECT;
+repeat_events: 1;
+description { state: "default" 0.0;
+   color: 0 0 0 0;
+}
+ }
+ part { name: "disabler";
+type: RECT;
+description { state: "default" 0.0;
+   color: 0 0 0 0;
+   visible: 0;
+}
+description { state: "disabled" 0.0;
+   inherit: "default" 0.0;
+   visible: 1;
+}
+ }
+  }
+  programs {
+ program { name: "button_press";
+signal: "mouse,down,1";
+source: "over";
+script {
+   if ((get_int(multi_down) == 0) &&
+   (get_int(mouse_down) == 0)) {
+ set_int(mouse_down, 1);
+ run_program(PROGRAM:"button_press2");
+   }
+}
+ }
+ program { name: "button_press2";
+action: SIGNAL_EMIT "elm,action,press" "";
+after: "button_press_anim";
+ }
+ program { name: "button_press_anim";
+action: STATE_SET "pressed" 0.0;
+target: "arrow.image";
+ }
+ program { name: "button_unpress";
+signal: "mouse,up,1";
+source: "over";
+script {
+   if (get_int(mouse_down) == 1) {
+ set_int(mouse_down, 0);
+ run_program(PROGRAM:"button_unpress2");
+ run_program(PROGRAM:"button_unpress_anim");
+   }
+}
+ }
+ program { name: "button_unpress2";
+action: SIGNAL_EMIT "elm,action,unpress" "";
+ }
+ program { name: "button_unpress_anim";
+action: STATE_SET "default" 0.0;
+target: "arrow.image";
+ }
+ program { name: "button_click";
+signal: "mouse,clicked,1";
+source: "over";
+script {
+   if (get_int(multi_down) == 0) {
+ run_program(PROGRAM:"button_click2");
+   }
+}
+ }
+ program { name: "action_unpressed";
+signal: "elm,action,unpressed";
+source: "elm";
+after: "button_unpress_anim";
+ }
+ program { name: "action_pressed";
+signal: "elm,action,pressed";
+source: "elm";
+after: "button_press_anim";
+ }
+ program { name: "button_click2";
+action:

[EGIT] [core/efl] master 01/01: doc: check - correct the ingroup name for legacy apis

2018-03-12 Thread Amitesh Singh

ami pushed a commit to branch master.

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

commit 0dd8f97a8e988c126cb4ce1fd97071790de78426
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Mon Mar 12 15:04:08 2018 +0900

doc: check - correct the ingroup name for legacy apis
---
 src/lib/elementary/elm_check_legacy.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lib/elementary/elm_check_legacy.h 
b/src/lib/elementary/elm_check_legacy.h
index 10240b57e2..e5c702770a 100644
--- a/src/lib/elementary/elm_check_legacy.h
+++ b/src/lib/elementary/elm_check_legacy.h
@@ -15,7 +15,7 @@ EAPI Evas_Object *elm_check_add(Evas_Object 
*parent);
  *
  * @param obj The check object
  *
- * @ingroup Check
+ * @ingroup Elm_Check
  */
 EAPI Eina_Bool   elm_check_state_get(const Evas_Object *obj);
 
@@ -30,7 +30,7 @@ EAPI Eina_Bool   elm_check_state_get(const 
Evas_Object *obj);
  * @param obj The check object
  * @param state The state to use (1 == on, 0 == off)
  *
- * @ingroup Check
+ * @ingroup Elm_Check
  */
 EAPI voidelm_check_state_set(Evas_Object *obj, 
Eina_Bool state);
 
@@ -47,7 +47,7 @@ EAPI void
elm_check_state_set(Evas_Object *obj, Eina_Bool
  * @param obj The check object
  * @param statep pointer to the boolean to modify
  *
- * @ingroup Check
+ * @ingroup Elm_Check
  */
 EAPI voidelm_check_state_pointer_set(Evas_Object *obj, 
Eina_Bool *statep);
 

--

[EGIT] [core/efl] master 01/01: examples: cxx: fix the compilation for slider example.

2018-03-07 Thread Amitesh Singh

ami pushed a commit to branch master.

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

commit 558947bf81b4c6df723ac603841e0e3951e06e3e
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Mar 7 19:25:19 2018 +0900

examples: cxx: fix the compilation for slider example.
---
 src/examples/elementary/slider_cxx_example.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/examples/elementary/slider_cxx_example.cc 
b/src/examples/elementary/slider_cxx_example.cc
index 959fe256f0..3a63e158c6 100644
--- a/src/examples/elementary/slider_cxx_example.cc
+++ b/src/examples/elementary/slider_cxx_example.cc
@@ -57,7 +57,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev 
EINA_UNUSED)
efl::ui::Slider sl5(instantiate, win);
sl5.indicator().format_string_set("%1.0f rabbit(s)");
sl5.range_min_max_set(0, 100);
-   sl5.step_set(1);
+   sl5.range_step_set(1);
sl5.direction_set(EFL_UI_DIR_UP);
sl5.hint_align_set(EFL_GFX_SIZE_HINT_FILL, 0.5);
sl5.hint_min_set({0, 120});

--

[EGIT] [core/efl] master 01/01: efl.ui.progressbar: add checks for min & max value

2018-02-06 Thread Amitesh Singh

ami pushed a commit to branch master.

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

commit 0aca43be2377c55260ef3224dc825bc41cddb1eb
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Tue Feb 6 22:33:58 2018 +0900

efl.ui.progressbar: add checks for min & max value

this improves the validity check for min & max values
provided from user side.
---
 src/lib/elementary/efl_ui_progressbar.c | 29 +++--
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/lib/elementary/efl_ui_progressbar.c 
b/src/lib/elementary/efl_ui_progressbar.c
index 2177cd28f6..2654b1a850 100644
--- a/src/lib/elementary/efl_ui_progressbar.c
+++ b/src/lib/elementary/efl_ui_progressbar.c
@@ -130,16 +130,21 @@ _val_set(Evas_Object *obj)
 {
Eina_Bool rtl;
double pos;
+   Efl_Ui_Progress_Status *ps;
+   Eina_List *l;
 
EFL_UI_PROGRESSBAR_DATA_GET(obj, sd);
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
rtl = efl_ui_mirrored_get(obj);
-   Efl_Ui_Progress_Status *ps;
-   Eina_List *l;
 
EINA_LIST_FOREACH(sd->progress_status, l, ps)
  {
+if (EINA_DBL_EQ(ps->val_max, ps->val_min))
+  {
+ WRN("progressbar min and max are equal.");
+ continue;
+  }
 pos = (ps->val - ps->val_min)/(ps->val_max - ps->val_min);
 
 if ((!rtl && _is_inverted(sd->dir)) ||
@@ -478,12 +483,23 @@ _progressbar_span_size_set(Eo *obj, 
Efl_Ui_Progressbar_Data *sd, Evas_Coord size
 }
 
 static void
-_progress_part_min_max_set(Efl_Ui_Progressbar_Data *sd, const char *part_name, 
double min, double max)
+_progress_part_min_max_set(Eo *obj, Efl_Ui_Progressbar_Data *sd, const char 
*part_name, double min, double max)
 {
Efl_Ui_Progress_Status *ps;
Eina_Bool  existing_ps = EINA_FALSE;
Eina_List *l;
 
+   if (EINA_DBL_EQ(min, max))
+ {
+ERR("min & max provided are equal.");
+return;
+ }
+
+   if (min > max)
+ {
+WRN("min is greater than max.");
+ }
+
if (!strcmp(part_name, "elm.cur.progressbar"))
  {
 sd->val_min = min;
@@ -507,6 +523,7 @@ _progress_part_min_max_set(Efl_Ui_Progressbar_Data *sd, 
const char *part_name, d
   ps->val_max = max;
   sd->progress_status = eina_list_append(sd->progress_status, ps);
 }
+_val_set(obj);
 }
 
 static void
@@ -622,9 +639,9 @@ _efl_ui_progressbar_pulse_get(Eo *obj EINA_UNUSED, 
Efl_Ui_Progressbar_Data *sd)
 }
 
 EOLIAN static void
-_efl_ui_progressbar_efl_ui_range_range_min_max_set(Eo *obj EINA_UNUSED, 
Efl_Ui_Progressbar_Data *sd, double min, double max)
+_efl_ui_progressbar_efl_ui_range_range_min_max_set(Eo *obj, 
Efl_Ui_Progressbar_Data *sd, double min, double max)
 {
-  _progress_part_min_max_set(sd, "elm.cur.progressbar", min, max);
+  _progress_part_min_max_set(obj, sd, "elm.cur.progressbar", min, max);
 }
 
 EOLIAN static void
@@ -679,7 +696,7 @@ _efl_ui_progressbar_part_efl_ui_range_range_min_max_set(Eo 
*obj, void *_pd EINA_
   Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS);
   Efl_Ui_Progressbar_Data *sd = efl_data_scope_get(pd->obj, 
EFL_UI_PROGRESSBAR_CLASS);
 
-  _progress_part_min_max_set(sd, pd->part, min, max);
+  _progress_part_min_max_set(pd->obj, sd, pd->part, min, max);
 }
 
 EOLIAN static void

--

[EGIT] [core/efl] master 01/01: Efl.ui.progressbar: remove duplicate call

2018-01-31 Thread Amitesh Singh

ami pushed a commit to branch master.

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

commit 98f38ac0f7d4e88779eebb31d0e191222c6ca41c
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Jan 31 18:04:39 2018 +0900

Efl.ui.progressbar: remove duplicate call

eina_value_set() was already getting called
---
 src/lib/elementary/efl_ui_progressbar.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/lib/elementary/efl_ui_progressbar.c 
b/src/lib/elementary/efl_ui_progressbar.c
index b8129fec4f..2177cd28f6 100644
--- a/src/lib/elementary/efl_ui_progressbar.c
+++ b/src/lib/elementary/efl_ui_progressbar.c
@@ -114,8 +114,6 @@ _units_set(Evas_Object *obj)
 // Keeping this bug since the legacy code was like that.
 if (sd->is_legacy_format_string && !sd->is_legacy_format_cb)
   eina_value_set(, 100 * sd->val);
-else
-  eina_value_set(, sd->val);
 
 eina_strbuf_reset(sd->format_strbuf);
 sd->format_cb(sd->format_cb_data, sd->format_strbuf, val);

--

[EGIT] [core/efl] master 01/01: Efl.Ui.Progressbar: implement range min max

2018-01-31 Thread Amitesh Singh

ami pushed a commit to branch master.

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

commit c99b37ad47f022cfbaca5fde230572df2136e104
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Jan 17 15:52:58 2018 +0900

Efl.Ui.Progressbar: implement range min max
---
 po/POTFILES.in  |   1 +
 src/Makefile_Elementary.am  |   1 +
 src/bin/elementary/test.c   |   2 +
 src/bin/elementary/test_ui_progressbar.c| 171 
 src/lib/elementary/efl_ui_progressbar.c |  94 -
 src/lib/elementary/efl_ui_progressbar.eo|   1 +
 src/lib/elementary/efl_ui_progressbar_part.eo   |   1 +
 src/lib/elementary/efl_ui_progressbar_private.h |   4 +
 8 files changed, 269 insertions(+), 6 deletions(-)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 925b2952cf..425f35c5ad 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -49,6 +49,7 @@ src/bin/elementary/test_panes.c
 src/bin/elementary/test_photo.c
 src/bin/elementary/test_photocam.c
 src/bin/elementary/test_progressbar.c
+src/bin/elementary/test_ui_progressbar.c
 src/bin/elementary/test_radio.c
 src/bin/elementary/test_scaling.c
 src/bin/elementary/test_scroller.c
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index db53d2aba7..eee0170d3d 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -955,6 +955,7 @@ bin/elementary/test_photocam.c \
 bin/elementary/test_popup.c \
 bin/elementary/test_prefs.c \
 bin/elementary/test_progressbar.c \
+bin/elementary/test_ui_progressbar.c \
 bin/elementary/test_radio.c \
 bin/elementary/test_scaling.c \
 bin/elementary/test_scroller.c \
diff --git a/src/bin/elementary/test.c b/src/bin/elementary/test.c
index 6c0d4ee1e0..8685e1bce5 100644
--- a/src/bin/elementary/test.c
+++ b/src/bin/elementary/test.c
@@ -170,6 +170,7 @@ void test_win_state2(void *data, Evas_Object *obj, void 
*event_info);
 void test_win_stack(void *data, Evas_Object *obj, void *event_info);
 void test_progressbar(void *data, Evas_Object *obj, void *event_info);
 void test_progressbar2(void *data, Evas_Object *obj, void *event_info);
+void test_ui_progressbar(void *data, Evas_Object *obj, void *event_info);
 void test_fileselector(void *data, Evas_Object *obj, void *event_info);
 void test_separator(void *data, Evas_Object *obj, void *event_info);
 void test_scroller(void *data, Evas_Object *obj, void *event_info);
@@ -1045,6 +1046,7 @@ 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", "Efl.Ui.Progressbar", 
test_ui_progressbar);
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);
diff --git a/src/bin/elementary/test_ui_progressbar.c 
b/src/bin/elementary/test_ui_progressbar.c
new file mode 100644
index 00..e1391421b1
--- /dev/null
+++ b/src/bin/elementary/test_ui_progressbar.c
@@ -0,0 +1,171 @@
+#ifdef HAVE_CONFIG_H
+# include "elementary_config.h"
+#endif
+#include 
+
+typedef struct _pbdata
+{
+   Eo *win;
+   Eo *pb1;
+   Eo *pb2;
+   Eo *btn_start;
+   Eo *btn_stop;
+   Eo *btn_reset;
+   Ecore_Timer *timer;
+} pbdata;
+
+static Eina_Bool
+_set_progress_val(Eo *pb, double inc_value)
+{
+   double progress;
+
+   progress = efl_ui_range_value_get(pb);
+
+   if (progress < 100.0)
+ progress += inc_value;
+   else
+ return EINA_TRUE;
+
+   efl_ui_range_value_set(pb, progress);
+
+   return EINA_FALSE;
+}
+
+static Eina_Bool
+_pb_timer_cb(void *d)
+{
+   pbdata *pd = d;
+   double progress_val;
+
+   if (!pd) return ECORE_CALLBACK_CANCEL;
+
+   progress_val = efl_ui_range_value_get(pd->pb1);
+   if (progress_val < 100.0)
+ {
+progress_val += 1;
+efl_ui_range_value_set(pd->pb2, progress_val);
+ }
+
+   if (!_set_progress_val(pd->pb1, 0.5))
+ return ECORE_CALLBACK_RENEW;
+
+   pd->timer = NULL;
+   return ECORE_CALLBACK_CANCEL;
+}
+
+static void
+_start_btn_clicked_cb(void *d, const Efl_Event *ev EINA_UNUSED)
+{
+   pbdata *pd = d;
+
+   if (!pd) return;
+
+   printf("start button is clicked\n");
+
+   efl_ui_widget_disabled_set(pd->btn_start, EINA_TRUE);
+   efl_ui_widget_disabled_set(pd->btn_stop, EINA_FALSE);
+
+   if (!pd->timer) pd->timer = ecore_timer_add(0.1, _pb_timer_cb, pd);
+}
+
+static void
+_stop_btn_clicked_cb(void *d, const Efl_Event *ev EINA_UNUSED)
+{
+   pbdata *pd = d;
+
+   if (!pd) return;
+   printf("stop button is clicked

[EGIT] [core/efl] master 01/01: examples: evas vg: fix the compilation of vg batman

2018-01-17 Thread Amitesh Singh

ami pushed a commit to branch master.

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

commit 7d68a89ef32c23aa94a2c73e28fccb50582c1d67
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Thu Jan 18 15:19:53 2018 +0900

examples: evas vg: fix the compilation of vg batman
---
 src/examples/evas/evas-vg-batman.c | 8 
 1 file changed, 8 insertions(+)

diff --git a/src/examples/evas/evas-vg-batman.c 
b/src/examples/evas/evas-vg-batman.c
index 6800daf248..5271608390 100644
--- a/src/examples/evas/evas-vg-batman.c
+++ b/src/examples/evas/evas-vg-batman.c
@@ -18,6 +18,14 @@
 #define WIDTH 800
 #define HEIGHT 600
 
+#ifndef EFL_BETA_API_SUPPORT
+#define EFL_BETA_API_SUPPORT
+#endif
+
+#ifndef EFL_EO_API_SUPPORT
+#define EFL_EO_API_SUPPORT
+#endif
+
 #include 
 #include 
 #include 

--

[EGIT] [core/efl] master 01/01: Efl.Ui.Progressbar: Add missing Efl.Text/Content

2018-01-16 Thread Amitesh Singh

ami pushed a commit to branch master.

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

commit 4e3d71ef22e58b1e7327728ec14e44c0686a785a
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Tue Jan 16 20:09:54 2018 +0900

Efl.Ui.Progressbar: Add missing Efl.Text/Content
---
 src/lib/elementary/efl_ui_progressbar.c  | 4 
 src/lib/elementary/efl_ui_progressbar.eo | 6 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/lib/elementary/efl_ui_progressbar.c 
b/src/lib/elementary/efl_ui_progressbar.c
index 4bd7e87afc..0ecaed2a0b 100644
--- a/src/lib/elementary/efl_ui_progressbar.c
+++ b/src/lib/elementary/efl_ui_progressbar.c
@@ -635,6 +635,10 @@ _efl_ui_progressbar_efl_access_value_value_and_text_get(Eo 
*obj EINA_UNUSED, Efl
 /* Efl.Part end */
 
 /* Internal EO APIs and hidden overrides */
+ELM_PART_TEXT_DEFAULT_IMPLEMENT(efl_ui_progressbar, Efl_Ui_Progressbar_Data)
+ELM_PART_MARKUP_DEFAULT_IMPLEMENT(efl_ui_progressbar, Efl_Ui_Progressbar_Data)
+ELM_PART_CONTENT_DEFAULT_GET(efl_ui_progressbar, _content_aliases[0].real_part)
+ELM_PART_CONTENT_DEFAULT_IMPLEMENT(efl_ui_progressbar, Efl_Ui_Progressbar_Data)
 
 ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(efl_ui_progressbar)
 ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(efl_ui_progressbar)
diff --git a/src/lib/elementary/efl_ui_progressbar.eo 
b/src/lib/elementary/efl_ui_progressbar.eo
index 0591030fe0..602aa23a4a 100644
--- a/src/lib/elementary/efl_ui_progressbar.eo
+++ b/src/lib/elementary/efl_ui_progressbar.eo
@@ -1,5 +1,6 @@
 class Efl.Ui.Progressbar (Efl.Ui.Layout, Efl.Ui.Range, Efl.Ui.Format,
-  Efl.Ui.Direction, Efl.Access.Value)
+  Efl.Ui.Direction, Efl.Access.Value,
+  Efl.Text, Efl.Content)
 {
[[Elementary progressbar class]]
methods {
@@ -58,6 +59,9 @@ class Efl.Ui.Progressbar (Efl.Ui.Layout, Efl.Ui.Range, 
Efl.Ui.Format,
   Efl.Ui.Format.format_cb { set; }
   Efl.Part.part;
   Efl.Access.Value.value_and_text { get; }
+  Efl.Text.text { get; set; }
+  Efl.Content.content { get; set; }
+  Efl.Content.content_unset;
}
events {
   changed; [[Called when progressbar changed]]

--

[EGIT] [core/efl] master 01/01: Efl.Gfx.Color: add color_class_code.set/get{} method

2018-01-01 Thread Amitesh Singh

ami pushed a commit to branch master.

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

commit 44b6aa16c1054b545583408c31c4243144852960
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Fri Dec 29 13:06:44 2017 +0900

Efl.Gfx.Color: add color_class_code.set/get{} method
---
 src/lib/efl/interfaces/efl_gfx_color.c  | 25 -
 src/lib/efl/interfaces/efl_gfx_color.eo | 21 +
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/src/lib/efl/interfaces/efl_gfx_color.c 
b/src/lib/efl/interfaces/efl_gfx_color.c
index 1e65f62977..91f8a4fd32 100644
--- a/src/lib/efl/interfaces/efl_gfx_color.c
+++ b/src/lib/efl/interfaces/efl_gfx_color.c
@@ -117,4 +117,27 @@ _efl_gfx_color_color_code_get(Eo *obj, void *_pd 
EINA_UNUSED)
 return eina_slstr_printf("#%02X%02X%02X%02X", r, g, b, a);
 }
 
-#include "interfaces/efl_gfx_color.eo.c"
\ No newline at end of file
+EOLIAN static void
+_efl_gfx_color_color_class_code_set(Eo *obj, void *_pd EINA_UNUSED, const char 
*color_class,
+Efl_Gfx_Color_Class_Layer layer, const 
char *colorcode)
+{
+   int len;
+   unsigned char r, g, b, a;
+
+   len = _format_clean_param(colorcode);
+
+   _format_color_parse(colorcode, len, , , , );
+   efl_gfx_color_class_set(obj, color_class, layer, r, g, b, a);
+}
+
+EOLIAN static const char *
+_efl_gfx_color_color_class_code_get(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED,
+const char *color_class, 
Efl_Gfx_Color_Class_Layer layer)
+{
+   int r, g, b, a;
+
+   efl_gfx_color_class_get(obj, color_class, layer, , , , );
+   return eina_slstr_printf("#%02X%02X%02X%02X", r, g, b, a);
+}
+
+#include "interfaces/efl_gfx_color.eo.c"
diff --git a/src/lib/efl/interfaces/efl_gfx_color.eo 
b/src/lib/efl/interfaces/efl_gfx_color.eo
index 2c2dd4d858..61f5e76f1e 100644
--- a/src/lib/efl/interfaces/efl_gfx_color.eo
+++ b/src/lib/efl/interfaces/efl_gfx_color.eo
@@ -1,3 +1,5 @@
+import efl_gfx_types;
+
 mixin Efl.Gfx.Color
 {
[[Efl Gfx Color mixin class]]
@@ -58,5 +60,24 @@ mixin Efl.Gfx.Color
  colorcode: string; [[the hex color code.]]
   }
   }
+  @property color_class_code {
+  set {
+ [[Set the color class color of given Evas Object to the given hex 
color code(#RRGGBBAA).
+   e.g. efl_gfx_color_class_code_set(obj, "color_class_name", 
layer, "#FFCCAACC");
+ ]]
+  }
+  get {
+ [[Get hex color class code of given Evas Object.
+   This returns a short lived hex color class code string.
+ ]]
+  }
+  keys {
+ color_class: string; [[The name of color class]]
+ layer: Efl.Gfx.Color_Class.Layer @optional; [[The layer to set 
the color]]
+  }
+  values {
+ colorcode: string; [[the hex color code.]]
+ }
+  }
}
 }

--

[EGIT] [core/efl] master 01/02: interface: add Efl.Gfx.Color interface for color related APIs

2017-12-21 Thread Amitesh Singh

ami pushed a commit to branch master.

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

commit 9db0ec554bf3f92c8e0c8e1733455955e2351e51
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Wed Dec 20 16:34:01 2017 +0900

interface: add Efl.Gfx.Color interface for color related APIs

This would eventually turn into mixin class later after adding
more color related helper functions.
---
 src/Makefile_Efl.am |  1 +
 src/lib/efl/Efl.h   |  1 +
 src/lib/efl/interfaces/efl_gfx.eo   | 40 -
 src/lib/efl/interfaces/efl_gfx_blur.eo  |  2 +-
 src/lib/efl/interfaces/efl_gfx_buffer.eo|  2 +-
 src/lib/efl/interfaces/efl_gfx_color.eo | 46 +
 src/lib/efl/interfaces/efl_interfaces_main.c|  1 +
 src/lib/elementary/efl_ui_bg_widget.c   |  4 +--
 src/lib/elementary/efl_ui_bg_widget.eo  |  2 +-
 src/lib/elementary/efl_ui_image.c   |  2 +-
 src/lib/elementary/efl_ui_image.eo  |  6 ++--
 src/lib/elementary/efl_ui_widget_part_bg.eo |  4 +--
 src/lib/elementary/efl_ui_widget_part_shadow.eo |  4 +--
 src/lib/elementary/efl_ui_win.c |  4 +--
 src/lib/elementary/efl_ui_win_part.eo   |  5 +--
 src/lib/elementary/elm_widget.c | 10 +++---
 src/lib/elementary/elm_widget.eo|  2 +-
 src/lib/evas/canvas/efl_canvas_group.eo |  2 +-
 src/lib/evas/canvas/efl_canvas_object.eo|  4 +--
 src/lib/evas/canvas/efl_vg.eo   |  4 +--
 src/lib/evas/canvas/evas_object_main.c  |  4 +--
 src/lib/evas/canvas/evas_object_smart.c |  2 +-
 src/lib/evas/canvas/evas_vg_node.c  |  4 +--
 23 files changed, 83 insertions(+), 73 deletions(-)

diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am
index a1c31b8784..2b0f9a5043 100644
--- a/src/Makefile_Efl.am
+++ b/src/Makefile_Efl.am
@@ -2,6 +2,7 @@
 efl_eolian_legacy_files = \
lib/efl/interfaces/efl_gfx_fill.eo \
lib/efl/interfaces/efl_gfx.eo \
+   lib/efl/interfaces/efl_gfx_color.eo \
lib/efl/interfaces/efl_image.eo \
lib/efl/interfaces/efl_image_animated.eo \
lib/efl/interfaces/efl_input_device.eo \
diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h
index bb22f9716c..8505afa176 100644
--- a/src/lib/efl/Efl.h
+++ b/src/lib/efl/Efl.h
@@ -115,6 +115,7 @@ typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command;
 
 /* Graphics */
 #include "interfaces/efl_gfx.eo.h"
+#include "interfaces/efl_gfx_color.eo.h"
 #include "interfaces/efl_gfx_buffer.eo.h"
 #include "interfaces/efl_gfx_stack.eo.h"
 #include "interfaces/efl_gfx_fill.eo.h"
diff --git a/src/lib/efl/interfaces/efl_gfx.eo 
b/src/lib/efl/interfaces/efl_gfx.eo
index 3d073c2fc7..c0ab8b325e 100644
--- a/src/lib/efl/interfaces/efl_gfx.eo
+++ b/src/lib/efl/interfaces/efl_gfx.eo
@@ -49,46 +49,6 @@ interface Efl.Gfx {
 rect: Eina.Rect; [[The X,Y position and W,H size, in pixels.]]
  }
   }
-  @property color {
- set {
-[[Sets the general/main color of the given Evas object to the given
-  one.
-
-  See also @.color.get (for an example)
-
-  These color values are expected to be premultiplied by alpha.
-]]
- }
- get {
-[[Retrieves the general/main color of the given Evas object.
-
-  Retrieves the main color's RGB component (and alpha channel)
-  values, which range from 0 to 255. For the alpha channel,
-  which defines the object's transparency level, 0 means totally
-  transparent, while 255 means opaque. These color values are
-  premultiplied by the alpha value.
-
-  Usually youll use this attribute for text and rectangle objects,
-  where the main color is their unique one. If set for objects
-  which themselves have colors, like the images one, those colors
-  get modulated by this one.
-
-  All newly created Evas rectangles get the default color
-  values of 255 255 255 255 (opaque white).
-
-  Use null pointers on the components you're not interested
-  in: they'll be ignored by the function.
-
-  See the full \@ref Example_Evas_Object_Manipulation "example".
-]]
- }
- values {
-r: int; [[The red component of the given color.]]
-g: int; [[The green component of the given color.]]
-b: int; [[The blue component of the given color.]]
-a: int; [[The alpha component of the given color.]]
- }
-  }
   @property visible {
  [[The visibility of a canvas object.
 
diff --git a/src/lib/efl/interfaces/efl_gfx_blur.eo 
b/src/lib/

[EGIT] [core/efl] master 02/02: Efl.Gfx.Color: add color_code{}

2017-12-21 Thread Amitesh Singh

ami pushed a commit to branch master.

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

commit e2cb16c78b6dff0ce7d06a24447a8340aff8b1fa
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Thu Dec 21 14:48:41 2017 +0900

Efl.Gfx.Color: add color_code{}

color_code allows user to pass/get the color hex string
(e.g. efl_gfx_color_code_set(o, "#FFAA22CC"))

Also make this interface as mixin class.
---
 src/Makefile_Efl.am  |   1 +
 src/bin/elementary/test_bg.c |   1 +
 src/lib/efl/interfaces/efl_gfx_color.c   | 120 +++
 src/lib/efl/interfaces/efl_gfx_color.eo  |  20 -
 src/lib/efl/interfaces/efl_interfaces_main.c |   1 -
 5 files changed, 140 insertions(+), 3 deletions(-)

diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am
index 2b0f9a5043..30b6cdb040 100644
--- a/src/Makefile_Efl.am
+++ b/src/Makefile_Efl.am
@@ -139,6 +139,7 @@ lib/efl/interfaces/efl_io_queue.c \
 lib/efl/interfaces/efl_observer.c \
 lib/efl/interfaces/efl_file.c \
 lib/efl/interfaces/efl_ui_format.c \
+lib/efl/interfaces/efl_gfx_color.c \
 lib/efl/interfaces/efl_text_markup_util.c \
 $(NULL)
 
diff --git a/src/bin/elementary/test_bg.c b/src/bin/elementary/test_bg.c
index a0e2399dff..d6e8bc3065 100644
--- a/src/bin/elementary/test_bg.c
+++ b/src/bin/elementary/test_bg.c
@@ -391,6 +391,7 @@ _cb_check_changed_scale_type(void *data, const Efl_Event 
*ev)
 
efl_gfx_color_get(o_bg, , , , );
printf("bg color: %d %d %d %d\n", r, g, b, a);
+   printf("bg hex color code: %s\n", efl_gfx_color_code_get(o_bg));
fflush(stdout);
 }
 
diff --git a/src/lib/efl/interfaces/efl_gfx_color.c 
b/src/lib/efl/interfaces/efl_gfx_color.c
new file mode 100644
index 00..1e65f62977
--- /dev/null
+++ b/src/lib/efl/interfaces/efl_gfx_color.c
@@ -0,0 +1,120 @@
+#include "config.h"
+#include "Efl.h"
+
+static int
+_format_clean_param(Eina_Tmpstr *s)
+{
+   Eina_Tmpstr *ss;
+   char *ds;
+   int len = 0;
+
+   ds = (char*) s;
+   for (ss = s; *ss; ss++, ds++, len++)
+ {
+if ((*ss == '\\') && *(ss + 1)) ss++;
+if (ds != ss) *ds = *ss;
+ }
+   *ds = 0;
+
+   return len;
+}
+
+static int
+_hex_string_get(char ch, Eina_Bool *ok)
+{
+   if ((ch >= '0') && (ch <= '9')) return (ch - '0');
+   else if ((ch >= 'A') && (ch <= 'F')) return (ch - 'A' + 10);
+   else if ((ch >= 'a') && (ch <= 'f')) return (ch - 'a' + 10);
+   *ok = EINA_FALSE;
+   return 0;
+}
+
+/**
+ * @internal
+ * Parses a string of one of the formas:
+ * 1. "#RRGGBB"
+ * 2. "#RRGGBBAA"
+ * 3. "#RGB"
+ * 4. "#RGBA"
+ * To the rgba values.
+ *
+ * @param[in] str The string to parse - NOT NULL.
+ * @param[out] r The Red value - NOT NULL.
+ * @param[out] g The Green value - NOT NULL.
+ * @param[out] b The Blue value - NOT NULL.
+ * @param[out] a The Alpha value - NOT NULL.
+ */
+static Eina_Bool
+_format_color_parse(const char *str, int slen,
+unsigned char *r, unsigned char *g,
+unsigned char *b, unsigned char *a)
+{
+   Eina_Bool v = EINA_TRUE;
+
+   *r = *g = *b = *a = 0;
+
+   if (slen == 7) /* #RRGGBB */
+ {
+*r = (_hex_string_get(str[1], ) << 4) | (_hex_string_get(str[2], 
));
+*g = (_hex_string_get(str[3], ) << 4) | (_hex_string_get(str[4], 
));
+*b = (_hex_string_get(str[5], ) << 4) | (_hex_string_get(str[6], 
));
+*a = 0xff;
+ }
+   else if (slen == 9) /* #RRGGBBAA */
+ {
+*r = (_hex_string_get(str[1], ) << 4) | (_hex_string_get(str[2], 
));
+*g = (_hex_string_get(str[3], ) << 4) | (_hex_string_get(str[4], 
));
+*b = (_hex_string_get(str[5], ) << 4) | (_hex_string_get(str[6], 
));
+*a = (_hex_string_get(str[7], ) << 4) | (_hex_string_get(str[8], 
));
+ }
+   else if (slen == 4) /* #RGB */
+ {
+*r = _hex_string_get(str[1], );
+*r = (*r << 4) | *r;
+*g = _hex_string_get(str[2], );
+*g = (*g << 4) | *g;
+*b = _hex_string_get(str[3], );
+*b = (*b << 4) | *b;
+*a = 0xff;
+ }
+   else if (slen == 5) /* #RGBA */
+ {
+*r = _hex_string_get(str[1], );
+*r = (*r << 4) | *r;
+*g = _hex_string_get(str[2], );
+*g = (*g << 4) | *g;
+*b = _hex_string_get(str[3], );
+*b = (*b << 4) | *b;
+*a = _hex_string_get(str[4], );
+*a = (*a << 4) | *a;
+ }
+   else v = EINA_FALSE;
+
+   *r = (*r * *a) / 255;
+   *g = (*g * *a) / 255;
+   *b = (*b * *a) / 255;
+   return v;
+}
+
+EOLIAN static void
+_efl_gfx_color_color_code_set(Eo *obj, void *_pd EINA_UNUSED, const char 
*colorcode)
+{
+int len;
+unsigned char r, g, b, a;
+
+len = _format_cl

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

2017-12-13 Thread 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"

2017-12-12 Thread 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()

2017-12-12 Thread 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.Canvas.Object: rename pointer_coords_inside_get to coords_inside property.

2017-12-12 Thread 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: Efl.Canvas: make pointer_iterate a beta API

2017-12-11 Thread 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: elm test: Add test for Efl.Ui.Slider

2017-12-11 Thread 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: interface: rename Efl.Dup to Efl.Duplicate.

2017-12-10 Thread 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: evas_event: add missing comments about code.

2017-12-08 Thread 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

2017-12-08 Thread 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.

2017-12-08 Thread 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.

2017-12-08 Thread 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: edje: rename Edje.Object to Efl.Canvas.Layout

2017-12-05 Thread 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: Efl.Canvas.Object.eo: indent correction

2017-12-05 Thread 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: update gitignore.

2017-12-05 Thread 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/03: edje: rename intf Efl.Canvas.Layout.Signal to Efl.Layout.Signal

2017-12-04 Thread 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

2017-12-04 Thread 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

2017-12-04 Thread 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] [apps/terminology] master 01/01: title: set focus to title entry

2017-12-04 Thread 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/01: efl.gfx: move scale{} from efl.ui.base to efl.gfx

2017-12-03 Thread 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

2017-12-01 Thread 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: edje: fix NULL ptr dereference

2017-11-30 Thread 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: edje legacy: replace Edje_Object with Evas_Object

2017-11-30 Thread 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: edje: fix the typo in prev commit

2017-11-30 Thread 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: Efl.Ui.Base: remove base_scale.get{} from interface.

2017-11-30 Thread 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] [core/efl] master 01/01: elm tests: show nstate & slider_interval widgets in Efl.Ui scope

2017-11-30 Thread 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: Efl.Gfx.Shape: fix efl_super() call.

2017-11-29 Thread 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 03/03: Efl.Gfx.Path: add missing EOLIAN prefixes to eolian functions.

2017-11-29 Thread 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{}

2017-11-29 Thread 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 02/03: Efl.Gfx.Shape: add missing EOLIAN prefixes to eolian functions.

2017-11-29 Thread 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 01/01: focus: fix build break after previous commit.

2017-11-29 Thread 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

2017-11-29 Thread 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: Efl.Ui.Format: do format check once only.

2017-11-28 Thread 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.Ui.Format: do proper checking for string template.

2017-11-27 Thread 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: remove the dupicalte code

2017-11-26 Thread 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: add string format checking for user input

2017-11-23 Thread 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)
  {

--

1 2 3 >

1 - 100 of 277 matches

Mail list logo