[EGIT] [core/elementary] master 01/01: dnd/x11: correct coordinates in pos callback

2015-09-18 Thread Thiep Ha
jackdanielz pushed a commit to branch master.

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

commit 0363553dfced5eb0a8000c3493bf2fb53407f589
Author: Thiep Ha 
Date:   Fri Sep 18 11:30:23 2015 +0300

dnd/x11: correct coordinates in pos callback

Summary:
The x, y coordinates in pos callback should be relative to
the top-left of the object.
This patch corrects the x,y coordinates and adds poscb to elementary test
to clearly show the bug case.

Test:
  Run Genlist Dnd Dflt Anim with the change in this patch.
  Drag an item to other genlist and see the printed out item, x, y.

@fix

Reviewers: JackDanielZ

Subscribers: seoz

Differential Revision: https://phab.enlightenment.org/D3063
---
 src/bin/test_dnd.c | 30 ++
 src/lib/elm_cnp.c  | 11 +--
 2 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/src/bin/test_dnd.c b/src/bin/test_dnd.c
index 4b6124a..dd24585 100644
--- a/src/bin/test_dnd.c
+++ b/src/bin/test_dnd.c
@@ -217,6 +217,14 @@ _strndup(const char *str, size_t len)
return ret;
 }
 
+static void
+_gl_poscb(void *data EINA_UNUSED, Evas_Object *obj, Elm_Object_Item *it, 
Evas_Coord x, Evas_Coord y, int xposret, int yposret, Elm_Xdnd_Action action 
EINA_UNUSED)
+{
+   printf("<%s> <%d> obj: %p, item: %p <%s>, x y: %d %d, posret: %d %d\n",
+  __func__, __LINE__, obj, it, elm_object_item_text_get(it),
+  x, y, xposret, yposret);
+}
+
 static Eina_Bool
 _gl_dropcb(void *data EINA_UNUSED, Evas_Object *obj, Elm_Object_Item *it, 
Elm_Selection_Data *ev, int xposret EINA_UNUSED, int yposret)
 {  /* This function is called when data is dropped on the genlist */
@@ -761,18 +769,32 @@ void
 test_dnd_genlist_default_anim(void *data EINA_UNUSED, Evas_Object *obj 
EINA_UNUSED, void *event_info EINA_UNUSED)
 {
char buf[PATH_MAX];
-   Evas_Object *win, *gl, *bxx;
+   Evas_Object *win, *gl, *bxx, *bx2, *lb;
int i, j;
 
win = elm_win_util_standard_add("dnd-genlist-default-anim", 
"DnD-Genlist-Default-Anim");
elm_win_autodel_set(win, EINA_TRUE);
 
bxx = elm_box_add(win);
-   elm_box_horizontal_set(bxx, EINA_TRUE);
+   elm_box_horizontal_set(bxx, EINA_FALSE);
evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_win_resize_object_add(win, bxx);
evas_object_show(bxx);
 
+   lb = elm_label_add(win);
+   elm_object_text_set(lb, "Drag and drop between genlists with default 
anim.");
+   evas_object_size_hint_min_set(lb, 0, 50);
+   evas_object_size_hint_align_set(lb, EVAS_HINT_FILL, 0.5);
+   evas_object_show(lb);
+   elm_box_pack_end(bxx, lb);
+
+   bx2 = elm_box_add(win);
+   elm_box_horizontal_set(bx2, EINA_TRUE);
+   evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   evas_object_size_hint_weight_set(bx2, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_show(bx2);
+   elm_box_pack_end(bxx, bx2);
+
itc1 = elm_genlist_item_class_new();
itc1->item_style = "default";
itc1->func.text_get = gl_text_get;
@@ -791,7 +813,7 @@ test_dnd_genlist_default_anim(void *data EINA_UNUSED, 
Evas_Object *obj EINA_UNUS
   _gl_item_getcb,
   NULL, NULL,
   NULL, NULL,
-  NULL, NULL,
+  _gl_poscb, NULL,
   _gl_dropcb, NULL);
 
 elm_drag_item_container_add(gl, ANIM_TIME, DRAG_TIMEOUT,
@@ -802,7 +824,7 @@ test_dnd_genlist_default_anim(void *data EINA_UNUSED, 
Evas_Object *obj EINA_UNUS
 //elm_genlist_mode_set(gl, ELM_LIST_LIMIT);
 evas_object_size_hint_weight_set(gl, EVAS_HINT_EXPAND, 
EVAS_HINT_EXPAND);
 evas_object_size_hint_align_set(gl, EVAS_HINT_FILL, EVAS_HINT_FILL);
-elm_box_pack_end(bxx, gl);
+elm_box_pack_end(bx2, gl);
 evas_object_show(gl);
 
 for (i = 0; i < 20; i++)
diff --git a/src/lib/elm_cnp.c b/src/lib/elm_cnp.c
index d9e6c51..00d5aa5 100644
--- a/src/lib/elm_cnp.c
+++ b/src/lib/elm_cnp.c
@@ -1331,10 +1331,13 @@ _x11_dnd_dropable_handle(Dropable *dropable, Evas_Coord 
x, Evas_Coord y, Elm_Xdn
  {
 if (last_dropable == dropable) // same
   {
+ Evas_Coord ox, oy;
+
  cnp_debug("same obj dropable %p\n", dropable->obj);
+ evas_object_geometry_get(dropable->obj, , , NULL, NULL);
  EINA_INLIST_FOREACH_SAFE(dropable->cbs_list, itr, cbs)
 if ((cbs->types & dropable->last.format) && cbs->poscb)
-  cbs->poscb(cbs->posdata, dropable->obj, x, y, action);
+  cbs->poscb(cbs->posdata, dropable->obj, x - ox, y - oy, 
action);
   }
 else
   {
@@ -1367,7 +1370,10 @@ _x11_dnd_dropable_handle(Dropable *dropable, Evas_Coord 
x, Evas_Coord y, Elm_Xdn
  {
 if (dropable) // enter new obj
   {
+ Evas_Coord ox, oy;
+
  

[EGIT] [core/elementary] master 01/01: focus: remove checking the focus origin in highlight job.

2015-09-18 Thread Jaehwan Kim
jaehwan pushed a commit to branch master.

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

commit 2c362ba7c2f8bbad9b4db97284f4e6e27cb2405b
Author: Jaehwan Kim 
Date:   Fri Sep 18 16:49:14 2015 +0900

focus: remove checking the focus origin in highlight job.

In some case, it can take misoperation.

@fix
---
 src/lib/elm_win.c | 6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 9d4fecc..8ca3b0b 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -1002,11 +1002,7 @@ _elm_win_focus_highlight_reconfigure_job(void *data)
if ((!target) || (!common_visible) || (sd->focus_highlight.cur.in_theme))
  {
 if (target)
-  {
- Elm_Focus_Direction focus_origin = 
elm_widget_focus_origin_get(target);
- if (focus_origin >= ELM_FOCUS_UP && focus_origin <= 
ELM_FOCUS_LEFT)
-   _elm_win_focus_highlight_simple_setup(sd, fobj);
-  }
+  _elm_win_focus_highlight_simple_setup(sd, fobj);
 goto the_end;
  }
 

-- 




[EGIT] [core/elementary] master 01/01: test_dnd: transfer text without markup when drag label

2015-09-18 Thread Thiep Ha
jackdanielz pushed a commit to branch master.

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

commit cb46964852650697d3f345606ab79e6fe6c7c8f8
Author: Thiep Ha 
Date:   Fri Sep 18 11:38:39 2015 +0300

test_dnd: transfer text without markup when drag label

Summary:
In Types Dnd test, if we drag from label to entry, the text is inserted
with "". The reason is that we drag with type ELM_SEL_FORMAT_TEXT
but the transferred data is markup.
This patch fixes it by changing the transferred data to text.

@fix

Reviewers: JackDanielZ

Subscribers: seoz

Differential Revision: https://phab.enlightenment.org/D3072
---
 src/bin/test_dnd.c | 16 ++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/bin/test_dnd.c b/src/bin/test_dnd.c
index dd24585..40c2c61 100644
--- a/src/bin/test_dnd.c
+++ b/src/bin/test_dnd.c
@@ -1250,14 +1250,26 @@ _label_create_icon(void *data, Evas_Object *parent, 
Evas_Coord *xoff, Evas_Coord
 }
 
 static void
+_label_drag_done_cb(void *data, Evas_Object *obj EINA_UNUSED)
+{
+   free(data);
+}
+
+static void
 _label_mouse_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj 
EINA_UNUSED, void *event_info EINA_UNUSED)
 {
Evas_Object *lb = data;
-   const char *text = elm_object_text_get(lb);
+   const char *mkup = elm_object_text_get(lb);
+   char *text = evas_textblock_text_markup_to_utf8(NULL, mkup);
 
+   if (!text)
+ {
+printf("Cannot convert text\n");
+ }
elm_drag_start(lb, ELM_SEL_FORMAT_TEXT, text, ELM_XDND_ACTION_COPY,
   _label_create_icon, lb,
-  NULL, NULL, NULL, NULL, NULL, NULL);
+  NULL, NULL, NULL, NULL,
+  _label_drag_done_cb, text);
 }
 
 static Evas_Object *

-- 




[EGIT] [core/elementary] master 01/01: Eo: move Focus Direction to elm_general.eot

2015-09-18 Thread Daniel Zaoui
jackdanielz pushed a commit to branch master.

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

commit 51bb5a2434d742c2ade308e041cc9fd81228eb23
Author: Daniel Zaoui 
Date:   Fri Sep 18 12:38:04 2015 +0300

Eo: move Focus Direction to elm_general.eot
---
 src/lib/elm_focus.h| 17 -
 src/lib/elm_general.eot| 14 ++
 src/lib/elm_widget.eo  | 20 +++-
 src/lib/elm_widget_item.eo |  8 
 4 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/src/lib/elm_focus.h b/src/lib/elm_focus.h
index 46883a7..158a437 100644
--- a/src/lib/elm_focus.h
+++ b/src/lib/elm_focus.h
@@ -34,23 +34,6 @@
  */
 
 /**
- * Focus directions.
- *
- * @ingroup Focus
- */
-typedef enum
-{
-   ELM_FOCUS_PREVIOUS, /**< previous direction */
-   ELM_FOCUS_NEXT, /**< next direction */
-   ELM_FOCUS_UP,   /**< up direction */
-   ELM_FOCUS_DOWN, /**< down direction */
-   ELM_FOCUS_RIGHT,/**< right direction */
-   ELM_FOCUS_LEFT,  /**< left direction */
-   ELM_FOCUS_MOUSE,  /**< direction is from mouse */
-   ELM_FOCUS_REVERT  /**< direction is from focus revert */
-} Elm_Focus_Direction;
-
-/**
  * Focus region show mode.
  *
  * @ingroup Focus
diff --git a/src/lib/elm_general.eot b/src/lib/elm_general.eot
index 3118f58..57c81ae 100644
--- a/src/lib/elm_general.eot
+++ b/src/lib/elm_general.eot
@@ -107,3 +107,17 @@ enum Elm.Wrap.Type
last
 }
 
+enum Elm.Focus_Direction
+{
+   [[ Focus directions. ]]
+   legacy: elm_focus;
+   previous, [[ previous direction ]]
+   next, [[ next direction ]]
+   up,   [[ up direction ]]
+   down, [[ down direction ]]
+   right,[[ right direction ]]
+   left, [[ left direction ]]
+   mouse,[[ direction is from mouse ]]
+   revert[[ direction is from focus revert ]]
+}
+
diff --git a/src/lib/elm_widget.eo b/src/lib/elm_widget.eo
index 94633e1..44968e5 100644
--- a/src/lib/elm_widget.eo
+++ b/src/lib/elm_widget.eo
@@ -1,3 +1,5 @@
+import elm_general;
+
 abstract Elm.Widget (Evas.Object_Smart, Elm_Interface_Atspi_Accessible, 
Elm_Interface_Atspi_Component)
 {
eo_prefix: elm_obj_widget;
@@ -367,7 +369,7 @@ abstract Elm.Widget (Evas.Object_Smart, 
Elm_Interface_Atspi_Accessible, Elm_Inte
   @property focus_origin {
  get {
 [[Get the origination of the focus. Arrow key, tab key, mouse or 
deletion of an object.]]
-return: Elm_Focus_Direction;
+return: Elm.Focus_Direction;
  }
   }
   @property parent2 {
@@ -411,7 +413,7 @@ abstract Elm.Widget (Evas.Object_Smart, 
Elm_Interface_Atspi_Accessible, Elm_Inte
@since 1.8]]
  params {
 @in next: Evas.Object * @nullable; [[Focus next object]]
-@in dir: Elm_Focus_Direction; [[Focus direction]]
+@in dir: Elm.Focus_Direction; [[Focus direction]]
  }
   }
   focus_next_object_get @const {
@@ -420,7 +422,7 @@ abstract Elm.Widget (Evas.Object_Smart, 
Elm_Interface_Atspi_Accessible, Elm_Inte
@since 1.8]]
  return: Evas.Object *; [[Focus next object]]
  params {
-@in dir: Elm_Focus_Direction; [[Focus direction]]
+@in dir: Elm.Focus_Direction; [[Focus direction]]
  }
   }
   focus_next_item_set {
@@ -429,7 +431,7 @@ abstract Elm.Widget (Evas.Object_Smart, 
Elm_Interface_Atspi_Accessible, Elm_Inte
@since 1.16]]
  params {
 @in next_item: Elm_Object_Item * @nullable; [[Focus next object 
item]]
-@in dir: Elm_Focus_Direction; [[Focus direction]]
+@in dir: Elm.Focus_Direction; [[Focus direction]]
  }
   }
   focus_next_item_get @const {
@@ -438,7 +440,7 @@ abstract Elm.Widget (Evas.Object_Smart, 
Elm_Interface_Atspi_Accessible, Elm_Inte
@since 1.16]]
  return: Elm_Object_Item *; [[Focus next object item]]
  params {
-@in dir: Elm_Focus_Direction; [[Focus direction]]
+@in dir: Elm.Focus_Direction; [[Focus direction]]
  }
   }
   focus_tree_unfocusable_handle {
@@ -538,7 +540,7 @@ abstract Elm.Widget (Evas.Object_Smart, 
Elm_Interface_Atspi_Accessible, Elm_Inte
   }
   focus_cycle {
  params {
-@in dir: Elm_Focus_Direction;
+@in dir: Elm.Focus_Direction;
  }
   }
   focus_direction {
@@ -624,7 +626,7 @@ abstract Elm.Widget (Evas.Object_Smart, 
Elm_Interface_Atspi_Accessible, Elm_Inte
   focus_next_get @const {
  return: bool;
  params {
-@in dir: Elm_Focus_Direction;
+@in dir: Elm.Focus_Direction;
 @out next: Evas.Object *;
 @out next_item: Elm_Object_Item *;
  }
@@ -663,7 +665,7 @@ abstract Elm.Widget (Evas.Object_Smart, 
Elm_Interface_Atspi_Accessible, Elm_Inte
   focus_next {
  [['Virtual' 

[EGIT] [core/efl] efl-1.15 01/01: Edje Example: Fix wrong usage of evas_object_color_set API

2015-09-18 Thread Yeshwanth Reddivari
ami pushed a commit to branch efl-1.15.

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

commit 43d02ed84af7fa7ba20304fc38e60456b9e7c872
Author: Yeshwanth Reddivari 
Date:   Sat Sep 19 08:38:39 2015 +0530

Edje Example: Fix wrong usage of evas_object_color_set API

Summary:
Evas only handles pre multiplied colors. So use r,g,b values lesser than 
alpha to prevent error message.

Signed-off-by: Yeshwanth Reddivari 

Reviewers: sachin.dev, singh.amitesh

Reviewed By: singh.amitesh

Subscribers: cedric

Differential Revision: https://phab.enlightenment.org/D3073
---
 src/examples/edje/edje-box2.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/examples/edje/edje-box2.c b/src/examples/edje/edje-box2.c
index 9dea393..aa5aaf7 100644
--- a/src/examples/edje/edje-box2.c
+++ b/src/examples/edje/edje-box2.c
@@ -201,7 +201,7 @@ main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED)
o = last = evas_object_rectangle_add(evas);
 evas_object_size_hint_min_set(o, 50, 50);
 evas_object_resize(o, 50, 50);
-   evas_object_color_set(o, 255, 0, 0, 128);
+   evas_object_color_set(o, 128, 0, 0, 128);
evas_object_show(o);
 
if (!edje_object_part_box_append(edje_obj, "example/box", o))

-- 




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

2015-09-18 Thread Amitesh Singh
ami pushed a commit to branch master.

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

commit 5db028a32de71ce167851e75b221499593d7cd89
Author: Amitesh Singh 
Date:   Sat Sep 19 09:13:09 2015 +0530

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

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

-- 




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

2015-09-18 Thread Amitesh Singh
ami pushed a commit to branch master.

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

commit 86993e172a0c8407aa2d2381fc5cf08d32eaa5bd
Author: Amitesh Singh 
Date:   Sat Sep 19 09:24:58 2015 +0530

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

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