[EGIT] [core/efl] efl-1.15 01/01: ecore_evas: fix first render skip in several windows
jypark pushed a commit to branch efl-1.15. http://git.enlightenment.org/core/efl.git/commit/?id=a9648eededb192b589219b1c0641dcd2a55157ff commit a9648eededb192b589219b1c0641dcd2a55157ff Author: Ji-Youn Park Date: Fri Aug 7 11:53:02 2015 +0900 ecore_evas: fix first render skip in several windows ecore_evas_first only can be set first render even though there are several windows. because of this, second or third ecore_evas loses chance to render first frame. @fix --- src/lib/ecore_evas/ecore_evas.c | 4 1 file changed, 4 insertions(+) diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c index f7fa61f..1de6dea 100644 --- a/src/lib/ecore_evas/ecore_evas.c +++ b/src/lib/ecore_evas/ecore_evas.c @@ -3070,6 +3070,10 @@ _ecore_evas_register(Ecore_Evas *ee) ee->registered = 1; ecore_evases = (Ecore_Evas *)eina_inlist_prepend (EINA_INLIST_GET(ecore_evases), EINA_INLIST_GET(ee)); + +#ifdef RENDER_SYNC + ecore_evas_first = EINA_TRUE; +#endif } EAPI void --
[EGIT] [core/elementary] elementary-1.15 01/01: elm_toolbar: fix icon_size to consider edje base scale
hermet pushed a commit to branch elementary-1.15.
http://git.enlightenment.org/core/elementary.git/commit/?id=2f9e339c0dcac3189970226cc8a15042ed5390b4
commit 2f9e339c0dcac3189970226cc8a15042ed5390b4
Author: Sung-Taek Hong
Date: Fri Aug 7 16:42:29 2015 +0900
elm_toolbar: fix icon_size to consider edje base scale
Summary:
When icon is set, icon size is calculated without considering
edje base scale. This can lead to a miscalculation when
base scale is set other than 1.0.
@fix
Reviewers: seoz, woohyun, cedric, Hermet
Reviewed By: Hermet
Subscribers: cedric
Differential Revision: https://phab.enlightenment.org/D2798
---
src/lib/elm_toolbar.c | 18 +++---
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index e049643..d2797bc 100644
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -1039,7 +1039,9 @@ _internal_elm_toolbar_icon_size_get(Evas_Object *obj)
const char *icon_size = edje_object_data_get
(wd->resize_obj, "icon_size");
- if (icon_size) return atoi(icon_size);
+ if (icon_size)
+ return (int)(atoi(icon_size) * elm_widget_scale_get(obj) *
elm_config_scale_get()
+/ edje_object_base_scale_get(wd->resize_obj));
return _elm_config->icon_size;
}
@@ -1239,11 +1241,8 @@ _item_theme_hook(Evas_Object *obj,
}
if (it->icon)
{
- int ms = 0;
-
- ms = ((double)icon_size * scale);
- evas_object_size_hint_min_set(it->icon, ms, ms);
- evas_object_size_hint_max_set(it->icon, ms, ms);
+ evas_object_size_hint_min_set(it->icon, icon_size, icon_size);
+ evas_object_size_hint_max_set(it->icon, icon_size, icon_size);
elm_layout_content_set(view, "elm.swallow.icon", it->icon);
elm_layout_signal_emit
(view, "elm,state,icon,visible", "elm");
@@ -2396,11 +2395,8 @@ _item_new(Evas_Object *obj,
if (it->icon)
{
-int ms = 0;
-
-ms = ((double)sd->icon_size * elm_config_scale_get());
-evas_object_size_hint_min_set(it->icon, ms, ms);
-evas_object_size_hint_max_set(it->icon, ms, ms);
+evas_object_size_hint_min_set(it->icon, sd->icon_size, sd->icon_size);
+evas_object_size_hint_max_set(it->icon, sd->icon_size, sd->icon_size);
elm_layout_content_set(VIEW(it), "elm.swallow.icon", it->icon);
elm_layout_signal_emit(VIEW(it), "elm,state,icon,visible", "elm");
evas_object_show(it->icon);
--
[EGIT] [core/elementary] master 01/01: elm_toolbar: fix icon_size to consider edje base scale
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=e43e2cc79505c846e2dfa785c87d3b32c0e5692e
commit e43e2cc79505c846e2dfa785c87d3b32c0e5692e
Author: Sung-Taek Hong
Date: Fri Aug 7 16:42:29 2015 +0900
elm_toolbar: fix icon_size to consider edje base scale
Summary:
When icon is set, icon size is calculated without considering
edje base scale. This can lead to a miscalculation when
base scale is set other than 1.0.
@fix
Reviewers: seoz, woohyun, cedric, Hermet
Reviewed By: Hermet
Subscribers: cedric
Differential Revision: https://phab.enlightenment.org/D2798
---
src/lib/elm_toolbar.c | 18 +++---
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index e049643..d2797bc 100644
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -1039,7 +1039,9 @@ _internal_elm_toolbar_icon_size_get(Evas_Object *obj)
const char *icon_size = edje_object_data_get
(wd->resize_obj, "icon_size");
- if (icon_size) return atoi(icon_size);
+ if (icon_size)
+ return (int)(atoi(icon_size) * elm_widget_scale_get(obj) *
elm_config_scale_get()
+/ edje_object_base_scale_get(wd->resize_obj));
return _elm_config->icon_size;
}
@@ -1239,11 +1241,8 @@ _item_theme_hook(Evas_Object *obj,
}
if (it->icon)
{
- int ms = 0;
-
- ms = ((double)icon_size * scale);
- evas_object_size_hint_min_set(it->icon, ms, ms);
- evas_object_size_hint_max_set(it->icon, ms, ms);
+ evas_object_size_hint_min_set(it->icon, icon_size, icon_size);
+ evas_object_size_hint_max_set(it->icon, icon_size, icon_size);
elm_layout_content_set(view, "elm.swallow.icon", it->icon);
elm_layout_signal_emit
(view, "elm,state,icon,visible", "elm");
@@ -2396,11 +2395,8 @@ _item_new(Evas_Object *obj,
if (it->icon)
{
-int ms = 0;
-
-ms = ((double)sd->icon_size * elm_config_scale_get());
-evas_object_size_hint_min_set(it->icon, ms, ms);
-evas_object_size_hint_max_set(it->icon, ms, ms);
+evas_object_size_hint_min_set(it->icon, sd->icon_size, sd->icon_size);
+evas_object_size_hint_max_set(it->icon, sd->icon_size, sd->icon_size);
elm_layout_content_set(VIEW(it), "elm.swallow.icon", it->icon);
elm_layout_signal_emit(VIEW(it), "elm,state,icon,visible", "elm");
evas_object_show(it->icon);
--
[EGIT] [core/elementary] master 01/01: Theme: Scroller.edc-Improvement in left/right/top/bottom arrow behavior.
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=6e5c7506c73cc00018eb44096c2c5634b690b165
commit 6e5c7506c73cc00018eb44096c2c5634b690b165
Author: Umesh Tanwar
Date: Fri Aug 7 16:51:41 2015 +0900
Theme: Scroller.edc-Improvement in left/right/top/bottom arrow behavior.
Summary:
When the scroller size changes by dragging the
corners, the calculations will miss the condition "x+w == x1 + w1".
This is because of format specific computer calculations. So,
improvisation is made in comparisons.
@ fix
Signed-off-by: Umesh Tanwar
Test Plan:
elementary_test -> scroller -> scroll to the extreme right (right arrow
brightness changes).
Now, drag the lower right corner to increase the width of scroller. Drag
the corner slowly to see the issue clearly.
The arrow brightness changes alternatively, instead the hbar is positioned
to the extreme right.
Reviewers: Hermet, cedric, raster
Subscribers: singh.amitesh, eagleeye, SanghyeonLee, sachin.dev
Differential Revision: https://phab.enlightenment.org/D2796
---
data/themes/edc/elm/scroller.edc | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/data/themes/edc/elm/scroller.edc b/data/themes/edc/elm/scroller.edc
index f1a57f6..cf1cb99 100644
--- a/data/themes/edc/elm/scroller.edc
+++ b/data/themes/edc/elm/scroller.edc
@@ -44,7 +44,7 @@ group { name: "elm/scroller/base/default";
get_geometry(PART:"y_vbar_up", x,y,w, h);
get_geometry(PART:"y_vbar_up_mapper", x1,y1,w1, h1);
- if(y == y1)
+ if((y1 <= y) && (y <= (y1 + h1)))
{
set_state(PART:"arrow1_vbar", "hidden", 0.0);
set_state(PART:"sb_vbar_a1", "hidden", 0.0);
@@ -58,7 +58,7 @@ group { name: "elm/scroller/base/default";
get_geometry(PART:"y_vbar_down", x,y,w, h);
get_geometry(PART:"y_vbar_down_mapper", x1,y1,w1, h1);
- if((y+h) == (y1+h1))
+ if((y1 <= (y + h)) && ((y+ h) <= (y1 + h1)))
{
set_state(PART:"arrow2_vbar", "hidden", 0.0);
set_state(PART:"sb_vbar_a2", "hidden", 0.0);
@@ -79,7 +79,7 @@ group { name: "elm/scroller/base/default";
get_geometry(PART:"x_hbar_left", x,y,w, h);
get_geometry(PART:"x_hbar_left_mapper", x1,y1,w1, h1);
- if(x == x1)
+ if((x1 <= x) && (x <= (x1 + w1)))
{
set_state(PART:"arrow1_hbar", "hidden", 0.0);
set_state(PART:"sb_hbar_a1", "hidden", 0.0);
@@ -93,7 +93,7 @@ group { name: "elm/scroller/base/default";
get_geometry(PART:"x_hbar_right", x,y,w, h);
get_geometry(PART:"x_hbar_right_mapper", x1,y1,w1, h1);
- if((x+w) == (x1+w1))
+ if((x1 <= (x + w)) && ((x + w) <= (x1 + w1)))
{
set_state(PART:"arrow2_hbar", "hidden", 0.0);
set_state(PART:"sb_hbar_a2", "hidden", 0.0);
--
[EGIT] [core/elementary] elementary-1.15 01/01: Theme: Scroller.edc-Improvement in left/right/top/bottom arrow behavior.
hermet pushed a commit to branch elementary-1.15.
http://git.enlightenment.org/core/elementary.git/commit/?id=096753e27e827befecd950d2ee7dca5028d8ea38
commit 096753e27e827befecd950d2ee7dca5028d8ea38
Author: Umesh Tanwar
Date: Fri Aug 7 16:51:41 2015 +0900
Theme: Scroller.edc-Improvement in left/right/top/bottom arrow behavior.
Summary:
When the scroller size changes by dragging the
corners, the calculations will miss the condition "x+w == x1 + w1".
This is because of format specific computer calculations. So,
improvisation is made in comparisons.
@ fix
Signed-off-by: Umesh Tanwar
Test Plan:
elementary_test -> scroller -> scroll to the extreme right (right arrow
brightness changes).
Now, drag the lower right corner to increase the width of scroller. Drag
the corner slowly to see the issue clearly.
The arrow brightness changes alternatively, instead the hbar is positioned
to the extreme right.
Reviewers: Hermet, cedric, raster
Subscribers: singh.amitesh, eagleeye, SanghyeonLee, sachin.dev
Differential Revision: https://phab.enlightenment.org/D2796
---
data/themes/edc/elm/scroller.edc | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/data/themes/edc/elm/scroller.edc b/data/themes/edc/elm/scroller.edc
index f1a57f6..cf1cb99 100644
--- a/data/themes/edc/elm/scroller.edc
+++ b/data/themes/edc/elm/scroller.edc
@@ -44,7 +44,7 @@ group { name: "elm/scroller/base/default";
get_geometry(PART:"y_vbar_up", x,y,w, h);
get_geometry(PART:"y_vbar_up_mapper", x1,y1,w1, h1);
- if(y == y1)
+ if((y1 <= y) && (y <= (y1 + h1)))
{
set_state(PART:"arrow1_vbar", "hidden", 0.0);
set_state(PART:"sb_vbar_a1", "hidden", 0.0);
@@ -58,7 +58,7 @@ group { name: "elm/scroller/base/default";
get_geometry(PART:"y_vbar_down", x,y,w, h);
get_geometry(PART:"y_vbar_down_mapper", x1,y1,w1, h1);
- if((y+h) == (y1+h1))
+ if((y1 <= (y + h)) && ((y+ h) <= (y1 + h1)))
{
set_state(PART:"arrow2_vbar", "hidden", 0.0);
set_state(PART:"sb_vbar_a2", "hidden", 0.0);
@@ -79,7 +79,7 @@ group { name: "elm/scroller/base/default";
get_geometry(PART:"x_hbar_left", x,y,w, h);
get_geometry(PART:"x_hbar_left_mapper", x1,y1,w1, h1);
- if(x == x1)
+ if((x1 <= x) && (x <= (x1 + w1)))
{
set_state(PART:"arrow1_hbar", "hidden", 0.0);
set_state(PART:"sb_hbar_a1", "hidden", 0.0);
@@ -93,7 +93,7 @@ group { name: "elm/scroller/base/default";
get_geometry(PART:"x_hbar_right", x,y,w, h);
get_geometry(PART:"x_hbar_right_mapper", x1,y1,w1, h1);
- if((x+w) == (x1+w1))
+ if((x1 <= (x + w)) && ((x + w) <= (x1 + w1)))
{
set_state(PART:"arrow2_hbar", "hidden", 0.0);
set_state(PART:"sb_hbar_a2", "hidden", 0.0);
--
[EGIT] [core/elementary] master 01/01: spinner: Add to support spinner value %d format.
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=2686516f3c46af8ec5339dd00f9d1b42cce66d6c
commit 2686516f3c46af8ec5339dd00f9d1b42cce66d6c
Author: woochan lee
Date: Fri Aug 7 16:58:54 2015 +0900
spinner: Add to support spinner value %d format.
Summary:
When user set min max as 50, 150 with %d format, then value set as 100.
The spinner value set as '0'
Because the sd->val type is double.
Spinner entry has same problem.
@fix
Test Plan:
Set spinner format as %d.
Check the spinner value.
It's not supported.
Reviewers: Jaehyun_Cho, cedric, Hermet
Reviewed By: Hermet
Differential Revision: https://phab.enlightenment.org/D2898
Conflicts:
src/lib/elm_spinner.c
---
src/lib/elm_spinner.c | 31 +--
1 file changed, 29 insertions(+), 2 deletions(-)
diff --git a/src/lib/elm_spinner.c b/src/lib/elm_spinner.c
index 255135f..2130ffe 100644
--- a/src/lib/elm_spinner.c
+++ b/src/lib/elm_spinner.c
@@ -50,6 +50,24 @@ static const Elm_Action key_actions[] = {
static void _access_increment_decrement_info_say(Evas_Object *obj,
Eina_Bool is_incremented);
+static Eina_Bool
+_is_label_format_integer(const char *fmt)
+{
+ const char *start = strchr(fmt, '%');
+ const char *itr;
+
+ for (itr = start + 1; *itr != '\0'; itr++)
+ {
+if ((*itr == 'd') || (*itr == 'u') || (*itr == 'i') ||
+(*itr == 'o') || (*itr == 'x') || (*itr == 'X'))
+ return EINA_TRUE;
+else if ((*itr == 'f'))
+ return EINA_FALSE;
+ }
+
+ return EINA_FALSE;
+}
+
static void
_entry_show(Elm_Spinner_Data *sd)
{
@@ -100,9 +118,13 @@ _entry_show(Elm_Spinner_Data *sd)
}
}
}
- snprintf(buf, sizeof(buf), fmt, sd->val);
apply:
+ if (_is_label_format_integer(fmt))
+ snprintf(buf, sizeof(buf), fmt, (int)sd->val);
+ else
+ snprintf(buf, sizeof(buf), fmt, sd->val);
+
elm_object_text_set(sd->ent, buf);
}
@@ -125,7 +147,12 @@ _label_write(Evas_Object *obj)
}
if (sd->label)
- snprintf(buf, sizeof(buf), sd->label, sd->val);
+ {
+if (_is_label_format_integer(sd->label))
+ snprintf(buf, sizeof(buf), sd->label, (int)sd->val);
+else
+ snprintf(buf, sizeof(buf), sd->label, sd->val);
+ }
else
snprintf(buf, sizeof(buf), "%.0f", sd->val);
--
[EGIT] [core/elementary] elementary-1.15 01/01: spinner: Add to support spinner value %d format.
hermet pushed a commit to branch elementary-1.15.
http://git.enlightenment.org/core/elementary.git/commit/?id=093765d1e8bb7402e2ee96a619a687c97ab5ad7a
commit 093765d1e8bb7402e2ee96a619a687c97ab5ad7a
Author: woochan lee
Date: Fri Aug 7 16:58:54 2015 +0900
spinner: Add to support spinner value %d format.
Summary:
When user set min max as 50, 150 with %d format, then value set as 100.
The spinner value set as '0'
Because the sd->val type is double.
Spinner entry has same problem.
@fix
Test Plan:
Set spinner format as %d.
Check the spinner value.
It's not supported.
Reviewers: Jaehyun_Cho, cedric, Hermet
Reviewed By: Hermet
Differential Revision: https://phab.enlightenment.org/D2898
Conflicts:
src/lib/elm_spinner.c
Conflicts:
src/lib/elm_spinner.c
---
src/lib/elm_spinner.c | 31 +--
1 file changed, 29 insertions(+), 2 deletions(-)
diff --git a/src/lib/elm_spinner.c b/src/lib/elm_spinner.c
index 9fc90a2..1903cf9 100644
--- a/src/lib/elm_spinner.c
+++ b/src/lib/elm_spinner.c
@@ -50,6 +50,24 @@ static const Elm_Action key_actions[] = {
static void _access_increment_decrement_info_say(Evas_Object *obj,
Eina_Bool is_incremented);
+static Eina_Bool
+_is_label_format_integer(const char *fmt)
+{
+ const char *start = strchr(fmt, '%');
+ const char *itr;
+
+ for (itr = start + 1; *itr != '\0'; itr++)
+ {
+if ((*itr == 'd') || (*itr == 'u') || (*itr == 'i') ||
+(*itr == 'o') || (*itr == 'x') || (*itr == 'X'))
+ return EINA_TRUE;
+else if ((*itr == 'f'))
+ return EINA_FALSE;
+ }
+
+ return EINA_FALSE;
+}
+
static void
_entry_show(Elm_Spinner_Data *sd)
{
@@ -90,7 +108,11 @@ _entry_show(Elm_Spinner_Data *sd)
}
}
}
- snprintf(buf, sizeof(buf), fmt, sd->val);
+ if (_is_label_format_integer(fmt))
+ snprintf(buf, sizeof(buf), fmt, (int)sd->val);
+ else
+ snprintf(buf, sizeof(buf), fmt, sd->val);
+
elm_object_text_set(sd->ent, buf);
}
@@ -113,7 +135,12 @@ _label_write(Evas_Object *obj)
}
if (sd->label)
- snprintf(buf, sizeof(buf), sd->label, sd->val);
+ {
+if (_is_label_format_integer(sd->label))
+ snprintf(buf, sizeof(buf), sd->label, (int)sd->val);
+else
+ snprintf(buf, sizeof(buf), sd->label, sd->val);
+ }
else
snprintf(buf, sizeof(buf), "%.0f", sd->val);
--
[EGIT] [core/efl] master 01/01: Fix grammar in error messages.
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=626003ce0cc305d9e09e8377c99670e141f5d8cb
commit 626003ce0cc305d9e09e8377c99670e141f5d8cb
Author: Yomi
Date: Fri Aug 7 17:06:23 2015 +0900
Fix grammar in error messages.
Summary:
Changes:
src/examples/eio/eio_file_copy.c
src/tests/eio/eio_test_file.c
src/tests/eio/eio_test_xattr.c
Reviewers: cedric, thiepha, Hermet
Reviewed By: thiepha, Hermet
Subscribers: thiepha, cedric
Differential Revision: https://phab.enlightenment.org/D2912
---
src/examples/eio/eio_file_copy.c | 2 +-
src/tests/eio/eio_test_file.c| 2 +-
src/tests/eio/eio_test_xattr.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/examples/eio/eio_file_copy.c b/src/examples/eio/eio_file_copy.c
index 72da1b7..9a979d2 100644
--- a/src/examples/eio/eio_file_copy.c
+++ b/src/examples/eio/eio_file_copy.c
@@ -24,7 +24,7 @@ _done_cb(void *data EINA_UNUSED, Eio_File *handle EINA_UNUSED)
static void
_error_cb(void *data EINA_UNUSED, Eio_File *handle EINA_UNUSED, int error)
{
- fprintf(stderr, "Something wrong has happend:%s\n", strerror(error));
+ fprintf(stderr, "Something has gone wrong:%s\n", strerror(error));
ecore_main_loop_quit();
}
diff --git a/src/tests/eio/eio_test_file.c b/src/tests/eio/eio_test_file.c
index 912c975..f0e231c 100644
--- a/src/tests/eio/eio_test_file.c
+++ b/src/tests/eio/eio_test_file.c
@@ -110,7 +110,7 @@ _done_cb(void *data, Eio_File *handler EINA_UNUSED)
static void
_error_cb(void *data EINA_UNUSED, Eio_File *handler EINA_UNUSED, int error)
{
- fprintf(stderr, "Something wrong has happend:%s\n", strerror(error));
+ fprintf(stderr, "Something has gone wrong:%s\n", strerror(error));
ecore_main_loop_quit();
}
diff --git a/src/tests/eio/eio_test_xattr.c b/src/tests/eio/eio_test_xattr.c
index dfc5894..6600026 100644
--- a/src/tests/eio/eio_test_xattr.c
+++ b/src/tests/eio/eio_test_xattr.c
@@ -122,7 +122,7 @@ static void
_error_cb(void *data EINA_UNUSED, Eio_File *handler EINA_UNUSED, int error)
{
- fprintf(stderr, "Something wrong has happend:%s\n", strerror(error));
+ fprintf(stderr, "Something has gone wrong:%s\n", strerror(error));
abort();
ecore_main_loop_quit();
--
[EGIT] [core/elementary] elementary-1.15 01/01: intf scroll: handle wheel logic in post event cb.
hermet pushed a commit to branch elementary-1.15.
http://git.enlightenment.org/core/elementary.git/commit/?id=66437e05d035e0d330d2203d3b5d3173d43785f1
commit 66437e05d035e0d330d2203d3b5d3173d43785f1
Author: Amitesh Singh
Date: Fri Aug 7 17:27:30 2015 +0900
intf scroll: handle wheel logic in post event cb.
Summary:
@Fix
Resolves: T2216
Reviewers: seoz, raster, JackDanielZ, Hermet
Reviewed By: Hermet
Subscribers: cedric, eagleeye, SanghyeonLee, seoz, sachin.dev
Maniphest Tasks: T2216
Differential Revision: https://phab.enlightenment.org/D2393
Conflicts:
src/lib/elm_interface_scrollable.c
---
src/lib/elm_interface_scrollable.c | 73 --
src/lib/elm_interface_scrollable.h | 1 +
2 files changed, 47 insertions(+), 27 deletions(-)
diff --git a/src/lib/elm_interface_scrollable.c
b/src/lib/elm_interface_scrollable.c
index 594685b..5bc5509 100644
--- a/src/lib/elm_interface_scrollable.c
+++ b/src/lib/elm_interface_scrollable.c
@@ -1858,46 +1858,29 @@ _elm_scroll_wanted_region_set(Evas_Object *obj)
eo_do(obj, elm_interface_scrollable_content_region_set(wx, sid->wy, ww,
wh));
}
-static void
-_elm_scroll_wheel_event_cb(void *data,
- Evas *e EINA_UNUSED,
- Evas_Object *obj EINA_UNUSED,
- void *event_info)
+
+static Eina_Bool
+_scroll_wheel_post_event_cb(void *data, Evas *e EINA_UNUSED)
{
- Elm_Scrollable_Smart_Interface_Data *sid;
- Evas_Event_Mouse_Wheel *ev;
+ Elm_Scrollable_Smart_Interface_Data *sid = data;
+ Evas_Event_Mouse_Wheel *ev = sid->event_info;
+
Evas_Coord x = 0, y = 0, vw = 0, vh = 0, cw = 0, ch = 0;
- int direction = 0;
int pagenumber_h = 0, pagenumber_v = 0;
int mx = 0, my = 0, minx = 0, miny = 0;
Evas_Coord pwx, pwy;
double t;
+ int direction;
- sid = data;
- ev = event_info;
direction = ev->direction;
- if (direction)
- {
-if (sid->block & ELM_SCROLLER_MOVEMENT_BLOCK_HORIZONTAL) return;
- }
- else
- {
-if (sid->block & ELM_SCROLLER_MOVEMENT_BLOCK_VERTICAL) return;
- }
-
pwx = sid->wx;
pwy = sid->wy;
- if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
- if ((evas_key_modifier_is_set(ev->modifiers, "Control")) ||
- (evas_key_modifier_is_set(ev->modifiers, "Alt")) ||
- (evas_key_modifier_is_set(ev->modifiers, "Meta")) ||
- (evas_key_modifier_is_set(ev->modifiers, "Hyper")) ||
- (evas_key_modifier_is_set(ev->modifiers, "Super")))
- return;
- else if (evas_key_modifier_is_set(ev->modifiers, "Shift"))
+ if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return EINA_FALSE;
+ if (evas_key_modifier_is_set(ev->modifiers, "Shift"))
direction = !direction;
+
eo_do(sid->obj, elm_interface_scrollable_content_pos_get(&x, &y));
if (sid->scrollto.x.animator) x = sid->scrollto.x.end;
if (sid->scrollto.y.animator) y = sid->scrollto.y.end;
@@ -2012,6 +1995,42 @@ _elm_scroll_wheel_event_cb(void *data,
else sid->down.last_hold_y_wheel = EINA_FALSE;
sid->down.last_time_y_wheel = t;
}
+
+ return EINA_TRUE;
+}
+
+static void
+_elm_scroll_wheel_event_cb(void *data,
+ Evas *e,
+ Evas_Object *obj EINA_UNUSED,
+ void *event_info)
+{
+ Elm_Scrollable_Smart_Interface_Data *sid;
+ Evas_Event_Mouse_Wheel *ev;
+ int direction;
+
+ sid = data;
+ ev = event_info;
+ sid->event_info = event_info;
+ direction = ev->direction;
+
+ if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
+ if ((evas_key_modifier_is_set(ev->modifiers, "Control")) ||
+ (evas_key_modifier_is_set(ev->modifiers, "Alt")) ||
+ (evas_key_modifier_is_set(ev->modifiers, "Meta")) ||
+ (evas_key_modifier_is_set(ev->modifiers, "Hyper")) ||
+ (evas_key_modifier_is_set(ev->modifiers, "Super")))
+ return;
+ if (direction)
+ {
+if (sid->block & ELM_SCROLLER_MOVEMENT_BLOCK_HORIZONTAL) return;
+ }
+ else
+ {
+if (sid->block & ELM_SCROLLER_MOVEMENT_BLOCK_VERTICAL) return;
+ }
+
+ evas_post_event_callback_push(e, _scroll_wheel_post_event_cb, sid);
}
static Eina_Bool
diff --git a/src/lib/elm_interface_scrollable.h
b/src/lib/elm_interface_scrollable.h
index 748a9ca..4038eb9 100644
--- a/src/lib/elm_interface_scrollable.h
+++ b/src/lib/elm_interface_scrollable.h
@@ -193,6 +193,7 @@ struct _Elm_Scrollable_Smart_Interface_Data
unsigned char size_adjust_recurse;
unsigned char size_count;
+ void *event_info;
Eina_Bool size_adjust_recurse_abort : 1;
Eina_Bool momentum_animator_disabled : 1;
--
[EGIT] [core/elementary] master 01/01: intf scroll: handle wheel logic in post event cb.
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=2e73e2224a970f023ae217bdfc606d3ddd397374
commit 2e73e2224a970f023ae217bdfc606d3ddd397374
Author: Amitesh Singh
Date: Fri Aug 7 17:27:30 2015 +0900
intf scroll: handle wheel logic in post event cb.
Summary:
@Fix
Resolves: T2216
Reviewers: seoz, raster, JackDanielZ, Hermet
Reviewed By: Hermet
Subscribers: cedric, eagleeye, SanghyeonLee, seoz, sachin.dev
Maniphest Tasks: T2216
Differential Revision: https://phab.enlightenment.org/D2393
Conflicts:
src/lib/elm_interface_scrollable.c
---
src/lib/elm_interface_scrollable.c | 73 --
src/lib/elm_interface_scrollable.h | 1 +
2 files changed, 47 insertions(+), 27 deletions(-)
diff --git a/src/lib/elm_interface_scrollable.c
b/src/lib/elm_interface_scrollable.c
index 594685b..5bc5509 100644
--- a/src/lib/elm_interface_scrollable.c
+++ b/src/lib/elm_interface_scrollable.c
@@ -1858,46 +1858,29 @@ _elm_scroll_wanted_region_set(Evas_Object *obj)
eo_do(obj, elm_interface_scrollable_content_region_set(wx, sid->wy, ww,
wh));
}
-static void
-_elm_scroll_wheel_event_cb(void *data,
- Evas *e EINA_UNUSED,
- Evas_Object *obj EINA_UNUSED,
- void *event_info)
+
+static Eina_Bool
+_scroll_wheel_post_event_cb(void *data, Evas *e EINA_UNUSED)
{
- Elm_Scrollable_Smart_Interface_Data *sid;
- Evas_Event_Mouse_Wheel *ev;
+ Elm_Scrollable_Smart_Interface_Data *sid = data;
+ Evas_Event_Mouse_Wheel *ev = sid->event_info;
+
Evas_Coord x = 0, y = 0, vw = 0, vh = 0, cw = 0, ch = 0;
- int direction = 0;
int pagenumber_h = 0, pagenumber_v = 0;
int mx = 0, my = 0, minx = 0, miny = 0;
Evas_Coord pwx, pwy;
double t;
+ int direction;
- sid = data;
- ev = event_info;
direction = ev->direction;
- if (direction)
- {
-if (sid->block & ELM_SCROLLER_MOVEMENT_BLOCK_HORIZONTAL) return;
- }
- else
- {
-if (sid->block & ELM_SCROLLER_MOVEMENT_BLOCK_VERTICAL) return;
- }
-
pwx = sid->wx;
pwy = sid->wy;
- if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
- if ((evas_key_modifier_is_set(ev->modifiers, "Control")) ||
- (evas_key_modifier_is_set(ev->modifiers, "Alt")) ||
- (evas_key_modifier_is_set(ev->modifiers, "Meta")) ||
- (evas_key_modifier_is_set(ev->modifiers, "Hyper")) ||
- (evas_key_modifier_is_set(ev->modifiers, "Super")))
- return;
- else if (evas_key_modifier_is_set(ev->modifiers, "Shift"))
+ if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return EINA_FALSE;
+ if (evas_key_modifier_is_set(ev->modifiers, "Shift"))
direction = !direction;
+
eo_do(sid->obj, elm_interface_scrollable_content_pos_get(&x, &y));
if (sid->scrollto.x.animator) x = sid->scrollto.x.end;
if (sid->scrollto.y.animator) y = sid->scrollto.y.end;
@@ -2012,6 +1995,42 @@ _elm_scroll_wheel_event_cb(void *data,
else sid->down.last_hold_y_wheel = EINA_FALSE;
sid->down.last_time_y_wheel = t;
}
+
+ return EINA_TRUE;
+}
+
+static void
+_elm_scroll_wheel_event_cb(void *data,
+ Evas *e,
+ Evas_Object *obj EINA_UNUSED,
+ void *event_info)
+{
+ Elm_Scrollable_Smart_Interface_Data *sid;
+ Evas_Event_Mouse_Wheel *ev;
+ int direction;
+
+ sid = data;
+ ev = event_info;
+ sid->event_info = event_info;
+ direction = ev->direction;
+
+ if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
+ if ((evas_key_modifier_is_set(ev->modifiers, "Control")) ||
+ (evas_key_modifier_is_set(ev->modifiers, "Alt")) ||
+ (evas_key_modifier_is_set(ev->modifiers, "Meta")) ||
+ (evas_key_modifier_is_set(ev->modifiers, "Hyper")) ||
+ (evas_key_modifier_is_set(ev->modifiers, "Super")))
+ return;
+ if (direction)
+ {
+if (sid->block & ELM_SCROLLER_MOVEMENT_BLOCK_HORIZONTAL) return;
+ }
+ else
+ {
+if (sid->block & ELM_SCROLLER_MOVEMENT_BLOCK_VERTICAL) return;
+ }
+
+ evas_post_event_callback_push(e, _scroll_wheel_post_event_cb, sid);
}
static Eina_Bool
diff --git a/src/lib/elm_interface_scrollable.h
b/src/lib/elm_interface_scrollable.h
index 748a9ca..4038eb9 100644
--- a/src/lib/elm_interface_scrollable.h
+++ b/src/lib/elm_interface_scrollable.h
@@ -193,6 +193,7 @@ struct _Elm_Scrollable_Smart_Interface_Data
unsigned char size_adjust_recurse;
unsigned char size_count;
+ void *event_info;
Eina_Bool size_adjust_recurse_abort : 1;
Eina_Bool momentum_animator_disabled : 1;
--
[EGIT] [core/efl] master 01/01: po: Update po files
stefan pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=9bfaeffdfe1a42b9d0e3275ee638fedbb1cafdd8 commit 9bfaeffdfe1a42b9d0e3275ee638fedbb1cafdd8 Author: Stefan Schmidt Date: Fri Aug 7 11:30:36 2015 +0200 po: Update po files --- po/ca.po| 2 +- po/cs.po| 2 +- po/de.po| 2 +- po/el.po| 2 +- po/eo.po| 2 +- po/es.po| 2 +- po/fi.po| 2 +- po/fr.po| 2 +- po/gl.po| 2 +- po/hu.po| 2 +- po/it.po| 2 +- po/ja.po| 2 +- po/ko.po| 2 +- po/lt.po| 2 +- po/nl.po| 2 +- po/pl.po| 2 +- po/pt.po| 2 +- po/ru.po| 2 +- po/sl.po| 2 +- po/sr.po| 2 +- po/tr.po| 2 +- po/zh_CN.po | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/po/ca.po b/po/ca.po index fd565e7..df769c5 100644 --- a/po/ca.po +++ b/po/ca.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Efl\n" "Report-Msgid-Bugs-To: enlightenment-de...@lists.sourceforge.net\n" -"POT-Creation-Date: 2015-02-04 18:08+0900\n" +"POT-Creation-Date: 2015-08-07 11:08+0200\n" "PO-Revision-Date: 2014-05-26 21:11+\n" "Last-Translator: joancoll \n" "Language-Team: Catalan\n" diff --git a/po/cs.po b/po/cs.po index 58adf8b..9660af6 100644 --- a/po/cs.po +++ b/po/cs.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Efl\n" "Report-Msgid-Bugs-To: enlightenment-de...@lists.sourceforge.net\n" -"POT-Creation-Date: 2015-02-04 18:08+0900\n" +"POT-Creation-Date: 2015-08-07 11:08+0200\n" "PO-Revision-Date: 2014-05-22 21:29+0200\n" "Last-Translator: Tomáš Čech \n" "Language-Team: Czech \n" diff --git a/po/de.po b/po/de.po index a02e89b..16ed45a 100644 --- a/po/de.po +++ b/po/de.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Efl\n" "Report-Msgid-Bugs-To: enlightenment-de...@lists.sourceforge.net\n" -"POT-Creation-Date: 2015-02-04 18:08+0900\n" +"POT-Creation-Date: 2015-08-07 11:08+0200\n" "PO-Revision-Date: 2012-06-24 17:10+0900\n" "Last-Translator: Jerome Pinot \n" "Language-Team: Enlightenment Team\n" diff --git a/po/el.po b/po/el.po index 2d75514..ab9ed4a 100644 --- a/po/el.po +++ b/po/el.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: Efl\n" "Report-Msgid-Bugs-To: enlightenment-de...@lists.sourceforge.net\n" -"POT-Creation-Date: 2015-02-04 18:08+0900\n" +"POT-Creation-Date: 2015-08-07 11:08+0200\n" "PO-Revision-Date: 2012-12-01 18:26+0200\n" "Last-Translator: Efstathios Iosifidis \n" "Language-Team: Ελληνικά, Σύγχρονα \n" diff --git a/po/eo.po b/po/eo.po index 32b27c4..d000601 100644 --- a/po/eo.po +++ b/po/eo.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: enlightenment\n" "Report-Msgid-Bugs-To: enlightenment-de...@lists.sourceforge.net\n" -"POT-Creation-Date: 2015-02-04 18:08+0900\n" +"POT-Creation-Date: 2015-08-07 11:08+0200\n" "PO-Revision-Date: 2014-02-13 06:52+\n" "Last-Translator: Eliovir \n" "Language-Team: Esperanto \n" diff --git a/po/es.po b/po/es.po index 94d966d..9e6b1bb 100644 --- a/po/es.po +++ b/po/es.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: EFL\n" "Report-Msgid-Bugs-To: enlightenment-de...@lists.sourceforge.net\n" -"POT-Creation-Date: 2015-02-04 18:08+0900\n" +"POT-Creation-Date: 2015-08-07 11:08+0200\n" "PO-Revision-Date: 2015-05-03 18:09+0100\n" "Last-Translator: Adrián Arévalo \n" "Language-Team: Enlightenment Team\n" diff --git a/po/fi.po b/po/fi.po index 03d4106..133e022 100644 --- a/po/fi.po +++ b/po/fi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: enlightenment\n" "Report-Msgid-Bugs-To: enlightenment-de...@lists.sourceforge.net\n" -"POT-Creation-Date: 2015-02-04 18:08+0900\n" +"POT-Creation-Date: 2015-08-07 11:08+0200\n" "PO-Revision-Date: 2014-08-31 14:20+\n" "Last-Translator: Kai Huuhko \n" "Language-Team: Finnish \n" diff --git a/po/fr.po b/po/fr.po index 332afe1..f7e0581 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Efl\n" "Report-Msgid-Bugs-To: enlightenment-de...@lists.sourceforge.net\n" -"POT-Creation-Date: 2015-02-04 18:08+0900\n" +"POT-Creation-Date: 2015-08-07 11:08+0200\n" "PO-Revision-Date: 2014-05-25 20:08+\n" "Last-Translator: Eliovir \n" "Language-Team: Enlightenment French Team \n" "Language-Team: http://trasno.net/ \n" diff --git a/po/hu.po b/po/hu.po index 0c55877..b0c01b4 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: efl 1.8.3\n" "Report-Msgid-Bugs-To: enlightenment-de...@lists.sourceforge.net\n" -"POT-Creation-Date: 2015-02-04 18:08+0900\n" +"POT-Creation-Date: 2015-08-07 11:08+0200\n" "PO-Revision-Date: 2014-01-29 15:08+0100\n" "Last-Translator: rezso \n" "Language-Team: Enlightenment Team\n" diff --git a/po/it.po b/po/it.po index 771a643..90bf145 100644 --- a/po/it.po +++ b/po/it.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Efl\n" "Report-Msgid-Bugs-To: enlightenment-de...@lists.sourceforge.net\n" -"POT-Creation-Date: 2015-02-0
[EGIT] [core/elementary] master 01/01: elm_entry: Convert eo docs to new format
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=f218bbb01c1d1671bb3ac92b9d48b5f8c1b89692
commit f218bbb01c1d1671bb3ac92b9d48b5f8c1b89692
Author: Vivek Ellur
Date: Fri Aug 7 13:04:27 2015 +0100
elm_entry: Convert eo docs to new format
Summary:
Changed elm_entry.eo docs to the new format
Signed-off-by: Vivek Ellur
Reviewers: cedric, q66
Reviewed By: q66
Differential Revision: https://phab.enlightenment.org/D2924
---
src/lib/elm_entry.eo | 1092 +-
1 file changed, 365 insertions(+), 727 deletions(-)
diff --git a/src/lib/elm_entry.eo b/src/lib/elm_entry.eo
index e15334a..33819e1 100644
--- a/src/lib/elm_entry.eo
+++ b/src/lib/elm_entry.eo
@@ -104,97 +104,74 @@ class Elm.Entry (Elm.Layout, Elm_Interface_Scrollable,
Evas.Clickable_Interface,
methods {
@property scrollable {
set {
-/*@
-Enable or disable scrolling in entry
+[[Enable or disable scrolling in entry
-Normally the entry is not scrollable unless you enable it with
this call.
-
-@ingroup Entry */
+ Normally the entry is not scrollable unless you enable it with
this call.
+]]
}
get {
-/*@
-Get the scrollable state of the entry
-
-Normally the entry is not scrollable. This gets the scrollable
state
-of the entry. See elm_entry_scrollable_set() for more information.
-
-@return The scrollable state
+[[Get the scrollable state of the entry
-@ingroup Entry */
+ Normally the entry is not scrollable. This gets the scrollable
state
+ of the entry.
+]]
}
values {
-scroll: bool; /*@ true if it is to be scrollable, false otherwise
*/
+scroll: bool; [[$true if it is to be scrollable, $false
otherwise.]]
}
}
@property input_panel_show_on_demand {
set {
-/*@
-Set the attribute to show the input panel in case of only an
user's explicit Mouse Up event.
-It doesn't request to show the input panel even though it has
focus.
-
-@ingroup Entry */
+[[Set the attribute to show the input panel in case of only an
user's explicit Mouse Up event.
+ It doesn't request to show the input panel even though it has
focus.
+]]
}
get {
-/*@
-Get the attribute to show the input panel in case of only an
user's explicit Mouse Up event.
-
-@return $true if the input panel will be shown in case of only
Mouse up event.
-@since 1.9
+[[Get the attribute to show the input panel in case of only an
user's explicit Mouse Up event.
-@ingroup Entry */
+ @since 1.9
+]]
}
values {
-ondemand: bool; /*@ If true, the input panel will be shown in case
of only Mouse up event.
+ondemand: bool; [[If true, the input panel will be shown in case
of only Mouse up event.
(Focus event will be ignored.)
-@since 1.9 */
+
+@since 1.9.]]
}
}
@property context_menu_disabled {
set {
-/*@
-This disables the entry's contextual (longpress) menu.
-
-@ingroup Entry */
+[[This disables the entry's contextual (longpress) menu.]]
}
get {
-/*@
-This returns whether the entry's contextual (longpress) menu is
-disabled.
-
-@return If true, the menu is disabled
-
-@ingroup Entry */
+[[This returns whether the entry's contextual (longpress) menu is
+ disabled.
+]]
}
values {
-disabled: bool; /*@ If true, the menu is disabled */
+disabled: bool; [[If $true, the menu is disabled.]]
}
}
@property cnp_mode {
set {
-/*@
-Control pasting of text and images for the widget.
+[[Control pasting of text and images for the widget.
-Normally the entry allows both text and images to be pasted.
-By setting cnp_mode to be #ELM_CNP_MODE_NO_IMAGE, this prevents
images from being copy or past.
-By setting cnp_mode to be #ELM_CNP_MODE_PLAINTEXT, this remove all
tags in text .
+ Normally the entry allows both text and images to be pasted.
+ By setting cnp_mode to be #ELM_CNP_MODE_NO_IMAGE, this prevents
images from being copy or past.
+ By setting cnp_mode to be #ELM_CNP_MODE_PLAINTEXT, this remove
all tags in text .
-@note this only changes the behaviour of text.
-
-@
[EGIT] [core/elementary] master 01/01: Interface fileselector: migrate docs.
tasn pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=6c87a2da3568a95b022003da9581d76f27c59aa0
commit 6c87a2da3568a95b022003da9581d76f27c59aa0
Author: Tom Hacohen
Date: Fri Aug 7 13:19:35 2015 +0100
Interface fileselector: migrate docs.
---
src/lib/elm_interface_fileselector.eo | 52 +--
1 file changed, 25 insertions(+), 27 deletions(-)
diff --git a/src/lib/elm_interface_fileselector.eo
b/src/lib/elm_interface_fileselector.eo
index dc41c4f..4fb69fe 100644
--- a/src/lib/elm_interface_fileselector.eo
+++ b/src/lib/elm_interface_fileselector.eo
@@ -29,10 +29,10 @@ interface Elm_Interface_Fileselector ()
methods {
@property folder_only {
set {
-/*@ Enable/disable folder-only view for a given file selector
widget */
+[[Enable/disable folder-only view for a given file selector
widget]]
}
get {
-/*@ Get whether folder-only view is set for a given file selector
*/
+[[Get whether folder-only view is set for a given file selector]]
}
values {
only: bool;
@@ -40,11 +40,11 @@ interface Elm_Interface_Fileselector ()
}
@property selected {
set {
-/*@ Set, programmatically, the currently selected file/directory
in the given file selector widget */
+[[Set, programmatically, the currently selected file/directory in
the given file selector widget]]
return: bool;
}
get {
-/*@ Get the currently selected item's (full) path, in the given
file the given file selector widget */
+[[Get the currently selected item's (full) path, in the given file
the given file selector widget]]
}
values {
path: const(char)*;
@@ -52,10 +52,10 @@ interface Elm_Interface_Fileselector ()
}
@property thumbnail_size {
set {
-/*@ Set the size for the thumbnail of the file selector widget's
view. */
+[[Set the size for the thumbnail of the file selector widget's
view.]]
}
get {
-/*@ Get the size for the thumbnail of a given file selector widget
*/
+[[Get the size for the thumbnail of a given file selector widget]]
}
values {
w: Evas.Coord;
@@ -64,10 +64,10 @@ interface Elm_Interface_Fileselector ()
}
@property hidden_visible {
set {
-/*@ Enable or disable visibility of hidden files/directories in
the file selector widget. */
+[[Enable or disable visibility of hidden files/directories in the
file selector widget.]]
}
get {
-/*@ Get if hiden files/directories in the file selector are
visible or not. */
+[[Get if hiden files/directories in the file selector are visible
or not.]]
}
values {
multi: bool;
@@ -75,10 +75,10 @@ interface Elm_Interface_Fileselector ()
}
@property sort_method {
set {
-/*@ Set the sort method of the file selector widget. */
+[[Set the sort method of the file selector widget.]]
}
get {
-/*@ Get the sort method of the file selector widget. */
+[[Get the sort method of the file selector widget.]]
}
values {
sort: Elm.Fileselector.Sort;
@@ -86,10 +86,10 @@ interface Elm_Interface_Fileselector ()
}
@property multi_select {
set {
-/*@ Enable or disable multi-selection in the fileselector */
+[[Enable or disable multi-selection in the fileselector]]
}
get {
-/*@ Gets if multi-selection in fileselector is enabled or
disabled. */
+[[Gets if multi-selection in fileselector is enabled or disabled.]]
}
values {
multi: bool;
@@ -97,10 +97,10 @@ interface Elm_Interface_Fileselector ()
}
@property expandable {
set {
-/*@ Enable/disable a tree view in the given file selector widget,
if it's in */
+[[Enable/disable a tree view in the given file selector widget,
if it's in]]
}
get {
-/*@ Get whether tree view is enabled for the given file selector */
+[[Get whether tree view is enabled for the given file selector]]
}
values {
expand: bool;
@@ -108,10 +108,10 @@ interface Elm_Interface_Fileselector ()
}
@property path {
set {
-/*@ Set, programmatically, the directory that a given file
selector widget will display contents from */
+[[Set, programmatically, the directory that a given file selector
widget will display contents from]]
}
get {
-/*@ Get the parent directory's path that a given file select
[EGIT] [core/elementary] master 01/01: Naviframe: migrate docs.
tasn pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=c32c71ad0035afa9c41e2d527c3573def75d8b6f
commit c32c71ad0035afa9c41e2d527c3573def75d8b6f
Author: Tom Hacohen
Date: Fri Aug 7 13:30:05 2015 +0100
Naviframe: migrate docs.
---
src/lib/elm_naviframe.eo | 234 ---
1 file changed, 57 insertions(+), 177 deletions(-)
diff --git a/src/lib/elm_naviframe.eo b/src/lib/elm_naviframe.eo
index 2bc3767..b4ad965 100644
--- a/src/lib/elm_naviframe.eo
+++ b/src/lib/elm_naviframe.eo
@@ -3,251 +3,131 @@ class Elm.Naviframe (Elm.Layout,
Elm_Interface_Atspi_Widget_Action)
eo_prefix: elm_obj_naviframe;
methods {
@property event_enabled {
- set {
-/*@
-@brief Set the event enabled when pushing/popping items
-
-If $enabled is $true, the contents of the naviframe item will
-receives events from mouse and keyboard during view changing such
as
-item push/pop.
-
-@warning Events will be blocked by calling
evas_object_freeze_events_set()
-internally. So don't call the API whiling pushing/popping items.
+ [[Control the event enabled when pushing/popping items
-@see elm_naviframe_event_enabled_get()
-@see evas_object_freeze_events_set()
+ If $enabled is $true, the contents of the naviframe item will
+ receives events from mouse and keyboard during view changing such as
+ item push/pop.
-@ingroup Naviframe */
+ Warning: Events will be blocked by calling
evas_object_freeze_events_set()
+ internally. So don't call the API whiling pushing/popping items.]]
+ set {
}
get {
-/*@
-@brief Get the value of event enabled status.
-
-@return $true, when event is enabled
-
-@see elm_naviframe_event_enabled_set()
-
-@ingroup Naviframe */
}
values {
-enabled: bool; /*@ Events are received when enabled is $true, and
-ignored otherwise. */
+enabled: bool; [[Events are received when enabled is $true, and
ignored otherwise.]]
}
}
@property content_preserve_on_pop {
+ [[Preserve the content objects when items are popped.]]
set {
-/*@
-@brief preserve the content objects when items are popped.
-
-@see also elm_naviframe_content_preserve_on_pop_get()
-
-@ingroup Naviframe */
}
get {
-/*@
-@brief Get a value whether preserve mode is enabled or not.
-
-@return If $true, preserve mode is enabled
-
-@see also elm_naviframe_content_preserve_on_pop_set()
-
-@ingroup Naviframe */
}
values {
-preserve: bool; /*@ Enable the preserve mode if $true, disable
otherwise */
+preserve: bool; [[Enable the preserve mode if $true, disable
otherwise]]
}
}
@property prev_btn_auto_pushed {
+ [[Control if creating prev button automatically or not]]
set {
-/*@
-@brief Set creating prev button automatically or not
-
-@see also elm_naviframe_item_push()
-
-@ingroup Naviframe */
}
get {
-/*@
-@brief Get a value whether prev button(back button) will be auto
pushed or
-not.
-
-@return If $true, prev button will be auto pushed.
-
-@see also elm_naviframe_item_push()
-elm_naviframe_prev_btn_auto_pushed_set()
-
-@ingroup Naviframe */
}
values {
-auto_pushed: bool; /*@ If $true, the previous button(back button)
will
-be created internally when you pass the $NULL to the prev_btn
-parameter in elm_naviframe_item_push */
+auto_pushed: bool; [[If $true, the previous button(back button)
will be created internally when you pass the $NULL to the prev_btn parameter in
elm_naviframe_item_push]]
}
}
@property items {
get {
-/*@
-@brief Get a list of all the naviframe items.
+[[Get a list of all the naviframe items.]]
-@return A list of naviframe items, #Elm.Widget_Item,
-or $NULL on failure.
-@note The returned list MUST be freed.
-
-@ingroup Naviframe */
-return: free(own(list *), eina_list_free)
@warn_unused;
+return: free(own(list *), eina_list_free)
@warn_unused; [[A list of naviframe items, @Elm.Widget_Item, or $NULL on
failure. Note: The returned list MUST be freed.]]
}
}
@property top_item {
get {
-/*@
-@brief Get a top item on the naviframe stack
-
-@return Th
[EGIT] [core/elementary] master 01/01: flip: convert docs
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=3548e0b4d5fed67eb1aeba77fede444e3fc77ae8
commit 3548e0b4d5fed67eb1aeba77fede444e3fc77ae8
Author: Daniel Kolesa
Date: Fri Aug 7 13:30:06 2015 +0100
flip: convert docs
---
src/lib/elm_flip.eo | 339 ++--
1 file changed, 146 insertions(+), 193 deletions(-)
diff --git a/src/lib/elm_flip.eo b/src/lib/elm_flip.eo
index d41b367..77819bd 100644
--- a/src/lib/elm_flip.eo
+++ b/src/lib/elm_flip.eo
@@ -39,237 +39,190 @@ class Elm.Flip (Elm.Container)
methods {
@property interaction {
set {
-/*@
-@brief Set the interactive flip mode
-
-This sets if the flip should be interactive (allow user to click
and
-drag a side of the flip to reveal the back page and cause it to
flip).
-By default a flip is not interactive. You may also need to set
which
-sides of the flip are "active" for flipping and how much space
they use
-(a minimum of a finger size) with
elm_flip_interaction_direction_enabled_set()
-and elm_flip_interaction_direction_hitsize_set()
-
-The four available mode of interaction are:
-@li #ELM_FLIP_INTERACTION_NONE - No interaction is allowed
-@li #ELM_FLIP_INTERACTION_ROTATE - Interaction will cause rotate
animation
-@li #ELM_FLIP_INTERACTION_CUBE - Interaction will cause cube
animation
-@li #ELM_FLIP_INTERACTION_PAGE - Interaction will cause page
animation
-
-@note #ELM_FLIP_INTERACTION_ROTATE won't cause
-#ELM_FLIP_ROTATE_XZ_CENTER_AXIS or #ELM_FLIP_ROTATE_YZ_CENTER_AXIS
to
-happen, those can only be achieved with elm_flip_go();
-
-@ingroup Flip */
+[[Set the interactive flip mode.
+
+ This sets if the flip should be interactive (allow user to
+ click and drag a side of the flip to reveal the back page
+ and cause it to flip). By default a flip is not interactive.
+ You may also need to set which sides of the flip are "active"
+ for flipping and how much space they use (a minimum of a
+ finger size) with \@ref @.interaction_direction_enabled_set
+ and @.interaction_direction_hitsize_set.
+
+ The four available mode of interaction are
+ #ELM_FLIP_INTERACTION_NONE, #ELM_FLIP_INTERACTION_ROTATE,
+ #ELM_FLIP_INTERACTION_CUBE and #ELM_FLIP_INTERACTION_PAGE.
+
+ Note: #ELM_FLIP_INTERACTION_ROTATE won't cause
+ #ELM_FLIP_ROTATE_XZ_CENTER_AXIS or
#ELM_FLIP_ROTATE_YZ_CENTER_AXIS
+ to happen, those can only be achieved with @.go.
+]]
}
get {
-/*@
-@brief Get the interactive flip mode
-
-@return The interactive flip mode
-
-Returns the interactive flip mode set by elm_flip_interaction_set()
-
-@ingroup Flip */
+[[Get the interactive flip mode.]]
}
values {
-mode: Elm.Flip.Interaction; /*@ The interactive flip mode to use */
+mode: Elm.Flip.Interaction; [[The interactive flip mode to use.]]
}
}
@property front_visible {
get {
-/*@
-@brief Get flip front visibility state
-
-@return true if front front is showing, false if the back is
-showing.
-
-@ingroup Flip */
-return: bool;
+[[Get flip front visibility state.]]
+return: bool; [[$true if front front is showing, $false if
+the back is showing.]]
}
}
interaction_direction_hitsize_set {
- /*@
- @brief Set the amount of the flip that is sensitive to interactive
flip
+ [[Set the amount of the flip that is sensitive to interactive flip.
- Set the amount of the flip that is sensitive to interactive flip,
with 0
- representing no area in the flip and 1 representing the entire flip.
There
- is however a consideration to be made in that the area will never be
- smaller than the finger size set (as set in your Elementary
configuration),
- and dragging must always start from the opposite half of the flip
(eg. right
- half of the flip when dragging to the left).
+ Set the amount of the flip that is sensitive to interactive flip,
+ with 0 representing no area in the flip and 1 representing the
+ entire flip. There is however a consideration to be made in that
+ the area will never be smaller than the finger size set (as set
+ in your Elementary configuration), and dragging must always start
+ from the opposite half of the flip (eg. right half of the flip
+
[EGIT] [core/efl] master 01/02: eina: add Eina_Bezier infrastructure for manipulating cubic bezier curves.
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=ddb8515930c2da8364d7be6f363faafcaa7ea334
commit ddb8515930c2da8364d7be6f363faafcaa7ea334
Author: Subhransu Mohanty
Date: Wed Apr 8 14:13:15 2015 +0900
eina: add Eina_Bezier infrastructure for manipulating cubic bezier curves.
---
src/Makefile_Eina.am | 6 +-
src/lib/eina/Eina.h| 1 +
src/lib/eina/eina_bezier.c | 275 +
src/lib/eina/eina_bezier.h | 146
4 files changed, 426 insertions(+), 2 deletions(-)
diff --git a/src/Makefile_Eina.am b/src/Makefile_Eina.am
index aab92e2..0f1542d 100644
--- a/src/Makefile_Eina.am
+++ b/src/Makefile_Eina.am
@@ -92,7 +92,8 @@ lib/eina/eina_crc.h \
lib/eina/eina_inline_crc.x \
lib/eina/eina_evlog.h \
lib/eina/eina_util.h \
-lib/eina/eina_quaternion.h
+lib/eina/eina_quaternion.h \
+lib/eina/eina_bezier.h
lib_eina_libeina_la_SOURCES = \
lib/eina/eina_abi.c \
@@ -161,7 +162,8 @@ lib/eina/eina_debug.h \
lib/eina/eina_private.h \
lib/eina/eina_share_common.h \
lib/eina/eina_strbuf_common.h \
-lib/eina/eina_quaternion.c
+lib/eina/eina_quaternion.c \
+lib/eina/eina_bezier.c
if HAVE_WIN32
lib_eina_libeina_la_SOURCES += lib/eina/eina_file_win32.c
diff --git a/src/lib/eina/Eina.h b/src/lib/eina/Eina.h
index 9e1918c..97cdd3d 100644
--- a/src/lib/eina/Eina.h
+++ b/src/lib/eina/Eina.h
@@ -267,6 +267,7 @@ extern "C" {
#include
#include
#include
+#include
#undef EAPI
#define EAPI
diff --git a/src/lib/eina/eina_bezier.c b/src/lib/eina/eina_bezier.c
new file mode 100644
index 000..4e8ffca
--- /dev/null
+++ b/src/lib/eina/eina_bezier.c
@@ -0,0 +1,275 @@
+/* EINA - EFL data type library
+ * Copyright (C) 2015 Subhransu Mohanty
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library;
+ * if not, see
[EGIT] [core/efl] master 02/02: eina: add test for Eina_Bezier.
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=6afb497d915e85cb943ff8ffe086acad572025e9
commit 6afb497d915e85cb943ff8ffe086acad572025e9
Author: Subhransu Mohanty
Date: Sun Jul 12 15:39:09 2015 +0900
eina: add test for Eina_Bezier.
---
src/Makefile_Eina.am | 3 +-
src/tests/eina/eina_suite.c | 1 +
src/tests/eina/eina_suite.h | 1 +
src/tests/eina/eina_test_bezier.c | 187 ++
4 files changed, 191 insertions(+), 1 deletion(-)
diff --git a/src/Makefile_Eina.am b/src/Makefile_Eina.am
index 0f1542d..7537e8a 100644
--- a/src/Makefile_Eina.am
+++ b/src/Makefile_Eina.am
@@ -317,7 +317,8 @@ tests/eina/eina_test_xattr.c \
tests/eina/eina_test_crc.c \
tests/eina/eina_test_quad.c \
tests/eina/eina_test_matrix.c \
-tests/eina/eina_test_quaternion.c
+tests/eina/eina_test_quaternion.c \
+tests/eina/eina_test_bezier.c
tests_eina_eina_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-DTESTS_WD=\"`pwd`\" \
diff --git a/src/tests/eina/eina_suite.c b/src/tests/eina/eina_suite.c
index 5caa536..42b9006 100644
--- a/src/tests/eina/eina_suite.c
+++ b/src/tests/eina/eina_suite.c
@@ -83,6 +83,7 @@ static const Eina_Test_Case etc[] = {
{ "Quad", eina_test_quad },
{ "Matrix", eina_test_matrix },
{ "Quaternion", eina_test_quaternion },
+ { "Bezier", eina_test_bezier },
{ NULL, NULL }
};
diff --git a/src/tests/eina/eina_suite.h b/src/tests/eina/eina_suite.h
index 845ec9d..b7f2726 100644
--- a/src/tests/eina/eina_suite.h
+++ b/src/tests/eina/eina_suite.h
@@ -68,5 +68,6 @@ void eina_test_crc(TCase *tc);
void eina_test_quad(TCase *tc);
void eina_test_matrix(TCase *tc);
void eina_test_quaternion(TCase *tc);
+void eina_test_bezier(TCase *tc);
#endif /* EINA_SUITE_H_ */
diff --git a/src/tests/eina/eina_test_bezier.c
b/src/tests/eina/eina_test_bezier.c
new file mode 100644
index 000..a7ad8f2
--- /dev/null
+++ b/src/tests/eina/eina_test_bezier.c
@@ -0,0 +1,187 @@
+/* EINA - EFL data type library
+ * Copyright (C) 2015 Subhransu Mohanty
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library;
+ * if not, see
[EGIT] [core/elementary] master 01/01: slideshow: convert docs
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=5ef1c3bfc93b613e7a3a4f3ad0a2031755a6d073
commit 5ef1c3bfc93b613e7a3a4f3ad0a2031755a6d073
Author: Daniel Kolesa
Date: Fri Aug 7 13:50:21 2015 +0100
slideshow: convert docs
---
src/lib/elm_slideshow.eo | 510 ++-
1 file changed, 197 insertions(+), 313 deletions(-)
diff --git a/src/lib/elm_slideshow.eo b/src/lib/elm_slideshow.eo
index d113b1c..8e0f914 100644
--- a/src/lib/elm_slideshow.eo
+++ b/src/lib/elm_slideshow.eo
@@ -4,412 +4,296 @@ class Elm.Slideshow (Elm.Layout,
Elm_Interface_Atspi_Widget_Action)
methods {
@property cache_after {
set {
-/*@
-Set the number of items to cache, on a given slideshow widget,
-after the current item
+[[Set the number of items to cache, on a given slideshow widget,
+ after the current item.
-The default value for this property is $2. See
-@ref Slideshow_Caching "slideshow caching" for more details.
-
-@see elm_slideshow_cache_after_get()
-
-@ingroup Slideshow */
+ The default value for this property is 2. See
+ \@ref Slideshow_Caching "slideshow caching" for more details.
+]]
}
get {
-/*@
-Get the number of items to cache, on a given slideshow widget,
-after the current item
-
-@return The number of items set to be cached after the current one
-
-@see elm_slideshow_cache_after_set() for more details
-
-@ingroup Slideshow */
+[[Get the number of items to cache, on a given slideshow widget,
+ after the current item.
+]]
}
values {
-count: int; /*@ Number of items to cache after the current one */
+count: int; [[Number of items to cache after the current one.]]
}
}
@property cache_before {
set {
-/*@
-Set the number of items to cache, on a given slideshow widget,
-before the current item
+[[Set the number of items to cache, on a given slideshow widget,
+ before the current item.
-The default value for this property is $2. See
-@ref Slideshow_Caching "slideshow caching" for more details.
-
-@see elm_slideshow_cache_before_get()
-
-@ingroup Slideshow */
+ The default value for this property is 2. See
+ \@ref Slideshow_Caching "slideshow caching" for more details.
+]]
}
get {
-/*@
-Get the number of items to cache, on a given slideshow widget,
-before the current item
-
-@return The number of items set to be cached before the current one
-
-@see elm_slideshow_cache_before_set() for more details
-
-@ingroup Slideshow */
+[[Get the number of items to cache, on a given slideshow widget,
+ before the current item.
+]]
}
values {
-count: int; /*@ Number of items to cache before the current one */
+count: int; [[Number of items to cache before the current one.]]
}
}
@property layout {
set {
-/*@
-Set the current slide layout in use for a given slideshow widget
-
-If $layout is implemented in $obj's theme (i.e., is contained
-in the list returned by elm_slideshow_layouts_get()), this new
-images layout will be used on the widget.
+[[Set the current slide layout in use for a given slideshow widget
-@see elm_slideshow_layouts_get() for more details
+ If $layout is implemented in $obj's theme (i.e., is contained
+ in the list returned by elm_slideshow_layouts_get()), this new
+ images layout will be used on the widget.
-@ingroup Slideshow */
+ See @.layouts.get for more details.
+]]
}
get {
-/*@
-Get the current slide layout in use for a given slideshow widget
-
-@return The current layout's name
-
-@see elm_slideshow_layout_set() for more details
-
-@ingroup Slideshow */
+[[Get the current slide layout in use for a given slideshow
widget.]]
}
values {
-layout: const(char)*; /*@ The new layout's name string */
+layout: const(char)*; [[The new layout's name string.]]
}
}
@property transition {
set {
-/*@
-Set the current slide transition/effect in use for a given
-slideshow widget
+[[Set the current slide transition/effect in use for a given
+
[EGIT] [core/efl] master 01/01: eina: forgot to fix @since for Eina_Bezier.
cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=7ac5b36bc5c88f6fd2049996d932f9c27c51e8e1 commit 7ac5b36bc5c88f6fd2049996d932f9c27c51e8e1 Author: Cedric BAIL Date: Fri Aug 7 14:41:56 2015 +0200 eina: forgot to fix @since for Eina_Bezier. --- src/lib/eina/eina_bezier.h | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/lib/eina/eina_bezier.h b/src/lib/eina/eina_bezier.h index e15acc2..aef32e4 100644 --- a/src/lib/eina/eina_bezier.h +++ b/src/lib/eina/eina_bezier.h @@ -62,7 +62,7 @@ struct _Eina_Bezier * @param end_y y coordinate of end point. * * @p b. No check is done on @p b. - * + * @since 1.16 */ EAPI void eina_bezier_values_set(Eina_Bezier *b, double start_x, double start_y, double ctrl_start_x, double ctrl_start_y, double ctrl_end_x, double ctrl_end_y, double end_x, double end_y) EINA_ARG_NONNULL(1); @@ -81,7 +81,7 @@ EAPI void eina_bezier_values_set(Eina_Bezier *b, double start_x, double start_y, * @param end_y y coordinate of end point. * * @p b. No check is done on @p b. - * + * @since 1.16 */ EAPI void eina_bezier_values_get(const Eina_Bezier *b, double *start_x, double *start_y, double *ctrl_start_x, double *ctrl_start_y, double *ctrl_end_x, double *ctrl_end_y, double *end_x, double *end_y) EINA_ARG_NONNULL(1); @@ -92,7 +92,7 @@ EAPI void eina_bezier_values_get(const Eina_Bezier *b, double *start_x, double * * @param b The floating point bezier. * * @p b. No check is done on @p b. - * + * @since 1.16 */ EAPI double eina_bezier_length_get(const Eina_Bezier *b) EINA_ARG_NONNULL(1); @@ -104,7 +104,7 @@ EAPI double eina_bezier_length_get(const Eina_Bezier *b) EINA_ARG_NONNULL(1); * @param len The given length. * * @p b. No check is done on @p b. - * + * @since 1.16 */ EAPI double eina_bezier_t_at(const Eina_Bezier *b, double len) EINA_ARG_NONNULL(1); @@ -116,7 +116,7 @@ EAPI double eina_bezier_t_at(const Eina_Bezier *b, double len) EINA_ARG_NONNULL( * @param t The floating point position. * * @p b. No check is done on @p b. - * + * @since 1.16 */ EAPI void eina_bezier_point_at(const Eina_Bezier *b, double t, double *px, double *py) EINA_ARG_NONNULL(1); @@ -128,7 +128,7 @@ EAPI void eina_bezier_point_at(const Eina_Bezier *b, double t, double *px, doubl * @param len The given length. * * @p b. No check is done on @p b. - * + * @since 1.16 */ EAPI double eina_bezier_angle_at(const Eina_Bezier *b, double t) EINA_ARG_NONNULL(1); @@ -139,7 +139,7 @@ EAPI double eina_bezier_angle_at(const Eina_Bezier *b, double t) EINA_ARG_NONNUL * @param len The given length. * * @p b. No check is done on @p b. - * + * @since 1.16 */ EAPI void eina_bezier_split_at_length(const Eina_Bezier *b, double len, Eina_Bezier *left, Eina_Bezier *right) EINA_ARG_NONNULL(1); --
[EGIT] [core/elementary] master 01/01: table: convert docs
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=2e1f8a58d4f58ebf6e43e3ad376e8c2c6a7e8d37
commit 2e1f8a58d4f58ebf6e43e3ad376e8c2c6a7e8d37
Author: Daniel Kolesa
Date: Fri Aug 7 14:08:01 2015 +0100
table: convert docs
---
src/lib/elm_table.eo | 167 +++
1 file changed, 61 insertions(+), 106 deletions(-)
diff --git a/src/lib/elm_table.eo b/src/lib/elm_table.eo
index ce803f3..2793f35 100644
--- a/src/lib/elm_table.eo
+++ b/src/lib/elm_table.eo
@@ -4,159 +4,114 @@ class Elm.Table (Elm.Widget)
data: null;
methods {
@property homogeneous {
- set {
-/*@
-@brief Set the homogeneous layout in the table
-
-@ingroup Table */
- }
- get {
-/*@
-@brief Get the current table homogeneous mode.
-
-@return A boolean to indicating if the layout is homogeneous in
the table
-(true = homogeneous, false = no homogeneous)
-
-@ingroup Table */
- }
+ [[Control the homogenous state in a table.]]
+ set {}
+ get {}
values {
-homogeneous: bool; /*@ A boolean to set if the layout is
homogeneous in the
-table (true = homogeneous, false = no homogeneous) */
+homogeneous: bool; [[A boolean to set if the layout is
+ homogeneous in the table.]]
}
}
@property padding {
set {
-/*@
-@brief Set padding between cells.
-
-Default value is 0.
-
-@ingroup Table */
+[[Set padding between cells. Default value is 0.]]
}
get {
-/*@
-@brief Get padding between cells.
-
-@ingroup Table */
+[[Get padding between cells.]]
}
values {
-horizontal: Evas.Coord; /*@ set the horizontal padding. */
-vertical: Evas.Coord; /*@ set the vertical padding. */
+horizontal: Evas.Coord; [[The horizontal padding.]]
+vertical: Evas.Coord; [[The vertical padding.]]
}
}
@property align {
set {
-/*@
-@brief Set alignment of table
-@since 1.13
+[[Set alignment of table. Default value is 0.5.
-Default value is 0.5.
-
-@ingroup Table */
+ @since 1.13
+]]
}
get {
-/*@
-@brief Get alignment of table.
-@since 1.13
+[[Get alignment of table.
-@ingroup Table */
+ @since 1.13
+]]
}
values {
-horizontal: double; /*@ the horizontal alignment. */
-vertical: double; /*@ the vertical alignment. */
+horizontal: double; [[The horizontal alignment.]]
+vertical: double; [[The vertical alignment.]]
}
}
clear {
- /*@
- @brief Faster way to remove all child objects from a table object.
-
- @ingroup Table */
-
+ [[Faster way to remove all child objects from a table object.]]
params {
-@in clear: bool; /*@ If true, will delete children, else just
remove from table. */
+@in clear: bool; [[If true, will delete children, else just remove
from table.]]
}
}
child_get @const {
- /*@
- @brief Get child object of table at given coordinates.
-
- @return Child of object if find if not return NULL. */
- return: Evas.Object *;
+ [[Get child object of table at given coordinates.]]
+ return: Evas.Object *; [[Child of object if find if not return
$null.]]
params {
-@in col: int; /*@ Column number of child object */
-@in row: int; /*@ Row number of child object */
+@in col: int; [[Column number of child object.]]
+@in row: int; [[Row number of child object.]]
}
}
pack_set {
- /*@
- @brief Set the packing location of an existing child of the table
-
- Modifies the position of an object already in the table.
-
- @note All positioning inside the table is relative to rows and
columns, so
- a value of 0 for col and row, means the top left cell of the table,
and a
- value of 1 for colspan and rowspan means $subobj only takes that 1
cell.
+ [[Set the packing location of an existing child of the table
- @ingroup Table */
+ Modifies the position of an object already in the table.
+ Note: All positioning inside the table is relative to rows and
+ columns, so a value of 0 for col and row, means the top left
+ cell of the table, and a value of 1 for colspan and rowspan
+ means only takes tha
[EGIT] [core/elementary] master 01/01: Label: migrate docs.
tasn pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=eb4ffb69e4d7cf55d5aa0629e1f907fa0a1b8d05
commit eb4ffb69e4d7cf55d5aa0629e1f907fa0a1b8d05
Author: Tom Hacohen
Date: Fri Aug 7 14:10:49 2015 +0100
Label: migrate docs.
---
src/lib/elm_label.eo | 175 +++
1 file changed, 49 insertions(+), 126 deletions(-)
diff --git a/src/lib/elm_label.eo b/src/lib/elm_label.eo
index 4ea399c..9f18be1 100644
--- a/src/lib/elm_label.eo
+++ b/src/lib/elm_label.eo
@@ -13,186 +13,109 @@ class Elm.Label (Elm.Layout)
eo_prefix: elm_obj_label;
methods {
@property wrap_width {
- set {
-/*@
-@brief Set wrap width of the label
-
-This function sets the maximum width size hint of the label.
+ [[Control wrap width of the label
-@warning This is only relevant if the label is inside a container.
+ This function sets the maximum width size hint of the label.
-@ingroup Label */
+ Warning: This is only relevant if the label is inside a container.]]
+ set {
}
get {
-/*@
-@brief Get wrap width of the label
-
-@return The wrap width in pixels at a minimum where words need to
wrap
-
-@see elm_label_wrap_width_set()
-
-@ingroup Label */
}
values {
-w: Evas.Coord; /*@ The wrap width in pixels at a minimum where
words need to wrap */
+w: Evas.Coord; [[The wrap width in pixels at a minimum where words
need to wrap]]
}
}
@property slide_speed {
- set {
-/*@
-@brief Set the slide speed of the label
+ [[Control the slide speed of the label
-@see elm_label_slide_duration_set()
+ Note: If you set the duration of the slide using
@.slide_duration.set
+ you cannot get the correct speed using this function until the label
+ is actually rendered and resized.
-@ingroup Label */
+ See @.slide_duration.set]]
+ set {
}
get {
-/*@
-@brief Get the slide speed of the label
-
-@return The slide animation speed in px per seconds
-
-@note If you set the duration of the slide using
elm_label_slide_duration_set()
-you cannot get the correct speed using this function until the
label
-is actually rendered and resized.
-
-@see elm_label_slide_speed_set()
-
-@ingroup Label */
}
values {
-speed: double; /*@ The speed of the slide animation in px per
seconds */
+speed: double; [[The speed of the slide animation in px per
seconds]]
}
}
@property slide_mode {
- set {
-/*@
-@brief Set the slide mode of the label widget.
+ [[Control the slide mode of the label widget.
-elm_label_slide_mode_set() changes label slide mode.
-By default, slide mode is none. Possible values for $mode are:
-@li #ELM_LABEL_SLIDE_MODE_NONE - no slide effect
-@li #ELM_LABEL_SLIDE_MODE_AUTO - slide only if the label area is
bigger than
-the text width length
-@li #ELM_LABEL_SLIDE_MODE_ALWAYS -slide always
+ By default, slide mode is none. Possible values for $mode are:
+ @Elm.Label.Slide_Mode.none - no slide effect
+ @Elm.Label.Slide_Mode.auto - slide only if the label area is bigger
than
+ the text width length
+ @Elm.Label.Slide_Mode.always - slide always
-@warning #ELM_LABEL_SLIDE_MODE_AUTO, #ELM_LABEL_SLIDE_MODE_ALWAYS
only work
-with the themes "slide_short", "slide_long" and "slide_bounce".
-@warning #ELM_LABEL_SLIDE_MODE_AUTO, #ELM_LABEL_SLIDE_MODE_ALWAYS
don't work
-if the line wrap(elm_label_line_wrap_set()) or
-ellipsis(elm_label_ellipsis_set()) is set.
+ Warning: @Elm.Label.Slide_Mode.auto, @Elm.Label.Slide_Mode.always
only work
+ with the themes "slide_short", "slide_long" and "slide_bounce".
+ Warning: @Elm.Label.Slide_Mode.auto, @Elm.Label.Slide_Mode.always
don't work
+ if the line wrap(elm_label_line_wrap_set()) or
+ ellipsis(elm_label_ellipsis_set()) is set.
-@see elm_label_slide_mode_get().
-@since 1.8
-
-@ingroup Label */
+ @since 1.8]]
+ set {
}
get {
-/*@
-@brief Get the slide mode of the label widget.
-
-@return The slide mode
-
-@see elm_label_slide_mode_set()
-@since 1.8
-
-@ingroup Label */
}
values {
-mode: Elm.Label.Slide_Mode; /*@ The slide mode */
+
[EGIT] [core/elementary] master 01/01: Widget: migrate docs.
tasn pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=6dfee8b0772abab4e522907ec0d90fa859b8daa3
commit 6dfee8b0772abab4e522907ec0d90fa859b8daa3
Author: Tom Hacohen
Date: Fri Aug 7 14:16:55 2015 +0100
Widget: migrate docs.
---
src/lib/elm_widget.eo | 165 +-
1 file changed, 29 insertions(+), 136 deletions(-)
diff --git a/src/lib/elm_widget.eo b/src/lib/elm_widget.eo
index df4bffd..5d4a190 100644
--- a/src/lib/elm_widget.eo
+++ b/src/lib/elm_widget.eo
@@ -5,10 +5,8 @@ abstract Elm.Widget (Evas.Object_Smart,
Elm_Interface_Atspi_Accessible, Elm_Inte
methods {
@property focus {
set {
-/*@ No description supplied by the EAPI. */
}
get {
-/*@ No description supplied by the EAPI. */
}
values {
focus: bool;
@@ -16,22 +14,19 @@ abstract Elm.Widget (Evas.Object_Smart,
Elm_Interface_Atspi_Accessible, Elm_Inte
}
@property drag_lock_y {
set {
-/*@ No description supplied by the EAPI. */
}
get {
-/*@ No description supplied by the EAPI. */
}
values {
lock: bool;
}
}
@property focus_highlight_style {
+ [[Control the widget focus highlight style.]]
set {
-/*@ This function set the widget focus highlight style. */
return: bool;
}
get {
-/*@ This function returns the widget focus highlight style. */
}
values {
style: const(char)*;
@@ -39,21 +34,18 @@ abstract Elm.Widget (Evas.Object_Smart,
Elm_Interface_Atspi_Accessible, Elm_Inte
}
@property tree_unfocusable {
set {
-/*@ No description supplied by the EAPI. */
}
get {
-/*@ No description supplied by the EAPI. */
}
values {
tree_unfocusable: bool;
}
}
@property mirrored {
+ [[Control the widget's mirrored mode.]]
set {
-/*@ Sets the widget's mirrored mode. */
}
get {
-/*@ Returns the widget's mirrored mode. */
}
values {
mirrored: bool;
@@ -61,10 +53,8 @@ abstract Elm.Widget (Evas.Object_Smart,
Elm_Interface_Atspi_Accessible, Elm_Inte
}
@property theme {
set {
-/*@ No description supplied by the EAPI. */
}
get {
-/*@ No description supplied by the EAPI. */
}
values {
th: Elm_Theme * @nullable;
@@ -72,10 +62,8 @@ abstract Elm.Widget (Evas.Object_Smart,
Elm_Interface_Atspi_Accessible, Elm_Inte
}
@property disabled {
set {
-/*@ No description supplied by the EAPI. */
}
get {
-/*@ No description supplied by the EAPI. */
}
values {
disabled: bool;
@@ -83,21 +71,18 @@ abstract Elm.Widget (Evas.Object_Smart,
Elm_Interface_Atspi_Accessible, Elm_Inte
}
@property highlight_ignore {
set {
-/*@ No description supplied by the EAPI. */
}
get {
-/*@ No description supplied by the EAPI. */
}
values {
ignore: bool;
}
}
@property mirrored_automatic {
+ [[Control the widget's mirrored mode setting.]]
set {
-/*@ Sets the widget's mirrored mode setting. */
}
get {
-/*@ Returns the widget's mirrored mode setting. */
}
values {
automatic: bool;
@@ -105,10 +90,8 @@ abstract Elm.Widget (Evas.Object_Smart,
Elm_Interface_Atspi_Accessible, Elm_Inte
}
@property orientation_mode_disabled {
set {
-/*@ No description supplied by the EAPI. */
}
get {
-/*@ No description supplied by the EAPI. */
}
values {
disabled: bool;
@@ -116,11 +99,9 @@ abstract Elm.Widget (Evas.Object_Smart,
Elm_Interface_Atspi_Accessible, Elm_Inte
}
@property style {
set {
-/*@ No description supplied by the EAPI. */
return: bool;
}
get {
-/*@ No description supplied by the EAPI. */
}
values {
style: const(char)*;
@@ -128,10 +109,8 @@ abstract Elm.Widget (Evas.Object_Smart,
Elm_Interface_Atspi_Accessible, Elm_Inte
}
@property scale {
set {
-/*@ No description supplied by the EAPI. */
}
get {
-/*@ No description supplied by the EAPI. */
}
values {
scale: double;
@@ -139,13 +118,11 @@ abstract Elm.Widget (Evas.Object_Smart,
Elm_Interface_Atspi_Accessible, Elm_In
[EGIT] [core/elementary] master 01/01: popup: convert docs
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=c026c7aafe7ed2a8cb538cdd4a65b385be670ea1
commit c026c7aafe7ed2a8cb538cdd4a65b385be670ea1
Author: Daniel Kolesa
Date: Fri Aug 7 14:24:37 2015 +0100
popup: convert docs
---
src/lib/elm_popup.eo | 155 +++
1 file changed, 56 insertions(+), 99 deletions(-)
diff --git a/src/lib/elm_popup.eo b/src/lib/elm_popup.eo
index df866e1..9ce41e5 100644
--- a/src/lib/elm_popup.eo
+++ b/src/lib/elm_popup.eo
@@ -29,153 +29,110 @@ class Elm.Popup (Elm.Layout,
Elm_Interface_Atspi_Widget_Action)
methods {
@property align {
set {
-/*@
-@brief Set the alignment of the popup object
-Sets the alignment in which the popup will appear in its parent.
+[[Set the alignment of the popup object.
-@see elm_popup_align_get()
+ Sets the alignment in which the popup will appear in its parent.
-@since 1.9
-@ingroup Popup */
+ @since 1.9
+]]
}
get {
-/*@
-@brief Get the alignment of the popup object
-@see elm_popup_align_set()
+[[Get the alignment of the popup object.
-@since 1.9
-@ingroup Popup */
+ @since 1.9
+]]
}
values {
-horizontal: double; /*@ The horizontal alignment of the popup */
-vertical: double; /*@ The vertical alignment of the popup */
+horizontal: double; [[The horizontal alignment of the popup.]]
+vertical: double; [[The vertical alignment of the popup.]]
}
}
@property allow_events {
set {
-/*@
-@brief Sets whether events should be passed to by a click outside.
+[[Sets whether events should be passed to by a click outside.
-Enabling allow event will remove the Blocked event area and events
will
-pass to the lower layer objects otherwise they are blocked.
+ Enabling allow event will remove the Blocked event area and
+ events will pass to the lower layer objects otherwise they
+ are blocked.
-@ingroup Popup
-@see elm_popup_allow_events_get()
-@note The default value is false. */
+ Note: The default value is $false.
+]]
}
get {
-/*@
-@brief Returns value indicating whether allow event is enabled or
not
-
-@return $false if Blocked event area is present else $true
-
-@ingroup Popup
-@see elm_popup_allow_events_set()
-@note By default the Blocked event area is present */
+[[Returns value indicating whether allow event is enabled or not.]]
}
values {
-allow: bool; /*@ $true Events are passed to lower objects, else
not */
+allow: bool; [[If $true, events are passed to lower objects.]]
}
}
@property content_text_wrap_type {
- set {
-/*@
-@brief Sets the wrapping type of content text packed in content
+ [[Control the wrapping type of content text packed in content
area of popup object.
-
-@ingroup Popup
-@see elm_popup_content_text_wrap_type_get() */
- }
- get {
-/*@
-@brief Returns the wrapping type of content text packed in content
area of
-popup object.
-
-@return wrap type of the content text
-
-@ingroup Popup
-@see elm_popup_content_text_wrap_type_set */
- }
+ ]]
+ set {}
+ get {}
values {
-wrap: Elm.Wrap.Type; /*@ wrapping type of type Elm_Wrap_Type */
+wrap: Elm.Wrap.Type; [[Wrapping type of type Elm_Wrap_Type.]]
}
}
@property orient {
set {
-/*@
-@brief Sets the orientation of the popup in the parent region
-
-Sets the position in which popup will appear in its parent. By
default,
-#ELM_POPUP_ORIENT_CENTER is set.
+[[Sets the orientation of the popup in the parent region.
-@ingroup Popup
-@see @ref Elm_Popup_Orient for possible values. */
+ Sets the position in which popup will appear in its parent.
+ By default, #ELM_POPUP_ORIENT_CENTER is set.
+]]
}
get {
-/*@
-@brief Returns the orientation of Popup
-
-@return the orientation of the popup
-
-@ingroup Popup
-@see elm_popup_orient_set()
-@see Elm_Popup_Orient */
+[[Returns the orientation of the popup.]]
}
values {
-
[EGIT] [core/elementary] master 06/06: Interface atspi image: migrate docs.
tasn pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=a7162e8a873e730d76ac2badd200aea2ffb25db7
commit a7162e8a873e730d76ac2badd200aea2ffb25db7
Author: Tom Hacohen
Date: Fri Aug 7 14:30:44 2015 +0100
Interface atspi image: migrate docs.
---
src/lib/elm_interface_atspi_image.eo | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/lib/elm_interface_atspi_image.eo
b/src/lib/elm_interface_atspi_image.eo
index d1ac06e..3345e24 100644
--- a/src/lib/elm_interface_atspi_image.eo
+++ b/src/lib/elm_interface_atspi_image.eo
@@ -6,7 +6,7 @@ mixin Elm_Interface_Atspi_Image ()
methods {
@property extents @protected {
get {
-/*@ Gets an image extents. */
+[[Gets an image extents.]]
}
keys {
screen_coords: bool;
@@ -20,7 +20,7 @@ mixin Elm_Interface_Atspi_Image ()
}
@property description @protected {
get {
-/*@ Gets textual description of image */
+[[Gets textual description of image]]
}
set {
}
@@ -30,7 +30,7 @@ mixin Elm_Interface_Atspi_Image ()
}
@property locale @protected {
get {
-/*@ Gets locale of the image description. */
+[[Gets locale of the image description.]]
}
values {
locale: const(char)*;
--
[EGIT] [core/elementary] master 02/06: Interface atspi action: migrate docs.
tasn pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=62ddf3c6ec345cd69adbedbaba6fa1bfcc16abfd
commit 62ddf3c6ec345cd69adbedbaba6fa1bfcc16abfd
Author: Tom Hacohen
Date: Fri Aug 7 14:26:50 2015 +0100
Interface atspi action: migrate docs.
---
src/lib/elm_interface_atspi_action.eo | 19 +--
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/src/lib/elm_interface_atspi_action.eo
b/src/lib/elm_interface_atspi_action.eo
index f5e5ab8..79f25b6 100644
--- a/src/lib/elm_interface_atspi_action.eo
+++ b/src/lib/elm_interface_atspi_action.eo
@@ -6,7 +6,7 @@ mixin Elm_Interface_Atspi_Action ()
methods {
@property name @protected {
get {
-/*@ Gets action name for given id */
+[[Gets action name for given id]]
}
values {
name: const(char)*;
@@ -17,7 +17,7 @@ mixin Elm_Interface_Atspi_Action ()
}
@property localized_name @protected {
get {
-/*@ Gets localized action name for given id */
+[[Gets localized action name for given id]]
}
values {
name: const(char)*;
@@ -28,10 +28,10 @@ mixin Elm_Interface_Atspi_Action ()
}
@property description @protected {
get {
-/*@ Gets action description for given id */
+[[Gets action description for given id]]
}
set {
-/*@ Sets action description for given id */
+[[Sets action description for given id]]
return: bool;
}
values {
@@ -43,26 +43,25 @@ mixin Elm_Interface_Atspi_Action ()
}
@property actions @protected {
get {
-/*@ Get list of available widget actions */
+[[Get list of available widget actions]]
}
values {
-actions: list *; /*@ contains statically
allocated strings */
+actions: list *; [[contains statically allocated
strings]]
}
}
action_do @protected {
- /*@ Performs action on given widget. */
+ [[Performs action on given widget.]]
params {
@in id: int;
}
return: bool;
}
keybinding_get @protected {
- /*@ Gets configured keybinding for specific action and widget.
- returned pointer should be free by a user.*/
+ [[Gets configured keybinding for specific action and widget.]]
params {
@in id: int;
}
- return: own(char *) @warn_unused;
+ return: own(char *) @warn_unused; [[Should be freed by the user.]]
}
}
implements {
--
[EGIT] [core/elementary] master 03/06: Interface atspi component: migrate docs.
tasn pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=e9d4ccba347b1ef8af8716204950f21abf84b8b1
commit e9d4ccba347b1ef8af8716204950f21abf84b8b1
Author: Tom Hacohen
Date: Fri Aug 7 14:28:13 2015 +0100
Interface atspi component: migrate docs.
---
src/lib/elm_interface_atspi_component.eo | 44
1 file changed, 17 insertions(+), 27 deletions(-)
diff --git a/src/lib/elm_interface_atspi_component.eo
b/src/lib/elm_interface_atspi_component.eo
index d9bc213..089b2f9 100644
--- a/src/lib/elm_interface_atspi_component.eo
+++ b/src/lib/elm_interface_atspi_component.eo
@@ -6,11 +6,11 @@ mixin Elm_Interface_Atspi_Component ()
methods {
@property size @protected {
set {
-/*@ Sets size of accessible widget. */
+[[Sets size of accessible widget.]]
return: bool;
}
get {
-/*@ Gets size of accessible widget. */
+[[Gets size of accessible widget.]]
}
values {
w: int;
@@ -19,7 +19,7 @@ mixin Elm_Interface_Atspi_Component ()
}
@property layer @protected {
get {
-/*@ Sets evas layer of accessible widget. */
+[[Sets evas layer of accessible widget.]]
}
values {
layer: int;
@@ -27,16 +27,15 @@ mixin Elm_Interface_Atspi_Component ()
}
@property alpha @protected {
get {
-/*@ Gets alpha of accessible widget. */
+[[Gets alpha of accessible widget.]]
}
values {
-alpha: double; /*@ alpha value in [0, 1] range. */
+alpha: double; [[alpha value in [0, 1] range.]]
}
}
@property z_order @protected {
get {
-/*@ Gets the depth at which the component is shown in relation to
-other components in the same container. */
+[[Gets the depth at which the component is shown in relation to
other components in the same container.]]
}
values {
z_order: int;
@@ -44,16 +43,14 @@ mixin Elm_Interface_Atspi_Component ()
}
@property extents @protected {
get {
-/*@ Gets geometry of accessible widget. */
+[[Gets geometry of accessible widget.]]
}
set {
-/*@ Sets geometry of accessible widget. */
+[[Sets geometry of accessible widget.]]
return: bool;
}
keys {
-screen_coords: bool; /*@ If true x and y values will be relative
- to screen origin, otherwise relative to
- canvas */
+screen_coords: bool; [[If true x and y values will be relative to
screen origin, otherwise relative to canvas]]
}
values {
x: int;
@@ -64,16 +61,14 @@ mixin Elm_Interface_Atspi_Component ()
}
@property position @protected {
set {
-/*@ Sets position of accessible widget. */
+[[Sets position of accessible widget.]]
return: bool;
}
get {
-/*@ Gets position of accessible widget. */
+[[Gets position of accessible widget.]]
}
keys {
-screen_coords: bool; /*@ If true x and y values will be relative
- to screen origin, otherwise relative to
- canvas */
+screen_coords: bool; [[If true x and y values will be relative to
screen origin, otherwise relative to canvas]]
}
values {
x: int;
@@ -82,27 +77,22 @@ mixin Elm_Interface_Atspi_Component ()
}
contains @protected {
params {
-screen_coords: bool; /*@ If true x and y values will be relative
- to screen origin, otherwise relative to
- canvas */
+screen_coords: bool; [[If true x and y values will be relative to
screen origin, otherwise relative to canvas]]
@in x: int;
@in y: int;
}
return: bool;
}
focus_grab @protected {
- /*@ Focuses accessible widget.
+ [[Focuses accessible widget.]]
- @return true if focus grab focus has successed, false otherwise. */
+ return: bool; [[true if focus grab focus has successed, false
otherwise.]]
- return: bool;
}
accessible_at_point_get @protected {
- /*@ Gets top component object occupying space at given coordinates. */
+ [[Gets top component object occupying space at given coordinates.]]
params {
-screen_coords: bool; /*@ If true x and y values will be relative
- to screen origin, otherwise relative to
-
[EGIT] [core/elementary] master 05/06: Interface atspi value: migrate docs.
tasn pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=efcbe16fbb76c6a09697a0e1bd335e9a0201c146
commit efcbe16fbb76c6a09697a0e1bd335e9a0201c146
Author: Tom Hacohen
Date: Fri Aug 7 14:29:11 2015 +0100
Interface atspi value: migrate docs.
---
src/lib/elm_interface_atspi_value.eo | 14 ++
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/lib/elm_interface_atspi_value.eo
b/src/lib/elm_interface_atspi_value.eo
index 9ac7ac0..2b4432a 100644
--- a/src/lib/elm_interface_atspi_value.eo
+++ b/src/lib/elm_interface_atspi_value.eo
@@ -5,21 +5,19 @@ interface Elm_Interface_Atspi_Value ()
methods {
@property value_and_text @protected {
get {
-/*@ Gets value displayed by a accessible widget. */
+[[Gets value displayed by a accessible widget.]]
}
set {
-return: bool; /*@ true if setting widgets value has
-successed, false otherwise. */
+return: bool; [[true if setting widgets value has successed, false
otherwise.]]
}
values {
-value: double; /*@ Value of widget casted to floating point
number. */
-text: const(char)*; /*@ string describing value in given context
- eg. small, enough */
+value: double; [[Value of widget casted to floating point number.]]
+text: const(char)*; [[string describing value in given context eg.
small, enough]]
}
}
@property range @protected {
get {
-/*@ Gets a range of all possible values and its description */
+[[Gets a range of all possible values and its description]]
}
values {
lower_limit: double;
@@ -29,7 +27,7 @@ interface Elm_Interface_Atspi_Value ()
}
@property increment @protected {
get {
-/*@ Gets an minimal incrementation value */
+[[Gets an minimal incrementation value]]
}
values {
increment: double;
--
[EGIT] [core/elementary] master 04/06: Interface atspi selection: migrate docs.
tasn pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=48ef6853c06de9d5c5a9a428402726597e4a4570
commit 48ef6853c06de9d5c5a9a428402726597e4a4570
Author: Tom Hacohen
Date: Fri Aug 7 14:28:40 2015 +0100
Interface atspi selection: migrate docs.
---
src/lib/elm_interface_atspi_selection.eo | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/lib/elm_interface_atspi_selection.eo
b/src/lib/elm_interface_atspi_selection.eo
index 2b4de86..490757c 100644
--- a/src/lib/elm_interface_atspi_selection.eo
+++ b/src/lib/elm_interface_atspi_selection.eo
@@ -5,50 +5,50 @@ interface Elm_Interface_Atspi_Selection ()
methods {
@property selected_children_count @protected {
get {
-/*@ Gets the number of currently selected children */
+[[Gets the number of currently selected children]]
return: int;
}
}
@property selected_child @protected {
- /*@ Gets child for given child index */
+ [[Gets child for given child index]]
get {
return: Eo *;
}
keys {
-selected_child_index: int; /*@ index of selected child */
+selected_child_index: int; [[index of selected child]]
}
}
child_select @protected {
- /*@ Adds selection for given child index */
+ [[Adds selection for given child index]]
params {
@in child_index: int;
}
return: bool;
}
selected_child_deselect @protected {
- /*@ Removes selection for given child index */
+ [[Removes selection for given child index]]
params {
@in child_index: int;
}
return: bool;
}
is_child_selected @protected {
- /*@ Determines if child specified by index is selected */
+ [[Determines if child specified by index is selected]]
params {
@in child_index: int;
}
return: bool;
}
all_children_select @protected {
- /*@ Adds selection for all children */
+ [[Adds selection for all children]]
return: bool;
}
clear @protected {
- /*@ Clears the current selection */
+ [[Clears the current selection]]
return: bool;
}
child_deselect @protected {
- /*@ Removes selection for given child index */
+ [[Removes selection for given child index]]
params {
@in child_index: int;
}
--
[EGIT] [core/efl] master 01/01: ecore_drm_evdev: Avoid shadowing a local variable.
stefan pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=19c6617d78fdd6982ba34f7e95c89e6a698d16e3
commit 19c6617d78fdd6982ba34f7e95c89e6a698d16e3
Author: Stefan Schmidt
Date: Fri Aug 7 14:54:34 2015 +0200
ecore_drm_evdev: Avoid shadowing a local variable.
input is already used within this function so rename it in the block.
---
src/lib/ecore_drm/ecore_drm_evdev.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/lib/ecore_drm/ecore_drm_evdev.c
b/src/lib/ecore_drm/ecore_drm_evdev.c
index deca6a2..fe38302 100644
--- a/src/lib/ecore_drm/ecore_drm_evdev.c
+++ b/src/lib/ecore_drm/ecore_drm_evdev.c
@@ -80,19 +80,19 @@ _device_output_set(Ecore_Drm_Evdev *edev)
if (libinput_device_has_capability(edev->device,
LIBINPUT_DEVICE_CAP_POINTER))
{
-Ecore_Drm_Input *input;
+Ecore_Drm_Input *pointer_input;
Ecore_Event_Mouse_Move *ev;
edev->mouse.dx = edev->output->current_mode->width / 2;
edev->mouse.dy = edev->output->current_mode->height / 2;
/* send a fake motion event to let other know the initial pos of mouse
*/
-if (!(input = edev->seat->input)) return;
+if (!(pointer_input = edev->seat->input)) return;
if (!(ev = calloc(1, sizeof(Ecore_Event_Mouse_Move return;
-ev->window = (Ecore_Window)input->dev->window;
-ev->event_window = (Ecore_Window)input->dev->window;
-ev->root_window = (Ecore_Window)input->dev->window;
+ev->window = (Ecore_Window)pointer_input->dev->window;
+ev->event_window = (Ecore_Window)pointer_input->dev->window;
+ev->root_window = (Ecore_Window)pointer_input->dev->window;
_device_modifiers_update(edev);
ev->modifiers = edev->xkb.modifiers;
--
[EGIT] [core/elementary] master 01/06: Interface atspi text: migrate docs.
tasn pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=0da82773de41332f875216897b71aeaaa5d9f39d
commit 0da82773de41332f875216897b71aeaaa5d9f39d
Author: Tom Hacohen
Date: Fri Aug 7 14:25:45 2015 +0100
Interface atspi text: migrate docs.
---
src/lib/elm_interface_atspi_text.eo | 54 ++---
1 file changed, 20 insertions(+), 34 deletions(-)
diff --git a/src/lib/elm_interface_atspi_text.eo
b/src/lib/elm_interface_atspi_text.eo
index 7191509..f5a7e58 100644
--- a/src/lib/elm_interface_atspi_text.eo
+++ b/src/lib/elm_interface_atspi_text.eo
@@ -5,56 +5,46 @@ interface Elm_Interface_Atspi_Text ()
methods {
@property character @protected {
get {
-/*@ Gets single character present in accessible widget's text
-at given offset. */
+[[Gets single character present in accessible widget's text at
given offset.]]
}
keys {
-offset: int; /*@ Position in text. */
+offset: int; [[Position in text.]]
}
values {
-character: Eina_Unicode; /*@ Character at offset. 0 when out-of
- bounds offset has been given.
- Codepoints between DC80 and DCFF
indicates
- that string includes invalid UTF8 chars.
*/
+character: Eina_Unicode; [[Character at offset. 0 when out-of
bounds offset has been given. Codepoints between DC80 and DCFF indicates that
string includes invalid UTF8 chars.]]
}
}
@property string @protected {
get {
-/*@ Gets string, start and end offset in text according to
- given initial offset and granulatity. */
+[[Gets string, start and end offset in text according to given
initial offset and granulatity.]]
}
keys {
granularity: Elm_Atspi_Text_Granularity;
-start_offset: int * @nonull; /*@ Offset indicating start of string
-according to given granularity.
--1 in case of error. */
-end_offset: int *; /*@ Offset indicating end of string according
- to given granularity. -1 in case of error.
*/
+start_offset: int * @nonull; [[Offset indicating start of string
according to given granularity. -1 in case of error.]]
+end_offset: int *; [[Offset indicating end of string according to
given granularity. -1 in case of error.]]
}
values {
-string: own(char *); /*@ Newly allocated UTF-8 encoded string.
- Must be free by a user. */
+string: own(char *); [[Newly allocated UTF-8 encoded string. Must
be free by a user.]]
}
}
@property text @protected {
get {
-/*@ Gets text of accessible widget. */
+[[Gets text of accessible widget.]]
}
keys {
-start_offset: int; /*@ Position in text. */
-end_offset: int; /*@ End offset of text. */
+start_offset: int; [[Position in text.]]
+end_offset: int; [[End offset of text.]]
}
values {
-text: own(char *); /*@ UTF-8 encoded text. */
+text: own(char *); [[UTF-8 encoded text.]]
}
}
@property caret_offset @protected {
get {
-/*@ Gets offset position of caret (cursor) */
+[[Gets offset position of caret (cursor)]]
}
set {
-return: bool; /*@ true if caret was successfully moved,
- EINA_FASLE otherwise. */
+return: bool; [[$true if caret was successfully moved,
$falseotherwise.]]
}
values {
offset: int;
@@ -62,23 +52,21 @@ interface Elm_Interface_Atspi_Text ()
}
@property attribute @protected {
get {
-/*@ Indicate if a text attribute with a given name is set */
+[[Indicate if a text attribute with a given name is set]]
return: bool;
}
keys {
-name: const(char)* @nonull; /*@ text attribute name */
-start_offset: int * @nonull; /*@ Position in text from which
-given attribute is set. */
-end_offset: int *; /*@ Position in text to which given attribute
-is set. */
+name: const(char)* @nonull; [[text attribute name]]
+start_offset: int * @nonull; [[Position in text from which given
attribute is set.]]
+end_offset: int *; [[Position in text to which given attribute is
set.]]
}
values {
-value: own(char *); /*@ Valu
[EGIT] [core/enlightenment] master 01/01: wl_drm: No need to init orient to 0 as it will never be read.
stefan pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=5e5fcc482847529e90556b55c5d7470b2d5fa6bd
commit 5e5fcc482847529e90556b55c5d7470b2d5fa6bd
Author: Stefan Schmidt
Date: Fri Aug 7 15:49:45 2015 +0200
wl_drm: No need to init orient to 0 as it will never be read.
---
src/modules/wl_drm/e_mod_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/modules/wl_drm/e_mod_main.c b/src/modules/wl_drm/e_mod_main.c
index 697e598..a3f1f42 100644
--- a/src/modules/wl_drm/e_mod_main.c
+++ b/src/modules/wl_drm/e_mod_main.c
@@ -530,7 +530,7 @@ _drm_randr_apply(void)
EINA_LIST_FOREACH(e_randr2->screens, ll, s)
{
- int orient = 0;
+ int orient;
Ecore_Drm_Output_Mode *mode = NULL;
printf("DRM RRR: find output for '%s'\n", s->info.name);
--
[EGIT] [core/elementary] master 01/01: gesture_layer: convert and fix docs
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=2a1fd61e5667860f860c842dbc375a5e692aaf0e
commit 2a1fd61e5667860f860c842dbc375a5e692aaf0e
Author: Daniel Kolesa
Date: Fri Aug 7 14:44:49 2015 +0100
gesture_layer: convert and fix docs
---
src/lib/elm_gesture_layer.eo | 183 +++
1 file changed, 63 insertions(+), 120 deletions(-)
diff --git a/src/lib/elm_gesture_layer.eo b/src/lib/elm_gesture_layer.eo
index c0e265e..ef6381a 100644
--- a/src/lib/elm_gesture_layer.eo
+++ b/src/lib/elm_gesture_layer.eo
@@ -3,175 +3,118 @@ class Elm.Gesture_Layer (Elm.Widget)
eo_prefix: elm_obj_gesture_layer;
methods {
@property zoom_step {
- set {
-/*@
-This function sets step-value for zoom action.
-Set step to any positive value.
-Cancel step setting by setting to 0
-
-@see elm_gesture_layer_zoom_step_get()
-@ingroup Elm_Gesture_Layer
- */
- }
- get {
-/*@
-This function returns step-value for zoom action.
-
-@return zoom step value.
-
-@see elm_gesture_layer_zoom_step_set()
-@ingroup Elm_Gesture_Layer
- */
- }
+ [[Control step value for zoom action.]]
+ set {}
+ get {}
values {
-step: double; /*@ new zoom step value. */
+step: double; [[The zoom step value.]]
}
}
@property tap_finger_size {
set {
-/*@
-This function sets the gesture layer finger-size for taps
-If not set, this size taken from elm_config.
-Set to ZERO if you want GLayer to use system finger size value
(default)
+[[This function sets the gesture layer finger-size for taps.
-@since 1.8
-@ingroup Elm_Gesture_Layer
- */
+ If not set, it's taken from elm_config.
+ Set to 0 if you want GLayer to use the system finger size
+ value (default).
+
+ @since 1.8
+]]
}
get {
-/*@
-This function returns the gesture layer finger-size for taps
-
-@return Finger size that is currently used by Gesture Layer for
taps.
+[[This function returns the gesture layer finger-size for taps
-@since 1.8
-@ingroup Elm_Gesture_Layer
- */
+ @since 1.8
+]]
}
values {
-sz: Evas.Coord; /*@ Finger size */
+sz: Evas.Coord; [[The finger size.]]
}
}
@property hold_events {
set {
-/*@
-This function is to make gesture-layer repeat events.
-Set this if you like to get the raw events only if gestures were
not
-detected.
-Clear this if you like gesture layer to forward events as testing
gestures.
-@ingroup Elm_Gesture_Layer
- */
+[[This function makes gesture-layer repeat events.
+
+ Set this if you like to get the raw events only if gestures
+ were not detected.
+
+ Clear this if you like gesture layer to forward events as
+ testing gestures.
+]]
}
get {
-/*@
-Call this function to get repeat-events settings.
-
-@return repeat events settings.
-@see elm_gesture_layer_hold_events_set()
-@ingroup Elm_Gesture_Layer
- */
+[[Get the repeat-events setting.]]
}
values {
-hold_events: bool; /*@ hold events or not. */
+hold_events: bool;
}
}
@property rotate_step {
set {
-/*@
-This function sets step-value for rotate action.
-Set step to any positive value.
-Cancel step setting by setting to 0
-@ingroup Elm_Gesture_Layer
- */
+[[This function sets the step value for rotate action.
+
+ Set to 0 to cancel step setting.
+]]
}
get {
-/*@
-This function returns step-value for rotate action.
-
-@return rotate step value.
-@ingroup Elm_Gesture_Layer
- */
+[[This function returns step-value for rotate action.]]
}
values {
-step: double; /*@ new rotate step value. */
+step: double; [[New rotate step value.]]
}
}
@property cb {
set {
-/*@
-Use function to set callbacks to be notified about
-change of state of gesture.
-When a user registers a callback with this function
-this means this gesture has t
[EGIT] [core/elementary] master 01/02: Inwin: migrate docs.
tasn pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=fd6a0f5b139d74379653ca5dff00e2fdf6bf34b8
commit fd6a0f5b139d74379653ca5dff00e2fdf6bf34b8
Author: Tom Hacohen
Date: Fri Aug 7 14:37:49 2015 +0100
Inwin: migrate docs.
---
src/lib/elm_inwin.eo | 17 +++--
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/src/lib/elm_inwin.eo b/src/lib/elm_inwin.eo
index 9f367e9..74ea221 100644
--- a/src/lib/elm_inwin.eo
+++ b/src/lib/elm_inwin.eo
@@ -4,18 +4,15 @@ class Elm.Inwin (Elm.Layout)
data: null;
methods {
activate {
- /*@
- Activates an inwin object, ensuring its visibility
+ [[Activates an inwin object, ensuring its visibility
- This function will make sure that the inwin $obj is completely visible
- by calling evas_object_show() and evas_object_raise() on it, to bring
it
- to the front. It also sets the keyboard focus to it, which will be
passed
- onto its content.
+ This function will make sure that the inwin $obj is completely
visible
+ by calling evas_object_show() and evas_object_raise() on it, to
bring it
+ to the front. It also sets the keyboard focus to it, which will be
passed
+ onto its content.
- The object's theme will also receive the signal "elm,action,show" with
- source "elm".
-
- @ingroup Inwin */
+ The object's theme will also receive the signal "elm,action,show"
with
+ source "elm".]]
legacy: elm_win_inwin_activate;
}
--
[EGIT] [core/elementary] master 02/02: Widget item: migrate docs.
tasn pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=b0c09a6e354adde20c0190c5a2597f09615dd29e
commit b0c09a6e354adde20c0190c5a2597f09615dd29e
Author: Tom Hacohen
Date: Fri Aug 7 15:04:10 2015 +0100
Widget item: migrate docs.
---
src/lib/elm_widget_item.eo | 611 ++---
1 file changed, 190 insertions(+), 421 deletions(-)
diff --git a/src/lib/elm_widget_item.eo b/src/lib/elm_widget_item.eo
index af0f1af..021b4c0 100644
--- a/src/lib/elm_widget_item.eo
+++ b/src/lib/elm_widget_item.eo
@@ -5,232 +5,132 @@ class Elm.Widget_Item(Eo.Base,
Elm_Interface_Atspi_Accessible,
legacy_prefix: elm_object_item;
methods {
@property tooltip_window_mode {
-get {
- /*@
- @brief Get size restriction state of an object's tooltip
+ [[Control size restriction state of an object's tooltip
- This function returns whether a tooltip is allowed to
expand beyond
- its parent window's canvas.
- It will instead be limited only by the size of the
display.
- */
+ This function returns whether a tooltip is allowed to expand
beyond
+ its parent window's canvas.
+ It will instead be limited only by the size of the display.]]
+get {
}
set {
- /*@
- @brief Disable size restrictions on an object's tooltip
-
- This function allows a tooltip to expand beyond its
parent window's canvas.
- It will instead be limited only by the size of the
display.
- */
- return: bool; /*@ $false on failure, $true on success */
+ return: bool; [[$false on failure, $true on success]]
}
values {
- disable: bool; /*@ If $true, size restrictions are
disabled */
+ disable: bool; [[If $true, size restrictions are
disabled]]
}
}
@property tooltip_style {
-get {
- /*@
- Get the style for this item tooltip.
+[[Control a different style for this item tooltip.
- @see elm_object_tooltip_style_get() for more details.
- @see elm_object_item_tooltip_style_set()
+ Note: before you set a style you should define a tooltip with
+ @.tooltip_content_cb_set or
+ @.tooltip_text_set
- @ingroup General
- */
+ See: elm_object_tooltip_style_set() for more details.]]
+get {
}
set {
- /*@
- Sets a different style for this item tooltip.
-
- @note before you set a style you should define a
tooltip with
- elm_object_item_tooltip_content_cb_set() or
- elm_object_item_tooltip_text_set()
-
- @see elm_object_tooltip_style_set() for more details.
-
- @ingroup General
- */
}
values {
- style: const (char)*; /*@ the theme style used/to use
(default, transparent, ...) */
+ style: const (char)*; [[the theme style used/to use
(default, transparent, ...)]]
}
}
@property cursor {
-get {
- /*@
-Get the type of mouse pointer/cursor decoration set to
be shown,
-when the mouse pointer is over the given item
+[[Control the type of mouse pointer/cursor decoration to be
shown,
+ when the mouse pointer is over the given item
-@see elm_object_cursor_get()
-@see elm_object_item_cursor_set()
-@see elm_object_item_cursor_unset()
+ This function works analogously as elm_object_cursor_set(),
but
+ here the cursor's changing area is restricted to the item's
+ area, and not the whole widget's. Note that that item cursors
+ have precedence over widget cursors, so that a mouse over an
+ item with custom cursor set will always show that cursor.
-@ingroup General
- */
+ If this function is called twice for an object, a previously
set
+ cursor will be unset on the second call.]]
+get {
}
set {
- /*@
-
[EGIT] [apps/ephoto] master 01/01: Ephoto: Slideshow - Update the titlebar with the image name when the slideshow changes images.
okra pushed a commit to branch master.
http://git.enlightenment.org/apps/ephoto.git/commit/?id=306929d859b9ad763217ce640cc8df2bf573eab3
commit 306929d859b9ad763217ce640cc8df2bf573eab3
Author: Stephen Houston
Date: Fri Aug 7 09:07:08 2015 -0500
Ephoto: Slideshow - Update the titlebar with the image name when the
slideshow changes images.
---
src/bin/ephoto_slideshow.c | 7 +++
1 file changed, 7 insertions(+)
diff --git a/src/bin/ephoto_slideshow.c b/src/bin/ephoto_slideshow.c
index 36b1015..cf14441 100644
--- a/src/bin/ephoto_slideshow.c
+++ b/src/bin/ephoto_slideshow.c
@@ -93,6 +93,12 @@ ephoto_slideshow_add(Ephoto *ephoto, Evas_Object *parent)
return NULL;
}
+static void _image_shown(void *data, Evas *e EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_data EINA_UNUSED)
+{
+ Ephoto_Entry *entry = data;
+ ephoto_title_set(entry->ephoto, entry->basename);
+}
+
static Evas_Object *
_slideshow_item_get(void *data, Evas_Object *obj)
{
@@ -118,6 +124,7 @@ _slideshow_item_get(void *data, Evas_Object *obj)
Evas_Object *image = elm_image_add(obj);
elm_image_file_set(image, entry->path, group);
elm_object_style_set(image, "shadow");
+ evas_object_event_callback_add(image, EVAS_CALLBACK_SHOW, _image_shown,
entry);
return image;
}
--
[EGIT] [apps/ephoto] master 01/01: Ephoto: Slideshow - Make escape progression logical. Stop slideshow when escaped.
okra pushed a commit to branch master.
http://git.enlightenment.org/apps/ephoto.git/commit/?id=ded920c4ec6bd5576b90524bad9ce7d788e52d21
commit ded920c4ec6bd5576b90524bad9ce7d788e52d21
Author: Stephen Houston
Date: Fri Aug 7 09:14:42 2015 -0500
Ephoto: Slideshow - Make escape progression logical. Stop slideshow when
escaped.
---
src/bin/ephoto_slideshow.c | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/bin/ephoto_slideshow.c b/src/bin/ephoto_slideshow.c
index cf14441..c9b661d 100644
--- a/src/bin/ephoto_slideshow.c
+++ b/src/bin/ephoto_slideshow.c
@@ -23,12 +23,16 @@ _key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *e
Ephoto_Entry *entry;
if (elm_win_fullscreen_get(win))
- elm_win_fullscreen_set(win, EINA_FALSE);
+ {
+ elm_win_fullscreen_set(win, EINA_FALSE);
+ return;
+ }
slideshow_item = elm_slideshow_item_current_get(ss->slideshow);
if (slideshow_item) entry = elm_object_item_data_get(slideshow_item);
else entry = ss->entry;
evas_object_smart_callback_call(ss->slideshow, "back", entry);
+elm_slideshow_clear(ss->slideshow);
}
else if (!strcmp(k, "F11"))
{
--
[EGIT] [core/elementary] master 01/01: Index: migrate docs.
tasn pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=ccc8d753123b8ce28e4a9b5aa50114069175ca41
commit ccc8d753123b8ce28e4a9b5aa50114069175ca41
Author: Tom Hacohen
Date: Fri Aug 7 15:19:21 2015 +0100
Index: migrate docs.
---
src/lib/elm_index.eo | 365 ---
1 file changed, 113 insertions(+), 252 deletions(-)
diff --git a/src/lib/elm_index.eo b/src/lib/elm_index.eo
index 459880d..1c08930 100644
--- a/src/lib/elm_index.eo
+++ b/src/lib/elm_index.eo
@@ -3,371 +3,232 @@ class Elm.Index (Elm.Layout, Evas.Clickable_Interface,
Evas.Selectable_Interface
eo_prefix: elm_obj_index;
methods {
@property autohide_disabled {
+ [[Enable or disable auto hiding feature for a given index widget.]]
set {
-/*@
-Enable or disable auto hiding feature for a given index widget.
-
-@see elm_index_autohide_disabled_get()
-
-@ingroup Index */
}
get {
-/*@
-Get whether auto hiding feature is enabled or not for a given
index widget.
-
-@return $true, if auto hiding is disabled, $false otherwise
-
-@see elm_index_autohide_disabled_set() for more details
-
-@ingroup Index */
}
values {
-disabled: bool; /*@ $true to disable auto hiding, $false to enable
*/
+disabled: bool; [[$true to disable auto hiding, $false to enable]]
}
}
@property omit_enabled {
- set {
-/*@
-Enable or disable omit feature for a given index widget.
-
-@see elm_index_omit_enabled_get()
-
-@since 1.8
+ [[Enable or disable omit feature for a given index widget.
-@ingroup Index */
+ @since 1.8]]
+ set {
}
get {
-/*@
-Get whether omit feature is enabled or not for a given index
widget.
-
-@return $true, if omit feature is enabled, $false otherwise
-
-@see elm_index_omit_enabled_set()
-
-@since 1.8
-
-@ingroup Index */
}
values {
-enabled: bool; /*@ $true to enable omit feature, $false to disable
*/
+enabled: bool; [[$true to enable omit feature, $false to disable]]
}
}
@property priority {
- set {
-/*@
-Set priority group of index. Priority group will be shown as many
items as it can,
-and other group will be shown one character only.
-
-@see elm_index_priority_get()
-
-@since 1.16
+ [[Control priority group of index. Priority group will be shown as
many items as it can, and other group will be shown one character only.
-@ingroup Index */
+ @since 1.16]]
+ set {
}
get {
-/*@
-Get current priority group of index.
-
-@return priority value in index
-
-@see elm_index_priority_set()
-
-@since 1.16
-
-@ingroup Index */
}
values {
-priority: int; /*@ $priority target priority value in index */
+priority: int; [[$priority target priority value in index]]
}
}
@property horizontal {
- set {
-/*@
-Enable or disable horizontal mode on the index object
+ [[Enable or disable horizontal mode on the index object
-@note Vertical mode is set by default.
+Note: Vertical mode is set by default.
On horizontal mode items are displayed on index from left to right,
-instead of from top to bottom. Also, the index will scroll
horizontally.
-
-@see elm_index_horizontal_get()
-
-@ingroup Index */
+instead of from top to bottom. Also, the index will scroll
horizontally.]]
+ set {
}
get {
-/*@
-Get a value whether horizontal mode is enabled or not.
-
-@return $true means horizontal mode selection is enabled.
-$false indicates it's disabled. If $obj is $NULL,
-$false is returned.
-
-@see elm_index_horizontal_set() for details.
-
-@ingroup Index */
}
values {
-horizontal: bool; /*@ $true to enable horizontal or $false to
-disable it, i.e., to enable vertical mode. it's an area one @ref
Fingers
-"finger" wide on the bottom side of the index widget's container.
*/
+horizontal: bool; [[$true to enable horizontal or $false to
+disable it, i.e., to enable vertical mode. it's an area one Fingers
+"finger" wide on the bottom side of the index widget's container.]]
}
}
@property delay_change_time {
-
[EGIT] [core/elementary] master 01/01: Segment control: migrate docs.
tasn pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=8b09403a6af358ea622766b0b8ff45f46093aa33
commit 8b09403a6af358ea622766b0b8ff45f46093aa33
Author: Tom Hacohen
Date: Fri Aug 7 15:36:47 2015 +0100
Segment control: migrate docs.
---
src/lib/elm_segment_control.eo | 184 +++--
1 file changed, 65 insertions(+), 119 deletions(-)
diff --git a/src/lib/elm_segment_control.eo b/src/lib/elm_segment_control.eo
index 576111d..8475ac6 100644
--- a/src/lib/elm_segment_control.eo
+++ b/src/lib/elm_segment_control.eo
@@ -4,141 +4,103 @@ class Elm.Segment_Control (Elm.Layout)
methods {
@property item_count {
get {
-/*@
-Get the Segment items count from segment control.
+[[Get the Segment items count from segment control.
-@return Segment items count.
-
-It will just return the number of items added to segment control
$obj.
-
-@ingroup SegmentControl */
-return: int;
+ It will just return the number of items added to segment control
$obj.]]
+return: int; [[Segment items count.]]
}
}
@property item_selected {
get {
-/*@
-Get the selected item.
+[[Get the selected item.
-@return The selected item or $NULL if none of segment items is
-selected.
+ The selected item can be unselected with function
+ elm_segment_control_item_selected_set().
-The selected item can be unselected with function
-elm_segment_control_item_selected_set().
+ The selected item always will be highlighted on segment
control.]]
-The selected item always will be highlighted on segment control.
+return: Elm.Widget_Item *; [[The selected item or $NULL if none of
segment items is selected.]]
-@ingroup SegmentControl */
-return: Elm.Widget_Item *;
}
}
item_label_get @const {
- /*@
- Get the label of item.
-
- @return The label of the item at $index.
-
- The return value is a pointer to the label associated to the item when
- it was created, with function elm_segment_control_item_add(), or later
- with function elm_object_item_text_set. If no label
- was passed as argument, it will return $NULL.
+ [[Get the label of item.
- @see elm_object_item_text_set() for more details.
- @see elm_segment_control_item_add()
+ The return value is a pointer to the label associated to the item
when
+ it was created, with function elm_segment_control_item_add(), or
later
+ with function elm_object_item_text_set. If no label
+ was passed as argument, it will return $NULL.]]
- @ingroup SegmentControl */
- return: const(char)*;
+ return: const(char)*; [[The label of the item at $index.]]
params {
-@in idx: int; /*@ The index of the segment item. */
+@in idx: int; [[The index of the segment item.]]
}
}
item_insert_at {
- /*@
- Insert a new item to the segment control object at specified position.
+ [[Insert a new item to the segment control object at specified
position.
- @return The created item or $NULL upon failure.
+ Index values must be between $0, when item will be prepended to
+ segment control, and items count, that can be get with
+ elm_segment_control_item_count_get(), case when item will be
appended
+ to segment control, just like elm_segment_control_item_add().
- Index values must be between $0, when item will be prepended to
- segment control, and items count, that can be get with
- elm_segment_control_item_count_get(), case when item will be appended
- to segment control, just like elm_segment_control_item_add().
+ Items created with this function can be deleted with function
+ elm_object_item_del() or elm_segment_control_item_del_at().
- Items created with this function can be deleted with function
- elm_object_item_del() or elm_segment_control_item_del_at().
+ Note: $label set to $NULL is different from empty string "".
+ If an item
+ only has icon, it will be displayed bigger and centered. If it has
+ icon and label, even that an empty string, icon will be smaller and
+ positioned at left.]]
- @note $label set to $NULL is different from empty string "".
- If an item
- only has icon, it will be displayed bigger and centered. If it has
- icon and label, even that an empty string, icon will be smaller and
- positioned at left.
-
- @see elm_segment_control_item_add(
[EGIT] [core/elementary] master 01/01: genlist: convert docs
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=356d1b1d813f9114bda17ee67d1ef36f70e2bb3c
commit 356d1b1d813f9114bda17ee67d1ef36f70e2bb3c
Author: Daniel Kolesa
Date: Fri Aug 7 15:47:32 2015 +0100
genlist: convert docs
---
src/lib/elm_genlist.eo | 780 ++---
1 file changed, 278 insertions(+), 502 deletions(-)
diff --git a/src/lib/elm_genlist.eo b/src/lib/elm_genlist.eo
index af26eef..a26f8d0 100644
--- a/src/lib/elm_genlist.eo
+++ b/src/lib/elm_genlist.eo
@@ -8,238 +8,153 @@ class Elm.Genlist (Elm.Layout, Elm_Interface_Scrollable,
Evas.Clickable_Interfac
methods {
@property homogeneous {
set {
-/*@
-Enable/disable homogeneous mode.
+[[Enable/disable homogeneous mode.
-This will enable the homogeneous mode where items are of the same
-height and width so that genlist may do the lazy-loading at its
-maximum (which increases the performance for scrolling the list).
-In the normal mode, genlist will pre-calculate all the items'
sizes even
-though they are not in use. So items' callbacks are called many
times than
-expected. But homogeneous mode will skip the item size
pre-calculation
-process so items' callbacks are called only when the item is
needed.
+ This will enable the homogeneous mode where items are of the
+ same height and width so that genlist may do the lazy-loading
+ at its maximum (which increases the performance for scrolling
+ the list). In the normal mode, genlist will pre-calculate all
+ the items' sizes even though they are not in use. So items'
+ callbacks are called many times than expected. But homogeneous
+ mode will skip the item size pre-calculation process so
+ items' callbacks are called only when the item is needed.
-@note This also works well with group index.
-
-@see elm_genlist_mode_set()
-@see elm_genlist_homogeneous_get()
-
-@ingroup Genlist */
+ Note: This also works well with group index.
+]]
}
get {
-/*@
-Get whether the homogeneous mode is enabled.
-
-@return Assume the items within the genlist are of the same height
-and width (true = on, false = off)
-
-@see elm_genlist_homogeneous_set()
-
-@ingroup Genlist */
+[[Get whether the homogeneous mode is enabled.]]
}
values {
-homogeneous: bool; /*@ Assume the items within the genlist are of
the
-same height and width (true = on, false = off). Default is @c
-false. */
+homogeneous: bool; [[Assume the items within the genlist are of
+ the same height and width. Default is
$false.]]
}
}
@property select_mode {
set {
-/*@
-Set the genlist select mode.
-
-elm_genlist_select_mode_set() changes item select mode in the
genlist widget.
-- #ELM_OBJECT_SELECT_MODE_DEFAULT : Items will call their
selection func and
-callback once when first becoming selected. Any further clicks will
-do nothing, unless you set always select mode.
-- #ELM_OBJECT_SELECT_MODE_ALWAYS : This means that, even if
selected,
-every click will make the selected callbacks be called.
-- #ELM_OBJECT_SELECT_MODE_NONE : This will turn off the ability to
select items
-entirely and they will neither appear selected nor call selected
-callback functions.
-
-@see elm_genlist_select_mode_get()
-
-@ingroup Genlist */
+[[Set the genlist select mode.
+
+ #ELM_OBJECT_SELECT_MODE_DEFAULT means that items will call
+ their selection func and callback once when first becoming
+ selected. Any further clicks will do nothing, unless you set
+ always select mode. ELM_OBJECT_SELECT_MODE_ALWAYS means that
+ even if selected, every click will make the selected callbacks
+ be called. #ELM_OBJECT_SELECT_MODE_NONE will turn off the
+ ability to select items entirely and they will neither appear
+ selected nor call selected callback functions.
+]]
}
get {
-/*@
-Get the genlist select mode.
-
-@return The select mode
-(If getting mode fails, it returns #ELM_OBJECT_SELECT_MODE_MAX)
-
-@see elm_genlist_select_mode_set()
-
-@ingroup Genlist */
+[[Get the genlist select mode.]]
}
values {
-mode: Elm.Object.Select_Mode(Elm.O
[EGIT] [core/elementary] master 01/01: Progressbar: migrate docs.
tasn pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=7a475249ddf5e5cd3142ab9c51af413720d2ff4d
commit 7a475249ddf5e5cd3142ab9c51af413720d2ff4d
Author: Tom Hacohen
Date: Fri Aug 7 15:48:51 2015 +0100
Progressbar: migrate docs.
---
src/lib/elm_progressbar.eo | 270 +
1 file changed, 76 insertions(+), 194 deletions(-)
diff --git a/src/lib/elm_progressbar.eo b/src/lib/elm_progressbar.eo
index 1d79717..827581c 100644
--- a/src/lib/elm_progressbar.eo
+++ b/src/lib/elm_progressbar.eo
@@ -3,271 +3,153 @@ class Elm.Progressbar (Elm.Layout)
eo_prefix: elm_obj_progressbar;
methods {
@property span_size {
+ [[Control the (exact) length of the bar region of a given progress
bar widget
+
+ This sets the minimum width (when in horizontal mode) or height
+ (when in vertical mode) of the actual bar area of the progress
+ bar $obj. This in turn affects the object's minimum size. Use
+ this when you're not setting other size hints expanding on the
+ given direction (like weight and alignment hints) and you would
+ like it to have a specific size.
+
+ Note: Icon, label and unit text around $obj will require their
+ own space, which will make $obj to require more the $size,
+ actually.]]
set {
-/*@
-Set the (exact) length of the bar region of a given progress bar
-widget
-
-This sets the minimum width (when in horizontal mode) or height
-(when in vertical mode) of the actual bar area of the progress
-bar $obj. This in turn affects the object's minimum size. Use
-this when you're not setting other size hints expanding on the
-given direction (like weight and alignment hints) and you would
-like it to have a specific size.
-
-@note Icon, label and unit text around $obj will require their
-own space, which will make $obj to require more the $size,
-actually.
-
-@see elm_progressbar_span_size_get()
-
-@ingroup Progressbar */
}
get {
-/*@
-Get the length set for the bar region of a given progress bar
-widget
-
-@return The length of the progress bar's bar region
-
-If that size was not set previously, with
-elm_progressbar_span_size_set(), this call will return $0.
-
-@ingroup Progressbar */
}
values {
-size: Evas.Coord; /*@ The length of the progress bar's bar region
*/
+size: Evas.Coord; [[The length of the progress bar's bar region]]
}
}
@property pulse {
+ [[Control whether a given progress bar widget is at "pulsing mode" or
not.
+
+ By default, progress bars will display values from the low to
+ high value boundaries. There are, though, contexts in which the
+ progress of a given task is unknown. For such cases,
+ one can set a progress bar widget to a "pulsing state", to give
+ the user an idea that some computation is being held, but
+ without exact progress values. In the default theme, it will
+ animate its bar with the contents filling in constantly and back
+ to non-filled, in a loop. To start and stop this pulsing
+ animation, one has to explicitly call elm_progressbar_pulse().]]
set {
-/*@
-Set whether a given progress bar widget is at "pulsing mode" or
-not.
-
-By default, progress bars will display values from the low to
-high value boundaries. There are, though, contexts in which the
-progress of a given task is @b unknown. For such cases,
-one can set a progress bar widget to a "pulsing state", to give
-the user an idea that some computation is being held, but
-without exact progress values. In the default theme, it will
-animate its bar with the contents filling in constantly and back
-to non-filled, in a loop. To start and stop this pulsing
-animation, one has to explicitly call elm_progressbar_pulse().
-
-@see elm_progressbar_pulse_get()
-@see elm_progressbar_pulse()
-
-@ingroup Progressbar */
}
get {
-/*@
-Get whether a given progress bar widget is at "pulsing mode" or
-not.
-
-@return $true, if $obj is in pulsing mode, $false
-if it's in the default one (and on errors)
-
-@ingroup Progressbar */
}
values {
-pulse: bool; /*@ $true to put $obj in pulsing mode,
-$false to put it back to its default one */
+pulse: bool; [[$true to
[EGIT] [core/elementary] master 01/01: glview: convert docs
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=9a44777481eb2426d334209631c0ff97d83c0cb0
commit 9a44777481eb2426d334209631c0ff97d83c0cb0
Author: Daniel Kolesa
Date: Fri Aug 7 15:54:50 2015 +0100
glview: convert docs
---
src/lib/elm_glview.eo | 199 +-
1 file changed, 82 insertions(+), 117 deletions(-)
diff --git a/src/lib/elm_glview.eo b/src/lib/elm_glview.eo
index 3c9d02e..feb684c 100644
--- a/src/lib/elm_glview.eo
+++ b/src/lib/elm_glview.eo
@@ -3,7 +3,7 @@ class Elm.Glview (Elm.Widget)
eo_prefix: elm_obj_glview;
methods {
version_constructor {
- /*@ Constructor with context version number. */
+ [[Constructor with context version number.]]
legacy: null;
params {
@in version: Evas_GL_Context_Version;
@@ -11,199 +11,164 @@ class Elm.Glview (Elm.Widget)
}
@property size {
set {
-/*@
-Sets the size of the glview
-
-@ingroup GLView */
+[[Sets the size of the glview.]]
}
get {
-/*@
-Get the size of the glview.
-
-Note that this function returns the actual image size of the
-glview. This means that when the scale policy is set to
-#ELM_GLVIEW_RESIZE_POLICY_SCALE, it'll return the non-scaled
-size.
+[[Get the size of the glview.
-@ingroup GLView */
+ Note: This function returns the actual image size of the
+ glview. This means that when the scale policy is set to
+ #ELM_GLVIEW_RESIZE_POLICY_SCALE, it'll return the non-scaled
+ size.
+]]
}
values {
-w: int; /*@ width of the glview object */
-h: int; /*@ height of the glview object */
+w: int; [[Width of the glview object.]]
+h: int; [[Height of the glview object.]]
}
}
@property resize_policy {
set {
-/*@
-Set the resize policy for the glview object.
-
-By default, the resize policy is set to
#ELM_GLVIEW_RESIZE_POLICY_RECREATE.
-When resize is called it destroys the previous surface and
recreates the
-newly specified size. If the policy is set to
-#ELM_GLVIEW_RESIZE_POLICY_SCALE, however, glview only scales the
image
-object and not the underlying GL Surface.
-
-@ingroup GLView */
+[[Set the resize policy for the glview object.
+
+ By default, the resize policy is set to
+ #ELM_GLVIEW_RESIZE_POLICY_RECREATE. When resize is called
+ it destroys the previous surface and recreates the newly
+ specified size. If the policy is set to
+ #ELM_GLVIEW_RESIZE_POLICY_SCALE, however, glview only
+ scales the image object and not the underlying GL Surface.
+]]
return: bool;
}
values {
-policy: Elm_GLView_Resize_Policy; /*@ The scaling policy. */
+policy: Elm_GLView_Resize_Policy; [[The scaling policy.]]
}
}
@property changed {
set {
-/*@
-Notifies that there has been changes in the GLView.
-
-@ingroup GLView */
+[[Notifies that there has been changes in the GLView.]]
}
}
@property resize_func {
set {
-/*@
-Set the resize function that gets called when resize happens.
+[[Set the resize function that gets called when resize happens.
-The resize function gets called during the render loop.
-This function allows glview to hide all the rendering
context/surface
-details and have the user just call GL calls that they desire
-when resize happens.
-
-@ingroup GLView */
+ The resize function gets called during the render loop.
+ This function allows glview to hide all the rendering
+ context/surface details and have the user just call GL
+ alls that they desire when resize happens.
+]]
}
values {
-func: Elm_GLView_Func_Cb; /*@ The resize function to be
registered. */
+func: Elm_GLView_Func_Cb; [[The resize function to be registered.]]
}
}
@property del_func {
set {
-/*@
-Set the render function that runs in the main loop.
-
-The registered del function gets called when GLView object is
deleted.
-This function allows glview to hide all the rendering
context/surface
-details and have the user just call GL calls that they desire
-when delete happens.
+[[Set the render function t
[EGIT] [core/efl] master 02/02: ecore_con: remove unwanted delete calls from ecore_con_eet test cases.
cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=b3ce48e2f9e44c444f3aced30cc67869d16735ac commit b3ce48e2f9e44c444f3aced30cc67869d16735ac Author: Srivardhan Hebbar Date: Fri Aug 7 16:35:45 2015 +0200 ecore_con: remove unwanted delete calls from ecore_con_eet test cases. Summary: Signed-off-by: Srivardhan Hebbar Reviewers: cedric Reviewed By: cedric Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D2910 Signed-off-by: Cedric BAIL --- src/tests/ecore_con/ecore_con_test_ecore_con_eet.c | 11 --- 1 file changed, 11 deletions(-) diff --git a/src/tests/ecore_con/ecore_con_test_ecore_con_eet.c b/src/tests/ecore_con/ecore_con_test_ecore_con_eet.c index edf5185..99926a0 100644 --- a/src/tests/ecore_con/ecore_con_test_ecore_con_eet.c +++ b/src/tests/ecore_con/ecore_con_test_ecore_con_eet.c @@ -108,7 +108,6 @@ _eet_raw_data_cb(void *data, Ecore_Con_Reply *reply, const char *protocol_name E ecore_con_eet_raw_data_callback_del(ece_cl, TEST_STREAM); ecore_con_eet_server_connect_callback_del(ece_cl, _eet_svr_cnct_cb, NULL); - ecore_con_eet_server_free(ece_cl); ecore_con_server_del(cl); } @@ -164,7 +163,6 @@ START_TEST(ecore_con_test_ecore_con_eet_svr_cl) _eet_client_discnct_cb, NULL); free(cb_data); - ecore_con_eet_server_free(ece_svr); _ece_test_descriptor_shutdown(); ecore_con_server_del(svr); ecore_con_shutdown(); @@ -192,7 +190,6 @@ _eet_svr_raw_data_cb(void *data, Ecore_Con_Reply *reply, const char *protocol_na ecore_con_eet_raw_data_callback_del(ece_svr, TEST_STREAM); - ecore_con_eet_server_free(ece_svr); ecore_con_server_del(svr); } @@ -236,16 +233,8 @@ START_TEST(ecore_con_test_ecore_con_eet_svr_del) ecore_main_loop_begin(); - - ecore_con_eet_server_connect_callback_del(ece_cl, _eet_client_cnct_cb, - NULL); - ecore_con_eet_server_disconnect_callback_del(ece_cl, -_eet_client_discnct_cb, NULL); - free(cb_data); - ecore_con_eet_server_free(ece_cl); _ece_test_descriptor_shutdown(); - ecore_con_server_del(cl); ecore_con_shutdown(); eet_shutdown(); eina_shutdown(); --
[EGIT] [core/efl] master 01/02: ecore_con: update documentation.
cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=3dd917be92e8312d4841d800f22045326d396804 commit 3dd917be92e8312d4841d800f22045326d396804 Author: Srivardhan Hebbar Date: Fri Aug 7 16:33:38 2015 +0200 ecore_con: update documentation. Summary: Signed-off-by: Srivardhan Hebbar Reviewers: cedric Reviewed By: cedric Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D2909 Signed-off-by: Cedric BAIL --- src/lib/ecore_con/Ecore_Con.h | 3 +++ src/lib/ecore_con/Ecore_Con_Eet.h | 12 2 files changed, 15 insertions(+) diff --git a/src/lib/ecore_con/Ecore_Con.h b/src/lib/ecore_con/Ecore_Con.h index 4fde11b..8cf39ec 100644 --- a/src/lib/ecore_con/Ecore_Con.h +++ b/src/lib/ecore_con/Ecore_Con.h @@ -1229,6 +1229,9 @@ EAPI Ecore_Con_Server *ecore_con_server_add(Ecore_Con_Type type, * @ref ECORE_CON_EVENT_SERVER_ADD is received. If it fails to complete, an * @ref ECORE_CON_EVENT_SERVER_DEL will be received. * + * The created object gets deleted automatically if the connection to the + * server is lost. + * * The @p data parameter can be fetched later using ecore_con_server_data_get() * or changed with ecore_con_server_data_set(). */ diff --git a/src/lib/ecore_con/Ecore_Con_Eet.h b/src/lib/ecore_con/Ecore_Con_Eet.h index 0257b7f..4f1b7df 100644 --- a/src/lib/ecore_con/Ecore_Con_Eet.h +++ b/src/lib/ecore_con/Ecore_Con_Eet.h @@ -84,6 +84,9 @@ typedef Eina_Bool (*Ecore_Con_Eet_Server_Cb)(void *data, Ecore_Con_Reply *reply, * created by the server program with @ref * ecore_con_server_add. * + * This object gets deleted automatically when the parent Ecore_Con_Server is + * deleted. + * * @return A new Ecore_Con_Eet server. */ EAPI Ecore_Con_Eet *ecore_con_eet_server_new(Ecore_Con_Server *server); @@ -95,6 +98,9 @@ EAPI Ecore_Con_Eet *ecore_con_eet_server_new(Ecore_Con_Server *server); * returned by a call to @ref ecore_con_server_connect in the * client program. * + * This object gets deleted automatically when the parent Ecore_Con_Server is + * deleted. + * * @return A new Ecore_Con_Eet client. */ EAPI Ecore_Con_Eet *ecore_con_eet_client_new(Ecore_Con_Server *server); @@ -122,6 +128,7 @@ EAPI void ecore_con_eet_register(Ecore_Con_Eet *ece, const char *name, Eet_Data_ /** * Register a data callback on a Ecore_Con_Eet object. + * When the Ecore_Con_Eet object is deleted, this automatically gets removed. * * @param ece An Ecore_Con_Eet object. * @param name The name of the Eet stream to connect. @@ -142,6 +149,7 @@ EAPI void ecore_con_eet_data_callback_del(Ecore_Con_Eet *ece, const char *name); /** * Register a raw data callback on a Ecore_Con_Eet object. + * When the Ecore_Con_Eet object is deleted, this automatically gets removed. * * @param ece An Ecore_Con_Eet object. * @param name The name of the raw Eet stream to connect. @@ -164,6 +172,7 @@ EAPI void ecore_con_eet_raw_data_callback_del(Ecore_Con_Eet *ece, const char *na * Register a client connect callback on a Ecore_Con_Eet object. * @brief This callback can be registered on the server program to know when a * client connects. + * When the Ecore_Con_Eet object is deleted, this automatically gets removed. * * @param ece An Ecore_Con_Eet object. * @param func The function to call as a callback. @@ -184,6 +193,7 @@ EAPI void ecore_con_eet_client_connect_callback_del(Ecore_Con_Eet *ece, Ecore_Co * Register a client disconnect callback on a Ecore_Con_Eet object. * @brief This callback can be registered on the server program to know when a * client disconnects. + * When the Ecore_Con_Eet object is deleted, this automatically gets removed. * * @param ece An Ecore_Con_Eet object. * @param func The function to call as a callback. @@ -204,6 +214,7 @@ EAPI void ecore_con_eet_client_disconnect_callback_del(Ecore_Con_Eet *ece, Ecore * Register a server connect callback on a Ecore_Con_Eet object. * @brief This callback can be registered on the client program to be called * when it has been connected to the server. + * When the Ecore_Con_Eet object is deleted, this automatically gets removed. * * @param ece An Ecore_Con_Eet object. * @param func The function to call as a callback. @@ -224,6 +235,7 @@ EAPI void ecore_con_eet_server_connect_callback_del(Ecore_Con_Eet *ece, Ecore_Co * Register a server disconnect callback on a Ecore_Con_Eet object. * @brief This callback can be registered on the client program to be called * when it has been disconnected from the server. + * When the Ecore_Con_Eet object is deleted, this automatically gets removed. * * @param ece An Ecore_Con_Eet object. * @param func The function to call as a callback. --
[EGIT] [apps/rage] master 01/01: Winlist: fix the trigger to hide the winlist
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/apps/rage.git/commit/?id=29b515cd0f0237a06141b5d7dd961f918ea9cf61
commit 29b515cd0f0237a06141b5d7dd961f918ea9cf61
Author: Daniel Zaoui
Date: Fri Aug 7 18:40:49 2015 +0300
Winlist: fix the trigger to hide the winlist
The winlist doesn't disappear when the mouse exits the winlist,
but when it reaches the left side of the app.
It is due to a wrong size of an Edje rectangle.
@fix
---
data/themes/default.edc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/themes/default.edc b/data/themes/default.edc
index 743d2f9..227ab8b 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -1805,7 +1805,7 @@ collections {
part { name: "listevent2"; type: RECT; repeat_events: 1;
description { state: "default" 0.0;
color: 0 0 0 0;
- rel2.relative: 0.2 1.0;
+ rel2.relative: 0.8 1.0;
}
}
program {
--
[EGIT] [core/efl] master 01/01: use SDL2 everywhere
vapier pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=f33a46ce1714d1d691e76a1c4b0db7edf097f8e8
commit f33a46ce1714d1d691e76a1c4b0db7edf097f8e8
Author: Mike Frysinger
Date: Thu Aug 6 00:40:43 2015 -0400
use SDL2 everywhere
Some files were still including SDL-1 headers even though we only link
against SDL2 libs.
URL: https://bugs.gentoo.org/551882
Reported-by: Barnaby
Reported-by: Romain Naour
---
configure.ac | 4 ++--
m4/evas_check_engine.m4 | 4 ++--
src/modules/evas/engines/gl_common/evas_gl_common.h | 4 ++--
src/modules/evas/engines/gl_sdl/Evas_Engine_GL_SDL.h | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/configure.ac b/configure.ac
index 8101347..5b51ea1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1958,13 +1958,13 @@ AC_SUBST([have_evas_engine_gl_xcb])
if test "x$have_evas_engine_gl_sdl" = "xyes" || test
"x$have_evas_engine_gl_sdl" = "xstatic" ; then
AC_CHECK_DECL([SDL_GL_CONTEXT_MAJOR_VERSION],
[AC_DEFINE([HAVE_SDL_GL_CONTEXT_VERSION], [1], [SDL_GL version
attributes present])],,
- [#include ])
+ [#include ])
fi
if test "${with_opengl}" = "es"; then
AC_CHECK_DECL([SDL_OPENGLES],
[AC_DEFINE([HAVE_SDL_FLAG_OPENGLES], [1], [SDL_OPENGLES flag is
present])],,
- [#include ])
+ [#include ])
fi
# OpenGL common
diff --git a/m4/evas_check_engine.m4 b/m4/evas_check_engine.m4
index 55135d1..8f54f2d 100644
--- a/m4/evas_check_engine.m4
+++ b/m4/evas_check_engine.m4
@@ -478,11 +478,11 @@ if test "x${have_dep}" = "xyes" ; then
evas_engine_[]$1[]_libs="${evas_engine_[]$1[]_libs} -lGL -lm $gl_pt_lib"
evas_engine_gl_common_libs="-lGL -lm $gl_pt_lib"
else
- AC_CHECK_HEADER([SDL/SDL_opengles.h],
+ AC_CHECK_HEADER([SDL2/SDL_opengles.h],
[have_egl="yes"],
[have_egl="no"],
[
-#include
+#include
#include
])
if test "x${have_egl}" = "xyes" ; then
diff --git a/src/modules/evas/engines/gl_common/evas_gl_common.h
b/src/modules/evas/engines/gl_common/evas_gl_common.h
index d40833b..1356610 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_common.h
+++ b/src/modules/evas/engines/gl_common/evas_gl_common.h
@@ -25,9 +25,9 @@
#else
# ifdef _EVAS_ENGINE_SDL_H
# ifdef GL_GLES
-# include
+# include
# else
-# include
+# include
# endif
# else
# ifdef GL_GLES
diff --git a/src/modules/evas/engines/gl_sdl/Evas_Engine_GL_SDL.h
b/src/modules/evas/engines/gl_sdl/Evas_Engine_GL_SDL.h
index de2370e..58f333e 100644
--- a/src/modules/evas/engines/gl_sdl/Evas_Engine_GL_SDL.h
+++ b/src/modules/evas/engines/gl_sdl/Evas_Engine_GL_SDL.h
@@ -1,7 +1,7 @@
#ifndef _EVAS_ENGINE_GL_SDL_H
#define _EVAS_ENGINE_GL_SDL_H
-#include
+#include
typedef struct _Evas_Engine_Info_GL_SDL Evas_Engine_Info_GL_SDL;
--
[EGIT] [core/efl] master 01/01: fix spurious quotes in msg output
vapier pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=05b25e19e2469595400702a75179670a23585c05
commit 05b25e19e2469595400702a75179670a23585c05
Author: Mike Frysinger
Date: Fri Aug 7 12:08:09 2015 -0400
fix spurious quotes in msg output
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 5b51ea1..88c54fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4014,7 +4014,7 @@ if test "x${have_ecore_evas_opengl_x11}" = "xyes" || test
"x${have_ecore_evas_op
[have_ecore_x_opengl_xcb="no"])
else
have_ecore_x_opengl_xcb="no"
- AC_MSG_NOTICE(["XCB-based OpenGL explicitly disabled"])
+ AC_MSG_NOTICE([XCB-based OpenGL explicitly disabled])
fi
fi
--
[EGIT] [core/enlightenment] master 03/04: print DBG infos for unhandled x11 client messages
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=262598a126db579e667be3349f24765b214770dd
commit 262598a126db579e667be3349f24765b214770dd
Author: Mike Blumenkrantz
Date: Fri Aug 7 13:36:00 2015 -0400
print DBG infos for unhandled x11 client messages
---
src/bin/e_comp_x.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c
index 5984fc4..eee80c6 100644
--- a/src/bin/e_comp_x.c
+++ b/src/bin/e_comp_x.c
@@ -2120,6 +2120,8 @@ _e_comp_x_message(void *data EINA_UNUSED, int type
EINA_UNUSED, Ecore_X_Event_Cl
}
}
#endif
+ else
+ DBG("missed client message '%s' for %u",
ecore_x_atom_name_get(ev->message_type), ev->win);
return ECORE_CALLBACK_PASS_ON;
}
--
[EGIT] [core/enlightenment] master 02/04: block screensaver activation during xwl dnd operations
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=004383a52e5ff561d04d2f77f3cf8fdfa2939740
commit 004383a52e5ff561d04d2f77f3cf8fdfa2939740
Author: Mike Blumenkrantz
Date: Fri Aug 7 12:52:44 2015 -0400
block screensaver activation during xwl dnd operations
---
src/modules/xwayland/dnd.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/modules/xwayland/dnd.c b/src/modules/xwayland/dnd.c
index 73636d7..0b89dd4 100644
--- a/src/modules/xwayland/dnd.c
+++ b/src/modules/xwayland/dnd.c
@@ -27,6 +27,7 @@ _xwayland_dnd_finish(void)
e_comp->wl_comp_data->drag_client = NULL;
e_comp->wl_comp_data->drag_source = NULL;
cur_fd = -1;
+ e_screensaver_inhibit_toggle(0);
}
static void
@@ -148,14 +149,12 @@ _xwl_fixes_selection_notify(void *d EINA_UNUSED, int t
EINA_UNUSED, Ecore_X_Even
source->cancelled = _xwayland_cancelled_send;
source->mime_types = namelist;
free(names);
+ e_screensaver_inhibit_toggle(1);
}
else
{
if (e_comp->wl_comp_data->drag)
e_object_del(E_OBJECT(e_comp->wl_comp_data->drag));
- ecore_x_window_hide(e_comp->cm_selection);
- e_comp->wl_comp_data->drag = NULL;
- e_comp->wl_comp_data->drag_client = NULL;
}
e_screensaver_inhibit_toggle(!!ev->owner);
return ECORE_CALLBACK_RENEW;
--
[EGIT] [core/enlightenment] master 04/04: force wl surface frame callbacks on commit for bufferless surfaces
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=cae58cea9f1023f39ab465e34a482f8445fa719b commit cae58cea9f1023f39ab465e34a482f8445fa719b Author: Mike Blumenkrantz Date: Fri Aug 7 13:47:38 2015 -0400 force wl surface frame callbacks on commit for bufferless surfaces #Kansas --- src/bin/e_comp_wl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c index 8f13eb5..6d4b267 100644 --- a/src/bin/e_comp_wl.c +++ b/src/bin/e_comp_wl.c @@ -2767,7 +2767,8 @@ e_comp_wl_surface_commit(E_Client *ec) Eina_Bool ignored; _e_comp_wl_surface_state_commit(ec, &ec->comp_data->pending); - e_comp_object_render_update_add(ec->frame); + if (!e_pixmap_usable_get(ec->pixmap)) + e_pixmap_image_clear(ec->pixmap, 1); ignored = ec->ignored; --
[EGIT] [core/enlightenment] master 01/04: track xwl dnd event handlers
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=f9bd731087c7da7d2d1712baaf2c29aeeff03011
commit f9bd731087c7da7d2d1712baaf2c29aeeff03011
Author: Mike Blumenkrantz
Date: Fri Aug 7 12:49:12 2015 -0400
track xwl dnd event handlers
---
src/modules/xwayland/dnd.c| 12 ++--
src/modules/xwayland/e_mod_main.c | 2 ++
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/modules/xwayland/dnd.c b/src/modules/xwayland/dnd.c
index 69ae9b5..73636d7 100644
--- a/src/modules/xwayland/dnd.c
+++ b/src/modules/xwayland/dnd.c
@@ -10,6 +10,8 @@ static Ecore_X_Atom xwl_dnd_atom;
static int32_t cur_fd = -1;
+static Eina_List *handlers;
+
static void
_xdnd_finish(Eina_Bool success)
{
@@ -193,10 +195,16 @@ dnd_init(void)
{
ecore_x_fixes_selection_notification_request(ecore_x_atom_get("CLIPBOARD"));
ecore_x_fixes_selection_notification_request(ECORE_X_ATOM_SELECTION_XDND);
- ecore_event_handler_add(ECORE_X_EVENT_FIXES_SELECTION_NOTIFY,
(Ecore_Event_Handler_Cb)_xwl_fixes_selection_notify, NULL);
- ecore_event_handler_add(ECORE_X_EVENT_SELECTION_NOTIFY,
(Ecore_Event_Handler_Cb)_xwl_selection_notify, NULL);
+ E_LIST_HANDLER_APPEND(handlers, ECORE_X_EVENT_FIXES_SELECTION_NOTIFY,
_xwl_fixes_selection_notify, NULL);
+ E_LIST_HANDLER_APPEND(handlers, ECORE_X_EVENT_SELECTION_NOTIFY,
_xwl_selection_notify, NULL);
xconvertselection = dlsym(NULL, "XConvertSelection");
string_atom = ecore_x_atom_get("UTF8_STRING");
xwl_dnd_atom = ecore_x_atom_get("E_XWL_DND_ATOM_HAHA");
e_comp_shape_queue();
}
+
+EINTERN void
+dnd_shutdown(void)
+{
+ E_FREE_LIST(handlers, ecore_event_handler_del);
+}
diff --git a/src/modules/xwayland/e_mod_main.c
b/src/modules/xwayland/e_mod_main.c
index 8cacc27..7bb78c1 100644
--- a/src/modules/xwayland/e_mod_main.c
+++ b/src/modules/xwayland/e_mod_main.c
@@ -4,6 +4,7 @@
#include
EINTERN void dnd_init(void);
+EINTERN void dnd_shutdown(void);
/* local structures */
typedef struct _E_XWayland_Server E_XWayland_Server;
@@ -407,6 +408,7 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED)
char path[256];
if (!exs) return 1;
+ dnd_shutdown();
unlink(exs->lock);
--
[EGIT] [core/enlightenment] master 01/01: wayland: Always add frame callbacks to current state on commit
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=15d13dad167bb97fdf747114b74cf89d53df632a commit 15d13dad167bb97fdf747114b74cf89d53df632a Author: Derek Foreman Date: Fri Aug 7 14:52:33 2015 -0400 wayland: Always add frame callbacks to current state on commit Summary: Previously we ignored it for unmapped surfaces. Reviewers: devilhorns, zmike Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D2932 --- src/bin/e_comp_wl.c | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c index 6d4b267..b6e4686 100644 --- a/src/bin/e_comp_wl.c +++ b/src/bin/e_comp_wl.c @@ -1131,6 +1131,12 @@ _e_comp_wl_surface_state_commit(E_Client *ec, E_Comp_Wl_Surface_State *state) state->sy = 0; state->new_attach = EINA_FALSE; + /* insert state frame callbacks into comp_data->frames +* NB: This clears state->frames list */ + ec->comp_data->frames = eina_list_merge(ec->comp_data->frames, + state->frames); + state->frames = NULL; + ec->ignored = ignored; if (!ec->comp_data->mapped) goto unmapped; @@ -1201,11 +1207,6 @@ _e_comp_wl_surface_state_commit(E_Client *ec, E_Comp_Wl_Surface_State *state) eina_tiler_free(tmp); } - /* insert state frame callbacks into comp_data->frames -* NB: This clears state->frames list */ - ec->comp_data->frames = eina_list_merge(ec->comp_data->frames, state->frames); - state->frames = NULL; - return; unmapped: --
[EGIT] [core/enlightenment] master 01/01: modules:mixer:pulse Update default sink
ceolin pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=7c195e383cdfb1a146e7707fa721e56ac3ad7aa6
commit 7c195e383cdfb1a146e7707fa721e56ac3ad7aa6
Author: Flavio Ceolin
Date: Sun Jul 26 20:33:07 2015 -0300
modules:mixer:pulse Update default sink
Update the default sink when it changes (for instance when it is changed
on pavucontrol).
---
src/modules/mixer/lib/backends/pulseaudio/pulse.c | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/modules/mixer/lib/backends/pulseaudio/pulse.c
b/src/modules/mixer/lib/backends/pulseaudio/pulse.c
index 382ccfc..a00ffb0 100644
--- a/src/modules/mixer/lib/backends/pulseaudio/pulse.c
+++ b/src/modules/mixer/lib/backends/pulseaudio/pulse.c
@@ -648,7 +648,15 @@ _subscribe_cb(pa_context *c, pa_subscription_event_type_t
t,
pa_operation_unref(o);
}
break;
-
+case PA_SUBSCRIPTION_EVENT_SERVER:
+ if (!(o = pa_context_get_server_info(c, _server_info_cb,
+data)))
+ {
+ERR("pa_context_get_server_info() failed");
+return;
+ }
+ pa_operation_unref(o);
+ break;
default:
WRN("Event not handled");
break;
--
[EGIT] [apps/rage] master 01/01: Delete Evas callbacks on win deletion
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/apps/rage.git/commit/?id=409361142de503d6aaa24ea4473281776244bc65
commit 409361142de503d6aaa24ea4473281776244bc65
Author: Daniel Zaoui
Date: Sat Aug 8 00:13:55 2015 +0300
Delete Evas callbacks on win deletion
A crash happens when a movie finishes and the program terminates.
An access to the "inf" data is done, although this data has been freed
during the win deletion.
It crashes only if the mouse is not over the progress bar.
@fix
---
src/bin/win.c | 13 +
1 file changed, 13 insertions(+)
diff --git a/src/bin/win.c b/src/bin/win.c
index 6a1e6d7..4e768e2 100644
--- a/src/bin/win.c
+++ b/src/bin/win.c
@@ -29,6 +29,8 @@ _cb_unfullscreen(void *data EINA_UNUSED, Evas_Object *obj,
void *event EINA_UNUS
}
static void
+_cb_mouse_move(void *data, Evas *evas, Evas_Object *obj, void *event_info);
+static void
_cb_win_del(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj,
void *ev EINA_UNUSED)
{
Inf *inf = evas_object_data_get(obj, "inf");
@@ -46,6 +48,17 @@ _cb_win_del(void *data EINA_UNUSED, Evas *e EINA_UNUSED,
Evas_Object *obj, void
if (vid->uri) efreet_uri_free(vid->uri);
free(vid);
}
+ evas_object_event_callback_del_full(inf->event, EVAS_CALLBACK_MOUSE_MOVE,
+ _cb_mouse_move, obj);
+ evas_object_event_callback_del_full(inf->event, EVAS_CALLBACK_MOUSE_IN,
+ _cb_mouse_move, obj);
+ evas_object_event_callback_del_full(inf->event, EVAS_CALLBACK_MOUSE_DOWN,
+ _cb_mouse_move, obj);
+ evas_object_event_callback_del_full(inf->event2, EVAS_CALLBACK_MOUSE_MOVE,
+ _cb_mouse_move, obj);
+ evas_object_event_callback_del_full(inf->event2, EVAS_CALLBACK_MOUSE_OUT,
+ _cb_mouse_move, obj);
+
evas_object_data_del(obj, "inf");
free(inf);
dnd_shutdown();
--
[EGIT] [core/enlightenment] master 01/01: wayland: force wl surface frame callbacks on commit for undamaged surfaces
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=f124f1bf6eb7d11dcc67c1b3c17dd7a0c73c17c8 commit f124f1bf6eb7d11dcc67c1b3c17dd7a0c73c17c8 Author: Derek Foreman Date: Fri Aug 7 17:20:05 2015 -0400 wayland: force wl surface frame callbacks on commit for undamaged surfaces Summary: Doing it just for bufferless surfaces wasn't quite enough, sometimes we get a sequence like: attach, commit, frame, commit And we need to respond to the frame. #Kansas Reviewers: zmike Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D2934 --- src/bin/e_comp_wl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c index b6e4686..97ed026 100644 --- a/src/bin/e_comp_wl.c +++ b/src/bin/e_comp_wl.c @@ -2768,7 +2768,7 @@ e_comp_wl_surface_commit(E_Client *ec) Eina_Bool ignored; _e_comp_wl_surface_state_commit(ec, &ec->comp_data->pending); - if (!e_pixmap_usable_get(ec->pixmap)) + if (!e_comp_object_damage_exists(ec->frame)) e_pixmap_image_clear(ec->pixmap, 1); ignored = ec->ignored; --
[EGIT] [core/enlightenment] master 02/02: implement wl->x11 dnd operations
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=8e211f1950aff7bbafdfed32989a164d6e74fa59
commit 8e211f1950aff7bbafdfed32989a164d6e74fa59
Author: Mike Blumenkrantz
Date: Fri Aug 7 21:06:47 2015 -0400
implement wl->x11 dnd operations
seems to work fine, large selection data (ref T2330) still untested
---
src/bin/e_comp_wl_data.c | 108
src/bin/e_dnd.c| 5 +-
src/modules/xwayland/dnd.c | 172 -
3 files changed, 251 insertions(+), 34 deletions(-)
diff --git a/src/bin/e_comp_wl_data.c b/src/bin/e_comp_wl_data.c
index d42fb0c..3de9920 100644
--- a/src/bin/e_comp_wl_data.c
+++ b/src/bin/e_comp_wl_data.c
@@ -281,22 +281,40 @@ _e_comp_wl_data_device_drag_finished(E_Drag *drag, int
dropped)
evas_object_hide(o);
evas_object_pass_events_set(o, 1);
if (e_comp->wl_comp_data->drag != drag) return;
+ e_comp->wl_comp_data->drag = NULL;
+ e_comp->wl_comp_data->drag_client = NULL;
+ e_screensaver_inhibit_toggle(0);
if (e_comp->wl_comp_data->selection.target && (!dropped))
{
-struct wl_resource *res;
-
-res =
e_comp_wl_data_find_for_client(wl_resource_get_client(e_comp->wl_comp_data->selection.target->comp_data->surface));
-if (res)
+#ifndef HAVE_WAYLAND_ONLY
+if (e_client_has_xwindow(e_comp->wl_comp_data->selection.target))
+ {
+
ecore_x_client_message32_send(e_client_util_win_get(e_comp->wl_comp_data->selection.target),
+ ECORE_X_ATOM_XDND_DROP, ECORE_X_EVENT_MASK_NONE,
+ e_comp->cm_selection, 0, ecore_x_current_time_get(), 0, 0);
+ }
+else
+#endif
{
- wl_data_device_send_drop(res);
- wl_data_device_send_leave(res);
+ struct wl_resource *res;
+
+ res =
e_comp_wl_data_find_for_client(wl_resource_get_client(e_comp->wl_comp_data->selection.target->comp_data->surface));
+ if (res)
+ {
+ wl_data_device_send_drop(res);
+ wl_data_device_send_leave(res);
+ }
+#ifndef HAVE_WAYLAND_ONLY
+ if ((e_comp->comp_type != E_PIXMAP_TYPE_X) && e_comp_util_has_x())
+ {
+ ecore_x_selection_owner_set(0, ECORE_X_ATOM_SELECTION_XDND,
0);
+ ecore_x_window_hide(e_comp->cm_selection);
+ }
+#endif
+ e_comp->wl_comp_data->selection.target = NULL;
+ e_comp->wl_comp_data->drag_source = NULL;
}
}
- e_comp->wl_comp_data->drag = NULL;
- e_comp->wl_comp_data->drag_client = NULL;
- e_comp->wl_comp_data->selection.target = NULL;
- e_comp->wl_comp_data->drag_source = NULL;
- e_screensaver_inhibit_toggle(0);
}
static void
@@ -346,6 +364,13 @@ _e_comp_wl_data_device_cb_drag_start(struct wl_client
*client, struct wl_resourc
if (ec)
e_drag_object_set(e_comp->wl_comp_data->drag, ec->frame);
e_drag_start(e_comp->wl_comp_data->drag, x, y);
+#ifndef HAVE_WAYLAND_ONLY
+ if ((e_comp->comp_type != E_PIXMAP_TYPE_X) && e_comp_util_has_x())
+ {
+ecore_x_window_show(e_comp->cm_selection);
+ecore_x_selection_owner_set(e_comp->cm_selection,
ECORE_X_ATOM_SELECTION_XDND, 0);
+ }
+#endif
if (e_comp->wl_comp_data->ptr.ec)
e_comp_wl_data_device_send_enter(e_comp->wl_comp_data->ptr.ec);
e_screensaver_inhibit_toggle(1);
@@ -675,38 +700,60 @@ e_comp_wl_data_device_send_enter(E_Client *ec)
uint32_t serial;
int x, y;
- if (e_client_has_xwindow(ec)) return;
- data_device_res =
-
e_comp_wl_data_find_for_client(wl_resource_get_client(ec->comp_data->surface));
- if (!data_device_res) return;
-
- offer_res = e_comp_wl_data_device_send_offer(ec);
- if (e_comp->wl_comp_data->selection.data_source && (!offer_res)) return;
+ if (e_client_has_xwindow(ec) &&
e_client_has_xwindow(e_comp->wl_comp_data->drag_client)) return;
+ if (!e_client_has_xwindow(ec))
+ {
+data_device_res =
+
e_comp_wl_data_find_for_client(wl_resource_get_client(ec->comp_data->surface));
+if (!data_device_res) return;
+offer_res = e_comp_wl_data_device_send_offer(ec);
+if (e_comp->wl_comp_data->drag_source && (!offer_res)) return;
+ }
e_comp->wl_comp_data->selection.target = ec;
evas_object_event_callback_add(ec->frame, EVAS_CALLBACK_DEL,
_e_comp_wl_data_device_target_del, ec);
#ifndef HAVE_WAYLAND_ONLY
- if (e_client_has_xwindow(e_comp->wl_comp_data->drag_client))
+ if (e_client_has_xwindow(ec))
{
int d1 = 0x5UL, d2, d3, d4;
+E_Comp_Wl_Data_Source *source;
+Eina_List *l;
d2 = d3 = d4 = 0;
+source = e_comp->wl_comp_data->drag_source;
+
+if (eina_list_count(source->mime_types) > 3)
+ {
+ const char *type, *types[eina_list_count(source->mime_types
[EGIT] [core/enlightenment] master 01/02: do not send wl dnd positioning updates to xwl clients
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=c696fa70883128ba7c3c9f4307468d50914836e7
commit c696fa70883128ba7c3c9f4307468d50914836e7
Author: Mike Blumenkrantz
Date: Fri Aug 7 21:04:07 2015 -0400
do not send wl dnd positioning updates to xwl clients
---
src/bin/e_comp_wl.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 97ed026..fbf4723 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -903,7 +903,9 @@ _e_comp_wl_cb_mouse_move(void *d EINA_UNUSED, int t
EINA_UNUSED, Ecore_Event_Mou
e_comp->wl_comp_data->ptr.x = wl_fixed_from_int(ev->x);
e_comp->wl_comp_data->ptr.y = wl_fixed_from_int(ev->y);
e_screensaver_notidle();
- if (e_comp->wl_comp_data->selection.target && e_comp->wl_comp_data->drag)
+ if (e_comp->wl_comp_data->selection.target &&
+ (!e_client_has_xwindow(e_comp->wl_comp_data->selection.target)) &&
+ e_comp->wl_comp_data->drag)
{
struct wl_resource *res;
int x, y;
--
