Re: [E-devel] [EGIT] [core/elementary] master 01/06: Adding elm_tooltip_movement_lock_set() and elm_tooltip_movement_lock_get()
elm_tooltip_movement_lock_set() ? how about _freeze_set() ? we already use the freeze word entirely. -Regards, Hermet- -Original Message- From: abhia.aryadi...@samsung.com To: g...@lists.enlightenment.org; Cc: Sent: 2014-01-13 (월) 15:47:26 Subject: [EGIT] [core/elementary] master 01/06: Adding elm_tooltip_movement_lock_set() and elm_tooltip_movement_lock_get() raster pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=1832450176b188773557c39e5cf1eee0f47a8858 commit 1832450176b188773557c39e5cf1eee0f47a8858 Author: abhi a.aryadipta@samsung.com Date: Mon Jan 13 15:22:47 2014 +0900 Adding elm_tooltip_movement_lock_set() and elm_tooltip_movement_lock_get() Summary: These APIs allow to enable/disable a tooltip to move with respect to mouse pointer Test Plan: elm_tooltip_movement_lock_set(), elm_tooltip_movement_lock_get(), elementary_test -to tooltip Reviewers: singh.amitesh, seoz, raster Reviewed By: raster CC: raster Differential Revision: https://phab.enlightenment.org/D369 --- ChangeLog4 NEWS 2 ++ src/bin/test_tooltip.c 24 src/lib/elm_tooltip.h 32 src/lib/els_tooltip.c 29 - 5 files changed, 86 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 56975bb..f845744 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1772,3 +1772,7 @@ 2013-12-01 Mike Blumenkrantz * fix mouse eventing on e border theme + +2013-12-09 Abhinandan Aryadipta (aryarockstar) + +* tooltip: Added elm_tooltip_move_lock_set() and elm_tooltip_move_lock_get(). diff --git a/NEWS b/NEWS index 85da746..a32848f 100644 --- a/NEWS +++ b/NEWS @@ -7,6 +7,8 @@ Changes since Elementary 1.8.0: Additions: + * Add elm_tooltip_move_lock_set() and elm_tooltip_move_lock_get() + Improvements: Fixes: diff --git a/src/bin/test_tooltip.c b/src/bin/test_tooltip.c index 332eced..d5ac0af 100644 --- a/src/bin/test_tooltip.c +++ b/src/bin/test_tooltip.c @@ -200,6 +200,23 @@ _tt_text_replace(void *data EINA_UNUSED, } static void +_tt_move_lock(void *data EINA_UNUSED, + Evas_Object *obj, + void *event_info EINA_UNUSED) +{ + if (!elm_tooltip_move_lock_get(obj)) + { +elm_tooltip_move_lock_set(obj, EINA_TRUE); +elm_object_tooltip_text_set(obj, Locked); + } + else + { +elm_tooltip_move_lock_set(obj, EINA_FALSE); +elm_object_tooltip_text_set(obj, Free); + } +} + +static void _tt_orient_text_replace(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) @@ -489,6 +506,13 @@ test_tooltip(void *data EINA_UNUSED, evas_object_show(bt); bt = elm_button_add(win); + elm_object_text_set(bt, Movement Lock Tooltip, click to change); + elm_object_tooltip_text_set(bt, Free); + evas_object_smart_callback_add(bt, clicked, _tt_move_lock, NULL); + elm_box_pack_end(bx, bt); + evas_object_show(bt); + + bt = elm_button_add(win); elm_object_text_set(bt, Orient Tooltip, click to change); elm_object_tooltip_text_set(bt, Top Left); elm_object_tooltip_orient_set(bt, ELM_TOOLTIP_ORIENT_TOP_LEFT); diff --git a/src/lib/elm_tooltip.h b/src/lib/elm_tooltip.h index 21bbfcd..3b1c76a 100644 --- a/src/lib/elm_tooltip.h +++ b/src/lib/elm_tooltip.h @@ -33,6 +33,38 @@ typedef enum } Elm_Tooltip_Orient; /** + * @def elm_tooltip_move_lock_set + * @since 1.9 + * + * @brief Enable/Disable tooltip movement with respect to mouse pointer + * + * @param[in] obj The tooltip's anchor object + * @param[in] lock If EINA_TRUE, tooltip movement with respect to mouse pointer is disabled + * + * This function allows to enable/disable a tooltip to move with respect to mouse pointer + * + * @ingroup Tooltips + * @see elm_tooltip_move_lock_get + */ +EAPI void elm_tooltip_move_lock_set(Evas_Object *obj, Eina_Bool lock); + +/** + * @def elm_tooltip_move_lock_get + * @since 1.9 + * + * @brief Get the lock status of tooltip movement with respect to mouse pointer + * + * @param[in] obj The tooltip's anchor object + * @return The lock status of tooltip movement with respect to mouse pointer + * + * This function returns the status of tooltip movement with respect to mouse pointer + * + * @ingroup Tooltips + * @see elm_tooltip_move_lock_set + */ +EAPI Eina_Bool elm_tooltip_move_lock_get(const Evas_Object *obj); + +/** * @def elm_object_tooltip_orient_set * @since 1.9 * diff --git a/src/lib/els_tooltip.c b/src/lib/els_tooltip.c index 5606123..867ad84 100644 --- a/src/lib/els_tooltip.c +++ b/src/lib/els_tooltip.c @@ -58,6 +58,7 @@ struct _Elm_Tooltip } rel_pos; Elm_Tooltip_Orient orient; /** orientation for tooltip */ double hide_timeout;
[EGIT] [core/elementary] master 01/01: ChangeLog/NEWS: Removed unnecessary ChangeLog and NEWS entries.
seoz pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=cc9e53437478e8f797126e4e132c76659b046696 commit cc9e53437478e8f797126e4e132c76659b046696 Author: Daniel Juyung Seo seojuyu...@gmail.com Date: Wed Jan 15 17:30:12 2014 +0900 ChangeLog/NEWS: Removed unnecessary ChangeLog and NEWS entries. We do not modify them at every commit after 1.8 release. These are changed by stefan when it does release. --- ChangeLog | 12 NEWS | 2 -- 2 files changed, 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index f845744..663a5c5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1764,15 +1764,3 @@ 2013-12-01 Carsten Haitzler (The Rasterman) * 1.8 release - -2013-12-01 Abhinandan Aryadipta (aryarockstar) - -* tooltip: Added elm_object_tooltip_orient_set() and elm_object_tooltip_orient_get(). - -2013-12-01 Mike Blumenkrantz - -* fix mouse eventing on e border theme - -2013-12-09 Abhinandan Aryadipta (aryarockstar) - -* tooltip: Added elm_tooltip_move_lock_set() and elm_tooltip_move_lock_get(). diff --git a/NEWS b/NEWS index a32848f..85da746 100644 --- a/NEWS +++ b/NEWS @@ -7,8 +7,6 @@ Changes since Elementary 1.8.0: Additions: - * Add elm_tooltip_move_lock_set() and elm_tooltip_move_lock_get() - Improvements: Fixes: --
[EGIT] [core/efl] master 01/04: Textblock: Fix padding computation (part 1)
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=6970a020c1b4b61370f418e63a1eb4a6a973e667 commit 6970a020c1b4b61370f418e63a1eb4a6a973e667 Author: Jean-Philippe Andre jp.an...@samsung.com Date: Wed Jan 8 15:28:49 2014 +0900 Textblock: Fix padding computation (part 1) Track padding per paragraph, since this is how it is computed. Problem before this patch: - If markup text is changed, padding may grow, and the layout is updated (good) - If the UI itself needs a relayout, the old padding value is NOT reused, so style paddings will reset the padding to 0. Test protocol: - Set some text with style=glow. The whole object should have padding 2,2,2,2 - Relayout the UI, the whole object will have padding 0,0,0,0 (should be 2,2,2,2) --- src/lib/evas/canvas/evas_object_textblock.c | 34 ++--- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c index 00755b3..8e47a10 100644 --- a/src/lib/evas/canvas/evas_object_textblock.c +++ b/src/lib/evas/canvas/evas_object_textblock.c @@ -291,6 +291,9 @@ struct _Evas_Object_Textblock_Node_Format const char *orig_format; Evas_Object_Textblock_Node_Text*text_node; size_t offset; + struct { + unsigned char l, r, t, b; + } pad; unsigned char anchor : 2; Eina_Bool opener : 1; Eina_Bool own_closer : 1; @@ -4932,11 +4935,10 @@ _layout_pre(Ctxt *c, int *style_pad_l, int *style_pad_r, int *style_pad_t, { Evas_Object *eo_obj = c-obj; Evas_Object_Textblock *o = c-o; + /* Mark text nodes as dirty if format have changed. */ - if (c-o-format_changed) - { -_format_changes_invalidate_text_nodes(c); - } + if (o-format_changed) + _format_changes_invalidate_text_nodes(c); if (o-content_changed) { @@ -4994,9 +4996,19 @@ _layout_pre(Ctxt *c, int *style_pad_l, int *style_pad_r, int *style_pad_t, { /* Only do this if this actually changes format */ if (fnode-format_change) - _layout_do_format(eo_obj, c, c-fmt, fnode, - style_pad_l, style_pad_r, - style_pad_t, style_pad_b, EINA_FALSE); + { + int pl = 0, pr = 0, pt = 0, pb = 0; + _layout_do_format(eo_obj, c, c-fmt, fnode, + pl, pr, pt, pb, EINA_FALSE); + fnode-pad.l = pl; + fnode-pad.r = pr; + fnode-pad.t = pt; + fnode-pad.b = pb; + } +if (fnode-pad.l *style_pad_l) *style_pad_l = fnode-pad.l; +if (fnode-pad.r *style_pad_r) *style_pad_r = fnode-pad.r; +if (fnode-pad.t *style_pad_t) *style_pad_t = fnode-pad.t; +if (fnode-pad.b *style_pad_b) *style_pad_b = fnode-pad.b; fnode = _NODE_FORMAT(EINA_INLIST_GET(fnode)-next); } continue; @@ -5078,7 +5090,13 @@ _layout_pre(Ctxt *c, int *style_pad_l, int *style_pad_r, int *style_pad_t, o-paragraphs = c-paragraphs; c-par = NULL; } - + else + { +if (o-style_pad.l *style_pad_l) *style_pad_l = o-style_pad.l; +if (o-style_pad.r *style_pad_r) *style_pad_r = o-style_pad.r; +if (o-style_pad.t *style_pad_t) *style_pad_t = o-style_pad.t; +if (o-style_pad.b *style_pad_b) *style_pad_b = o-style_pad.b; + } } /** --
[EGIT] [core/efl] master 03/04: Textblock: Relayout if needed in line geometry get
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=908785b60da60cfc3ee5a41ab746173d151cfb20 commit 908785b60da60cfc3ee5a41ab746173d151cfb20 Author: Jean-Philippe Andre jp.an...@samsung.com Date: Fri Jan 10 11:43:04 2014 +0900 Textblock: Relayout if needed in line geometry get evas_object_textblock_line_number_geometry_get() did not trigger a relayout, so it could end up returning FALSE and invalid values. --- src/lib/evas/canvas/evas_object_textblock.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c index 6a56956..e7bdf93 100644 --- a/src/lib/evas/canvas/evas_object_textblock.c +++ b/src/lib/evas/canvas/evas_object_textblock.c @@ -10339,9 +10339,12 @@ _textblock_line_number_geometry_get(Eo *eo_obj, void *_pd EINA_UNUSED, va_list * Evas_Coord *cw = va_arg(*list, Evas_Coord *); Evas_Coord *ch = va_arg(*list, Evas_Coord *); Eina_Bool *result = va_arg(*list, Eina_Bool *); + const Evas_Object_Textblock *o = _pd; Evas_Object_Textblock_Line *ln; + _relayout_if_needed(eo_obj, o); + ln = _find_layout_line_num(eo_obj, line); if (!ln) { --
[EGIT] [core/efl] master 04/04: Textblock: Add test cases for style padding
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=cc82e2ded51d1a86daac367c92cd0876d2f5439b commit cc82e2ded51d1a86daac367c92cd0876d2f5439b Author: Jean-Philippe Andre jp.an...@samsung.com Date: Fri Jan 10 11:15:48 2014 +0900 Textblock: Add test cases for style padding In the previous commit, style padding has been changed, so that lines don't get extra space just because there's a special style (glow, ...) This adds some test cases that check the actual geometry of the lines relatively to each other. NOTE: This test does not fail before the padding commits, as _relayout_if_needed() adjusts the padding properly. --- src/tests/evas/evas_test_textblock.c | 31 +++ 1 file changed, 31 insertions(+) diff --git a/src/tests/evas/evas_test_textblock.c b/src/tests/evas/evas_test_textblock.c index 643ad5a..c21c867 100644 --- a/src/tests/evas/evas_test_textblock.c +++ b/src/tests/evas/evas_test_textblock.c @@ -2581,6 +2581,37 @@ START_TEST(evas_textblock_style) evas_object_textblock_style_insets_get(tb, l, r, t, b); fail_if((l != 1) || (r != 4) || (t != 1) || (b != 4)); + /* Multi-line padding */ + { + Evas_Coord x[5] = {0}, y[5] = {0}, w[5] = {0}, h[5] = {0}; + + // w, h should not change between test 1 and 2 + // insets and x, y should increase by 2 + // line 1 in test 2 should have same geometry as in test 1 (despite style) + + evas_object_textblock_text_markup_set(tb, Testbr/Test); + evas_object_textblock_line_number_geometry_get(tb, 0, x[0], y[0], w[0], h[0]); + evas_object_textblock_line_number_geometry_get(tb, 1, x[1], y[1], w[1], h[1]); + + // check line 1 geometry relatively to line 0 + fail_if((x[0] != x[1]) || ((y[0] + h[0]) != y[1]) || (w[0] != w[1]) || (h[0] != h[1])); + + evas_object_textblock_text_markup_set(tb, Testbr/style=glowTest/br/Test); + evas_object_textblock_style_insets_get(tb, l, r, t, b); + evas_object_textblock_line_number_geometry_get(tb, 0, x[2], y[2], w[2], h[2]); + evas_object_textblock_line_number_geometry_get(tb, 1, x[3], y[3], w[3], h[3]); + evas_object_textblock_line_number_geometry_get(tb, 2, x[4], y[4], w[4], h[4]); + + // check line 1 geometry relatively to line 0 + fail_if((x[2] != x[3]) || ((y[2] + h[2]) != y[3]) || (w[2] != w[3]) || (h[2] != h[3])); + + // check padding is correct + fail_if((x[2] != (x[0] + l)) || (y[2] != (y[0] + t))); + + // line 2 should not suffer from padding in line 1, as it is globally applied + fail_if((x[4] != x[2]) || ((y[2] + h[2] + h[3]) != y[4])); + } + /* No font */ evas_textblock_style_set(newst, DEFAULT=''); evas_object_textblock_text_markup_set(tb, Test); --
[EGIT] [core/efl] master 02/04: Textblock: Fix padding with styles (part 2)
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=9860af0b35fb1a2d4bc0b63d5ac0d20cdba3321c commit 9860af0b35fb1a2d4bc0b63d5ac0d20cdba3321c Author: Jean-Philippe Andre jp.an...@samsung.com Date: Wed Jan 8 16:39:46 2014 +0900 Textblock: Fix padding with styles (part 2) Summary: If ONE single item in the whole textblock has a padding of k, then ALL the lines of the textblock will be padded by k pixels. Here's a solution to add the padding only to the first line. Test Plan: Write any multiline text, without styles, in an entry. Add some glow to one element. All lines should be spaced by an extra 2 pixels. Reviewers: tasn CC: cedric Differential Revision: https://phab.enlightenment.org/D442 --- src/lib/evas/canvas/evas_object_textblock.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c index 8e47a10..6a56956 100644 --- a/src/lib/evas/canvas/evas_object_textblock.c +++ b/src/lib/evas/canvas/evas_object_textblock.c @@ -3433,7 +3433,7 @@ loop_advance: if ((it-x + it-adv) c-ln-w) c-ln-w = it-x + it-adv; } - c-ln-y = (c-y - c-par-y) + c-o-style_pad.t; + c-ln-y = c-y - c-par-y; c-ln-h = c-ascent + c-descent; /* Handle max ascent and descent if at the edges */ @@ -3448,6 +3448,8 @@ loop_advance: ascdiff = c-maxascent - c-ascent; c-ln-y += ascdiff; c-y += ascdiff; + c-ln-y += c-o-style_pad.t; + c-y += c-o-style_pad.t; } } --
Re: [E-devel] [EGIT] [core/elementary] master 01/06: Adding elm_tooltip_movement_lock_set() and elm_tooltip_movement_lock_get()
On Wednesday, January 15, 2014, ChunEon Park wrote: elm_tooltip_movement_lock_set() ? how about _freeze_set() ? we already use the freeze word entirely. Those have a different meaning. -Regards, Hermet- -Original Message- From: abhia.aryadi...@samsung.com To: g...@lists.enlightenment.org; Cc: Sent: 2014-01-13 (월) 15:47:26 Subject: [EGIT] [core/elementary] master 01/06: Adding elm_tooltip_movement_lock_set() and elm_tooltip_movement_lock_get() raster pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=1832450176b188773557c39e5cf1eee0f47a8858 commit 1832450176b188773557c39e5cf1eee0f47a8858 Author: abhi a.aryadipta@samsung.com Date: Mon Jan 13 15:22:47 2014 +0900 Adding elm_tooltip_movement_lock_set() and elm_tooltip_movement_lock_get() Summary: These APIs allow to enable/disable a tooltip to move with respect to mouse pointer Test Plan: elm_tooltip_movement_lock_set(), elm_tooltip_movement_lock_get(), elementary_test -to tooltip Reviewers: singh.amitesh, seoz, raster Reviewed By: raster CC: raster Differential Revision: https://phab.enlightenment.org/D369 --- ChangeLog4 NEWS 2 ++ src/bin/test_tooltip.c 24 src/lib/elm_tooltip.h 32 src/lib/els_tooltip.c 29 - 5 files changed, 86 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 56975bb..f845744 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1772,3 +1772,7 @@ 2013-12-01 Mike Blumenkrantz * fix mouse eventing on e border theme + +2013-12-09 Abhinandan Aryadipta (aryarockstar) + +* tooltip: Added elm_tooltip_move_lock_set() and elm_tooltip_move_lock_get(). diff --git a/NEWS b/NEWS index 85da746..a32848f 100644 --- a/NEWS +++ b/NEWS @@ -7,6 +7,8 @@ Changes since Elementary 1.8.0: Additions: + * Add elm_tooltip_move_lock_set() and elm_tooltip_move_lock_get() + Improvements: Fixes: diff --git a/src/bin/test_tooltip.c b/src/bin/test_tooltip.c index 332eced..d5ac0af 100644 --- a/src/bin/test_tooltip.c +++ b/src/bin/test_tooltip.c @@ -200,6 +200,23 @@ _tt_text_replace(void *data EINA_UNUSED, } static void +_tt_move_lock(void *data EINA_UNUSED, + Evas_Object *obj, + void *event_info EINA_UNUSED) +{ + if (!elm_tooltip_move_lock_get(obj)) + { +elm_tooltip_move_lock_set(obj, EINA_TRUE); +elm_object_tooltip_text_set(obj, Locked); + } + else + { +elm_tooltip_move_lock_set(obj, EINA_FALSE); +elm_object_tooltip_text_set(obj, Free); + } +} + +static void _tt_orient_text_replace(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) @@ -489,6 +506,13 @@ test_tooltip(void *data EINA_UNUSED, evas_object_show(bt); bt = elm_button_add(win); + elm_object_text_set(bt, Movement Lock Tooltip, click to change); + elm_object_tooltip_text_set(bt, Free); + evas_object_smart_callback_add(bt, clicked, _tt_move_lock, NULL); + elm_box_pack_end(bx, bt); + evas_object_show(bt); + + bt = elm_button_add(win); elm_object_text_set(bt, Orient Tooltip, click to -- CenturyLink Cloud: The Leader in Enterprise Cloud Services. Learn Why More Businesses Are Choosing CenturyLink Cloud For Critical Workloads, Development Environments Everything In Between. Get a Quote or Start a Free Trial Today. http://pubads.g.doubleclick.net/gampad/clk?id=119420431iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net javascript:; https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- CenturyLink Cloud: The Leader in Enterprise Cloud Services. Learn Why More Businesses Are Choosing CenturyLink Cloud For Critical Workloads, Development Environments Everything In Between. Get a Quote or Start a Free Trial Today. http://pubads.g.doubleclick.net/gampad/clk?id=119420431iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/elementary] master 01/06: Adding elm_tooltip_movement_lock_set() and elm_tooltip_movement_lock_get()
there freeze() apis meaning all are different but simliar. for consistency i suggested. -Regards, Hermet- -Original Message- From: Iván Brianosachi...@gmail.com To: Enlightenment developer listenlightenment-devel@lists.sourceforge.net; Cc: g...@lists.enlightenment.orgg...@lists.enlightenment.org; Sent: 2014-01-15 (수) 18:10:08 Subject: Re: [E-devel] [EGIT] [core/elementary] master 01/06: Adding elm_tooltip_movement_lock_set() and elm_tooltip_movement_lock_get() On Wednesday, January 15, 2014, ChunEon Park wrote: elm_tooltip_movement_lock_set() ? how about _freeze_set() ? we already use the freeze word entirely. Those have a different meaning. -Regards, Hermet- -Original Message- From: abhia.aryadipta@samsung.com To: git@lists.enlightenment.org; Cc: Sent: 2014-01-13 (월) 15:47:26 Subject: [EGIT] [core/elementary] master 01/06: Adding elm_tooltip_movement_lock_set() and elm_tooltip_movement_lock_get() raster pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=1832450176b188773557c39e5cf1eee0f47a8858 commit 1832450176b188773557c39e5cf1eee0f47a8858 Author: abhi a.aryadipta@samsung.com Date: Mon Jan 13 15:22:47 2014 +0900 Adding elm_tooltip_movement_lock_set() and elm_tooltip_movement_lock_get() Summary: These APIs allow to enable/disable a tooltip to move with respect to mouse pointer Test Plan: elm_tooltip_movement_lock_set(), elm_tooltip_movement_lock_get(), elementary_test -to tooltip Reviewers: singh.amitesh, seoz, raster Reviewed By: raster CC: raster Differential Revision: https://phab.enlightenment.org/D369 --- ChangeLog4 NEWS 2 ++ src/bin/test_tooltip.c 24 src/lib/elm_tooltip.h 32 src/lib/els_tooltip.c 29 - 5 files changed, 86 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 56975bb..f845744 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1772,3 +1772,7 @@ 2013-12-01 Mike Blumenkrantz * fix mouse eventing on e border theme + +2013-12-09 Abhinandan Aryadipta (aryarockstar) + +* tooltip: Added elm_tooltip_move_lock_set() and elm_tooltip_move_lock_get(). diff --git a/NEWS b/NEWS index 85da746..a32848f 100644 --- a/NEWS +++ b/NEWS @@ -7,6 +7,8 @@ Changes since Elementary 1.8.0: Additions: + * Add elm_tooltip_move_lock_set() and elm_tooltip_move_lock_get() + Improvements: Fixes: diff --git a/src/bin/test_tooltip.c b/src/bin/test_tooltip.c index 332eced..d5ac0af 100644 --- a/src/bin/test_tooltip.c +++ b/src/bin/test_tooltip.c @@ -200,6 +200,23 @@ _tt_text_replace(void *data EINA_UNUSED, } static void +_tt_move_lock(void *data EINA_UNUSED, + Evas_Object *obj, + void *event_info EINA_UNUSED) +{ + if (!elm_tooltip_move_lock_get(obj)) + { +elm_tooltip_move_lock_set(obj, EINA_TRUE); +elm_object_tooltip_text_set(obj, Locked); + } + else + { +elm_tooltip_move_lock_set(obj, EINA_FALSE); +elm_object_tooltip_text_set(obj, Free); + } +} + +static void _tt_orient_text_replace(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) @@ -489,6 +506,13 @@ test_tooltip(void *data EINA_UNUSED, evas_object_show(bt); bt = elm_button_add(win); + elm_object_text_set(bt, Movement Lock Tooltip, click to change); + elm_object_tooltip_text_set(bt, Free); + evas_object_smart_callback_add(bt, clicked, _tt_move_lock, NULL); + elm_box_pack_end(bx, bt); + evas_object_show(bt); + + bt = elm_button_add(win); elm_object_text_set(bt, Orient Tooltip, click to -- CenturyLink Cloud: The Leader in Enterprise Cloud Services. Learn Why More Businesses Are Choosing CenturyLink Cloud For Critical Workloads, Development Environments Everything In Between. Get a Quote or Start a Free Trial Today. http://pubads.g.doubleclick.net/gampad/clk?id=119420431iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net javascript:; https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- CenturyLink Cloud: The Leader in Enterprise Cloud Services. Learn Why More Businesses Are Choosing CenturyLink Cloud For Critical Workloads, Development Environments Everything In Between. Get a Quote or Start a Free Trial Today. http://pubads.g.doubleclick.net/gampad/clk?id=119420431iu=/4140/ostg.clktrk ___
[EGIT] [admin/devs] master 01/01: Quaker: Added work pubkey.
tasn pushed a commit to branch master. http://git.enlightenment.org/admin/devs.git/commit/?id=5aa647fcd3a6a5d23f7a44eb052c2f34763fcb9c commit 5aa647fcd3a6a5d23f7a44eb052c2f34763fcb9c Author: Tom Hacohen t...@stosb.com Date: Wed Jan 15 10:31:39 2014 + Quaker: Added work pubkey. --- developers/quaker/id_rsa_work.pub | 1 + 1 file changed, 1 insertion(+) diff --git a/developers/quaker/id_rsa_work.pub b/developers/quaker/id_rsa_work.pub new file mode 100644 index 000..68d04b3 --- /dev/null +++ b/developers/quaker/id_rsa_work.pub @@ -0,0 +1 @@ +ssh-rsa B3NzaC1yc2EDAQABAAABAQC6GYD1LJLumip18d4sGO1kO/qeciHVTSFADORRHS+Cdm2FySeRk0QOjMr4GGPrAeX0P+Wxp1UOjnmNNPJRkiT9F5KcGd4ZTitixB3nvQxNeoOTOGoZEyVWcknotr+wD1QwOcZnMJwZhwhP+Y7uG2XMdSVfbkpNz+XpVEqcXZEgEajOkY6twerNBJrQ+WNZLviLNRJpWmUyny9k4RZ1XNIN/gFqW9JqyM9TWN8Tvt1XklF6MjqQM089KJ9ycAw61g7cYtuwhbcNXuJqma7+fmdCJu5GbkP6NPd6uasErbwC1dMNns0Vv5kQ7TIKHEbgTR1VHFOb0GtXNmh+ylZng/e9 dkolesa@sruk --
[EGIT] [core/elementary] master 01/01: e19 - deskmirror - use proper scaling for mini frames
raster pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=20d7dc9d4d9edc8e827c047db1553927c46db13a commit 20d7dc9d4d9edc8e827c047db1553927c46db13a Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Wed Jan 15 20:13:13 2014 +0900 e19 - deskmirror - use proper scaling for mini frames --- data/themes/edc/deskmirror.edc | 231 +++-- 1 file changed, 108 insertions(+), 123 deletions(-) diff --git a/data/themes/edc/deskmirror.edc b/data/themes/edc/deskmirror.edc index 5a81ed9..7af5ef8 100644 --- a/data/themes/edc/deskmirror.edc +++ b/data/themes/edc/deskmirror.edc @@ -3,34 +3,27 @@ group { name: e/deskmirror/frame/default; alias: e/deskmirror/frame/urgent; alias: e/deskmirror/frame/sparkle; images.image: win_shadow.png COMP; + images.image: shine.png COMP; + images.image: vgrad_med_lighter.png COMP; + images.image: vgrad_med_dark.png COMP; + images.image: bevel_out.png COMP; + images.image: bevel_dark_out.png COMP; script { public message(Msg_Type:type, id, ...) { - /* set scale */ - new sc; - - sc = getarg(2); - custom_state(PART:title2, default, 0.0); - custom_state(PART:top, default, 0.0); - custom_state(PART:e.text.title, default, 0.0); - custom_state(PART:bottom, default, 0.0); - set_state_val(PART:title2, STATE_REL1, 0, 0.0 - sc); - set_state_val(PART:top, STATE_REL1, 0, 0.0 - sc); - set_state_val(PART:e.text.title, STATE_REL1, 0, 0.0 - sc); - set_state_val(PART:bottom, STATE_REL2, 1, sc); - set_state(PART:title2, custom, 0.0); - set_state(PART:top, custom, 0.0); - set_state(PART:e.text.title, custom, 0.0); - set_state(PART:e.swallow.client, custom, 0.0); - set_state(PART:bottom, custom, 0.0); + if ((type == MSG_FLOAT) (id == 0)) { +new Float:sc = getfarg(2); + +custom_state(PART:top_spacer, default, 0.0); +set_state_val(PART:top_spacer, STATE_REL2, 1.0, sc); +set_state(PART:top_spacer, custom, 0.0); + +custom_state(PART:bottom_spacer, default, 0.0); +set_state_val(PART:bottom_spacer, STATE_REL1, 0.0, 1.0 - sc); +set_state(PART:bottom_spacer, custom, 0.0); + } } } parts { - part { name: client_clip; type: RECT; - description { state: default 0.0; -rel1.to_y: e.swallow.client; -rel2.to_y: e.swallow.client; - } - } part { name: spacer; type: SPACER; description { state: default; } @@ -39,36 +32,65 @@ group { name: e/deskmirror/frame/default; rel2.relative: 0.0 1.0; } } - part { name: e.swallow.client; type: SWALLOW; - clip_to: client_clip; + part { name: top_spacer; type: SPACER; description { state: default 0.0; -rel1.to_y: top; -rel1.relative: 0 1; -rel2.to: spacer; - } - } - part { name: top; - description { state: default 0.0; -color_class: border_top; -image.normal: vgrad_med_lighter.png; -fill.smooth: 0; -TILED_HORIZ(120) rel1.to: spacer; +rel2.to_x: spacer; rel2.to_y: title2; rel2.offset: -1 -4; +align: 0.5 0.0; + } + } + part { name: bottom_spacer; type: SPACER; + description { state: default 0.0; +rel1.to: bottom_size; +rel2.to: bottom_size; +align: 0.5 1.0; + } + } + part { name: bottom_size; type: SPACER; + description { state: default 0.0; +rel1.to_x: spacer; +rel1.relative: 0.0 1.0; +rel1.offset: 0 -3; +rel2.to: spacer; min: 0 1; +fixed: 0 1; } } - part { name: bevel; mouse_events: 0; + part { name: shadow; + mouse_events: 0; description { state: default 0.0; -image.normal: bevel_out.png; -image.border: 1 1 1 1; +image.normal: win_shadow.png; +image.border: 7 7 3 12; image.middle: 0; rel1.to: top; -rel2.to: top; +rel1.offset: -7 -3; +rel2.to: bottom; +rel2.offset: 6 11; fill.smooth: 0; } } + + + part { name: client_clip; type: RECT; + description { state: default 0.0; +rel1.to_y: top; +rel1.relative: 0.0 1.0; +rel2.to_y: bottom; +rel2.relative: 1.0 0.0; + } + } + part { name: e.swallow.client; type: SWALLOW; + clip_to: client_clip; + description { state: default 0.0; +rel1.to_y: top; +rel1.relative: 0.0 1.0; +
[EGIT] [core/enlightenment] master 01/01: deskmirror - set scale factor nicely.
raster pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=9fbb5def7f41f59ce825cfb92874655ff7b3ad93 commit 9fbb5def7f41f59ce825cfb92874655ff7b3ad93 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Wed Jan 15 20:04:56 2014 +0900 deskmirror - set scale factor nicely. --- src/bin/e_deskmirror.c | 13 - 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/bin/e_deskmirror.c b/src/bin/e_deskmirror.c index aeb822d..4665656 100644 --- a/src/bin/e_deskmirror.c +++ b/src/bin/e_deskmirror.c @@ -99,17 +99,13 @@ _mirror_visible_apply(Mirror *m) static void _mirror_scale_set(Mirror *m, float sc) { - Edje_Message_Float_Set msg; + Edje_Message_Float msg; Mirror_Border *mb; - /* FIXME: broken */ - return; if (!m-frame) return; - mb = evas_object_smart_data_get(m-mirror); - msg.count = 1; - msg.val[0] = sc; - edje_object_message_send(mb-frame, EDJE_MESSAGE_FLOAT_SET, 0, msg); + msg.val = sc; + edje_object_message_send(mb-frame, EDJE_MESSAGE_FLOAT, 0, msg); } static void @@ -468,8 +464,6 @@ _mirror_client_new(Mirror *m) evas_object_name_set(mb-mirror, mirror); edje_object_part_swallow(mb-frame, e.swallow.client, m-mirror); edje_object_part_text_set(mb-frame, e.text.title, e_client_name_get(m-ec)); - if (m-sd-h) - _mirror_scale_set(m, (double)m-sd-h / (double)m-sd-desk-zone-h); return o; } @@ -482,6 +476,7 @@ _e_deskmirror_mirror_setup(Mirror *m) { m-mirror = _mirror_client_new(m); m-frame = 1; +_mirror_scale_set(m, (double)m-sd-h / (double)m-sd-desk-zone-h); } else { --
Re: [E-devel] [EGIT] [core/elementary] master 01/06: Adding elm_tooltip_movement_lock_set() and elm_tooltip_movement_lock_get()
Hmm both sounds ok but I also prefer freeze it is used in various meanings around efl libraries. And freeze is familar than lock in efl API. So, elm_tooltip_move_freeze_set()? How do you think, Abhi? Thanks. Daniel Juyung Seo (SeoZ) On Wed, Jan 15, 2014 at 7:20 PM, ChunEon Park her...@naver.com wrote: there freeze() apis meaning all are different but simliar. for consistency i suggested. -Regards, Hermet- -Original Message- From: Iván Brianosachi...@gmail.com To: Enlightenment developer list enlightenment-devel@lists.sourceforge.net; Cc: g...@lists.enlightenment.orgg...@lists.enlightenment.org; Sent: 2014-01-15 (수) 18:10:08 Subject: Re: [E-devel] [EGIT] [core/elementary] master 01/06: Adding elm_tooltip_movement_lock_set() and elm_tooltip_movement_lock_get() On Wednesday, January 15, 2014, ChunEon Park wrote: elm_tooltip_movement_lock_set() ? how about _freeze_set() ? we already use the freeze word entirely. Those have a different meaning. -Regards, Hermet- -Original Message- From: abhia.aryadipta@samsung.com To: git@lists.enlightenment.org; Cc: Sent: 2014-01-13 (월) 15:47:26 Subject: [EGIT] [core/elementary] master 01/06: Adding elm_tooltip_movement_lock_set() and elm_tooltip_movement_lock_get() raster pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=1832450176b188773557c39e5cf1eee0f47a8858 commit 1832450176b188773557c39e5cf1eee0f47a8858 Author: abhi a.aryadipta@samsung.com Date: Mon Jan 13 15:22:47 2014 +0900 Adding elm_tooltip_movement_lock_set() and elm_tooltip_movement_lock_get() Summary: These APIs allow to enable/disable a tooltip to move with respect to mouse pointer Test Plan: elm_tooltip_movement_lock_set(), elm_tooltip_movement_lock_get(), elementary_test -to tooltip Reviewers: singh.amitesh, seoz, raster Reviewed By: raster CC: raster Differential Revision: https://phab.enlightenment.org/D369 --- ChangeLog4 NEWS 2 ++ src/bin/test_tooltip.c 24 src/lib/elm_tooltip.h 32 src/lib/els_tooltip.c 29 - 5 files changed, 86 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 56975bb..f845744 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1772,3 +1772,7 @@ 2013-12-01 Mike Blumenkrantz * fix mouse eventing on e border theme + +2013-12-09 Abhinandan Aryadipta (aryarockstar) + +* tooltip: Added elm_tooltip_move_lock_set() and elm_tooltip_move_lock_get(). diff --git a/NEWS b/NEWS index 85da746..a32848f 100644 --- a/NEWS +++ b/NEWS @@ -7,6 +7,8 @@ Changes since Elementary 1.8.0: Additions: + * Add elm_tooltip_move_lock_set() and elm_tooltip_move_lock_get() + Improvements: Fixes: diff --git a/src/bin/test_tooltip.c b/src/bin/test_tooltip.c index 332eced..d5ac0af 100644 --- a/src/bin/test_tooltip.c +++ b/src/bin/test_tooltip.c @@ -200,6 +200,23 @@ _tt_text_replace(void *data EINA_UNUSED, } static void +_tt_move_lock(void *data EINA_UNUSED, + Evas_Object *obj, + void *event_info EINA_UNUSED) +{ + if (!elm_tooltip_move_lock_get(obj)) + { +elm_tooltip_move_lock_set(obj, EINA_TRUE); +elm_object_tooltip_text_set(obj, Locked); + } + else + { +elm_tooltip_move_lock_set(obj, EINA_FALSE); +elm_object_tooltip_text_set(obj, Free); + } +} + +static void _tt_orient_text_replace(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) @@ -489,6 +506,13 @@ test_tooltip(void *data EINA_UNUSED, evas_object_show(bt); bt = elm_button_add(win); + elm_object_text_set(bt, Movement Lock Tooltip, click to change); + elm_object_tooltip_text_set(bt, Free); + evas_object_smart_callback_add(bt, clicked, _tt_move_lock, NULL); + elm_box_pack_end(bx, bt); + evas_object_show(bt); + + bt = elm_button_add(win); elm_object_text_set(bt, Orient Tooltip, click to -- CenturyLink Cloud: The Leader in Enterprise Cloud Services. Learn Why More Businesses Are Choosing CenturyLink Cloud For Critical Workloads, Development Environments Everything In Between. Get a Quote or Start a Free Trial Today. http://pubads.g.doubleclick.net/gampad/clk?id=119420431iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net javascript:;
[EGIT] [core/elementary] master 01/01: pager16 - match same theme look for popup as pager orig
raster pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=a00bee58b162b999ab4c30317467303831ba925a commit a00bee58b162b999ab4c30317467303831ba925a Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Wed Jan 15 20:34:17 2014 +0900 pager16 - match same theme look for popup as pager orig --- data/themes/edc/pager16.edc | 75 ++--- 1 file changed, 57 insertions(+), 18 deletions(-) diff --git a/data/themes/edc/pager16.edc b/data/themes/edc/pager16.edc index 2104d59..6670947 100644 --- a/data/themes/edc/pager16.edc +++ b/data/themes/edc/pager16.edc @@ -2,7 +2,35 @@ group { name: e/modules/pager2/popup; images.image: vgrad_tall.png COMP; images.image: bevel_out.png COMP; images.image: shine.png COMP; + images.image: win_shadow.png COMP; parts { + part { name: shadow; mouse_events: 0; + description { state: default 0.0; +image.normal: win_shadow.png; +image.border: 14 14 14 14; +image.middle: 0; +rel1.to: base; +rel1.offset: -7 -3; +rel2.to: base; +rel2.offset: 6 11; +fill.smooth: 0; + } + } + part { name: base; mouse_events: 0; + description { state: default 0.0; +image.normal: vgrad_tall.png; +fill.smooth: 0; +TILED_HORIZ(40) + } + } + part { name: bevel; mouse_events: 0; + description { state: default 0.0; +image.normal: bevel_out.png; +image.border: 1 1 1 1; +image.middle: 0; +fill.smooth: 0; + } +} part { name: e.swallow.content; type: SWALLOW; description { state: default 0.0; rel1.to_y: e.text.label; @@ -10,20 +38,22 @@ group { name: e/modules/pager2/popup; rel1.offset: 2 0; rel2.relative: 1.0 1.0; rel2.offset: -3 -2; - } - } + } +} part { name: e.text.label; type: TEXT; mouse_events: 0; scale: 1; effect: SHADOW BOTTOM; description { state: default 0.0; color_class: border_title; +rel1.to: base; rel1.offset: 0 1; +rel2.to: base; rel2.relative: 1.0 0.0; rel2.offset: -1 1; align: 0.5 0.0; -color: 51 153 255 255; -color3: 10 10 10 255; -text { font: Sans:style=Bold; size: 10; +color: 21 21 21 255; +color3: 255 255 255 25; +text { font: FNBD; size: 10; text_class: title_bar; align: 0.5 0.0; min: 0 1; @@ -31,6 +61,15 @@ group { name: e/modules/pager2/popup; fixed: 0 1; } } + part { name: shine; mouse_events: 0; + description { state: default 0.0; +image.normal: shine.png; +rel1.offset: 0 -2; +rel2.relative: 1.0 0.0; +rel2.offset: -1 2; +FIXED_SIZE(69, 5) + } + } } } @@ -56,19 +95,6 @@ group { name: e/modules/pager2/desk; TILED_HORIZ(32) } } - part { name: glow; mouse_events: 0; type: RECT; - description { state: default 0.0; -rel1.to: base; -rel1.offset: -2 -2; -rel2.to: base; -rel2.offset: 1 1; -color: 51 153 255 0; - } - description { state: active 0.0; -inherit: default 0.0; -color: 51 153 255 255; - } - } part { name: bevel; mouse_events: 0; description { state: default 0.0; image.normal: bevel_out.png; @@ -102,6 +128,19 @@ group { name: e/modules/pager2/desk; fill.smooth: 0; } } + part { name: glow; mouse_events: 0; + description { state: default 0.0; +image.normal: downlight_glow.png; +image.border: 0 0 3 0; +rel1.to: base; +rel2.to: base; +color: 255 255 255 0; + } + description { state: active 0.0; +inherit: default 0.0; +color: 255 255 255 255; + } + } part { name: e.text.label; type: TEXT; mouse_events: 0; scale: 1; effect: SHADOW BOTTOM; --
[EGIT] [core/efl] master 01/01: ecore_x_gesture: Cast maek pointer correctly.
seoz pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=2830507661b8da932e7836663d2f7a886c98a70d commit 2830507661b8da932e7836663d2f7a886c98a70d Author: Daniel Juyung Seo seojuyu...@gmail.com Date: Wed Jan 15 20:47:49 2014 +0900 ecore_x_gesture: Cast maek pointer correctly. Confirmed by the original author of libxgesture, Sungjin Park. --- src/lib/ecore_x/xlib/ecore_x_gesture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/ecore_x/xlib/ecore_x_gesture.c b/src/lib/ecore_x/xlib/ecore_x_gesture.c index 2c8f311..15a9efd 100644 --- a/src/lib/ecore_x/xlib/ecore_x_gesture.c +++ b/src/lib/ecore_x/xlib/ecore_x_gesture.c @@ -73,7 +73,7 @@ ecore_x_gesture_events_selected_get(Ecore_X_Window win) return ECORE_X_GESTURE_EVENT_MASK_NONE; LOGFN(__FILE__, __LINE__, __FUNCTION__); - if (GestureSuccess != XGestureGetSelectedEvents(_ecore_x_disp, win, mask)) + if (GestureSuccess != XGestureGetSelectedEvents(_ecore_x_disp, win, (Mask *)mask)) mask = ECORE_X_GESTURE_EVENT_MASK_NONE; if (_ecore_xlib_sync) ecore_x_sync(); --
[EGIT] [core/elementary] master 01/01: fileselector_entry: Delay elm_layout_theme_set until memebers are initialized in _smart_add
ryuan pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=e21e2aec2d8c1cf7a778d7a3d6977084c136af00 commit e21e2aec2d8c1cf7a778d7a3d6977084c136af00 Author: Ryuan Choi ryuan.c...@gmail.com Date: Wed Jan 15 21:44:21 2014 +0900 fileselector_entry: Delay elm_layout_theme_set until memebers are initialized in _smart_add Summary: elm_layout_theme_set can call some methods like _smart_disable and there are some warnings when these methods manipulate some member variabls which are not initialized yet. It's because elm_layout_theme_set is called too early in _smart_add. Spotted while digging warnings after rELM4c3e23de9e46 Reviewers: seoz, raster Reviewed By: seoz Differential Revision: https://phab.enlightenment.org/D459 --- src/lib/elc_fileselector_entry.c | 15 +-- 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/lib/elc_fileselector_entry.c b/src/lib/elc_fileselector_entry.c index fcf0800..3d93712 100644 --- a/src/lib/elc_fileselector_entry.c +++ b/src/lib/elc_fileselector_entry.c @@ -349,15 +349,10 @@ _elm_fileselector_entry_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) eo_do_super(obj, MY_CLASS, evas_obj_smart_add()); elm_widget_sub_object_parent_add(obj); - if (!elm_layout_theme_set - (obj, fileselector_entry, base, elm_widget_style_get(obj))) - CRI(Failed to set layout!); - priv-button = elm_fileselector_button_add(obj); elm_widget_mirrored_automatic_set(priv-button, EINA_FALSE); elm_widget_style_set(priv-button, fileselector_entry/default); - elm_layout_content_set(obj, elm.swallow.button, priv-button); elm_fileselector_button_expandable_set (priv-button, _elm_config-fileselector_expand_enable); @@ -374,7 +369,6 @@ _elm_fileselector_entry_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) elm_widget_style_set(priv-entry, fileselector_entry/default); elm_entry_single_line_set(priv-entry, EINA_TRUE); elm_entry_editable_set(priv-entry, EINA_TRUE); - elm_layout_content_set(obj, elm.swallow.entry, priv-entry); #define SIG_FWD(name) \ evas_object_smart_callback_add(priv-entry, SIG_##name, _##name##_fwd, obj) @@ -391,6 +385,15 @@ _elm_fileselector_entry_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) SIG_FWD(SELECTION_CUT); #undef SIG_FWD + if (!elm_layout_theme_set + (obj, fileselector_entry, base, elm_widget_style_get(obj))) + CRI(Failed to set layout!); + else + { +elm_layout_content_set(obj, elm.swallow.button, priv-button); +elm_layout_content_set(obj, elm.swallow.entry, priv-entry); + } + elm_widget_can_focus_set(obj, EINA_FALSE); _mirrored_set(obj, elm_widget_mirrored_get(obj)); --
[EGIT] [core/elementary] master 01/01: fileselector_entry: Removed _mirrored_set(), one line local function
ryuan pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=421e368bb44061d9dfe0e1e83b700af5ec5babaa commit 421e368bb44061d9dfe0e1e83b700af5ec5babaa Author: Ryuan Choi ryuan.c...@gmail.com Date: Wed Jan 15 21:58:07 2014 +0900 fileselector_entry: Removed _mirrored_set(), one line local function Small refactoring. It is unnecessary one line function which just calls elm_widget_mirrored_set. --- src/lib/elc_fileselector_entry.c | 13 ++--- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/lib/elc_fileselector_entry.c b/src/lib/elc_fileselector_entry.c index 3d93712..a5f88e0 100644 --- a/src/lib/elc_fileselector_entry.c +++ b/src/lib/elc_fileselector_entry.c @@ -175,15 +175,6 @@ end: } static void -_mirrored_set(Evas_Object *obj, - Eina_Bool rtl) -{ - ELM_FILESELECTOR_ENTRY_DATA_GET(obj, sd); - - elm_widget_mirrored_set(sd-button, rtl); -} - -static void _elm_fileselector_entry_smart_theme(Eo *obj, void *_pd, va_list *list) { const char *style; @@ -201,7 +192,7 @@ _elm_fileselector_entry_smart_theme(Eo *obj, void *_pd, va_list *list) style = elm_widget_style_get(obj); - _mirrored_set(obj, elm_widget_mirrored_get(obj)); + elm_widget_mirrored_set(sd-button, elm_widget_mirrored_get(obj)); if (elm_object_disabled_get(obj)) elm_layout_signal_emit(obj, elm,state,disabled, elm); @@ -351,6 +342,7 @@ _elm_fileselector_entry_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) priv-button = elm_fileselector_button_add(obj); elm_widget_mirrored_automatic_set(priv-button, EINA_FALSE); + elm_widget_mirrored_set(priv-button, elm_widget_mirrored_get(obj)); elm_widget_style_set(priv-button, fileselector_entry/default); elm_fileselector_button_expandable_set @@ -396,7 +388,6 @@ _elm_fileselector_entry_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) elm_widget_can_focus_set(obj, EINA_FALSE); - _mirrored_set(obj, elm_widget_mirrored_get(obj)); elm_layout_sizing_eval(obj); } --
[EGIT] [core/enlightenment] master 02/06: remove shadow from client icon drags
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=51bcc9ad0fbe9a562dbb091b625f76bc1f53fc60 commit 51bcc9ad0fbe9a562dbb091b625f76bc1f53fc60 Author: Mike Blumenkrantz zm...@samsung.com Date: Wed Jan 15 10:23:14 2014 -0500 remove shadow from client icon drags T776 --- src/bin/e_dnd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/e_dnd.c b/src/bin/e_dnd.c index d2940bf..a330f9b 100644 --- a/src/bin/e_dnd.c +++ b/src/bin/e_dnd.c @@ -224,7 +224,7 @@ e_drag_object_set(E_Drag *drag, Evas_Object *object) else evas_object_hide(object); drag-object = object; - drag-comp_object = e_comp_object_util_add(object, E_COMP_OBJECT_TYPE_POPUP); + drag-comp_object = e_comp_object_util_add(object, E_COMP_OBJECT_TYPE_NONE); evas_object_layer_set(drag-comp_object, drag-layer); evas_object_name_set(drag-comp_object, E Drag); evas_object_pass_events_set(drag-comp_object, 1); --
[EGIT] [core/enlightenment] master 04/06: don't hints on override clients
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=a084217ba902b156ba9086723919279af4b5c846 commit a084217ba902b156ba9086723919279af4b5c846 Author: Mike Blumenkrantz zm...@samsung.com Date: Wed Jan 15 11:00:45 2014 -0500 don't hints on override clients T772 --- src/bin/e_client.c | 6 -- src/bin/e_comp_x.c | 10 -- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/bin/e_client.c b/src/bin/e_client.c index 91e375a..c6d4a98 100644 --- a/src/bin/e_client.c +++ b/src/bin/e_client.c @@ -1267,7 +1267,8 @@ _e_client_cb_evas_hide(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UN if (action_client == ec) _e_client_action_finish(); e_pointer_type_pop(ec-comp-pointer, ec, NULL); - if (!ec-iconic) e_hints_window_hidden_set(ec); + if ((!ec-iconic) (!ec-override)) + e_hints_window_hidden_set(ec); if (!ec-hidden) { @@ -1660,7 +1661,8 @@ _e_client_eval(E_Client *ec) } /* Recreate state */ -e_hints_window_init(ec); +if (!ec-override) + e_hints_window_init(ec); if ((ec-e.state.centered) ((!ec-remember) || ((ec-remember) (!(ec-remember-apply E_REMEMBER_APPLY_POS) diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c index 80b4eaa..bafac31 100644 --- a/src/bin/e_comp_x.c +++ b/src/bin/e_comp_x.c @@ -847,11 +847,8 @@ _e_comp_x_evas_hide_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UN if (!ec-comp_data) return; // already deleted, happens with internal wins ecore_x_window_shadow_tree_flush(); - if (!ec-iconic) - { -ecore_x_window_prop_card32_set(e_client_util_win_get(ec), E_ATOM_MAPPED, visible, 1); -e_hints_window_hidden_set(ec); - } + if ((!ec-iconic) (!ec-override)) + ecore_x_window_prop_card32_set(e_client_util_win_get(ec), E_ATOM_MAPPED, visible, 1); EINA_LIST_FOREACH(ec-e.state.video_child, l, tmp) evas_object_hide(tmp-frame); @@ -880,7 +877,8 @@ _e_comp_x_evas_show_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UN ecore_x_window_show(win); if (ec-unredirected_single) ecore_x_window_show(_e_comp_x_client_window_get(ec)); - e_hints_window_visible_set(ec); + if (!ec-override) + e_hints_window_visible_set(ec); ecore_x_window_prop_card32_set(win, E_ATOM_MAPPED, visible, 1); ecore_x_window_prop_card32_set(win, E_ATOM_MANAGED, visible, 1); --
[EGIT] [core/enlightenment] master 03/06: always set icccm wm state when calling related hints function
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=e8e2002804ae542c88af9483ace0d652d8665a92 commit e8e2002804ae542c88af9483ace0d652d8665a92 Author: Mike Blumenkrantz zm...@samsung.com Date: Wed Jan 15 10:36:45 2014 -0500 always set icccm wm state when calling related hints function T773 --- src/bin/e_hints.c | 18 ++ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/bin/e_hints.c b/src/bin/e_hints.c index 3420ebf..d32c7f0 100644 --- a/src/bin/e_hints.c +++ b/src/bin/e_hints.c @@ -1210,10 +1210,8 @@ e_hints_window_visible_set(E_Client *ec) #else if (!e_pixmap_is_x(ec-pixmap)) return; if (ec-icccm.state != ECORE_X_WINDOW_STATE_HINT_NORMAL) - { -ecore_x_icccm_state_set(e_client_util_win_get(ec), ECORE_X_WINDOW_STATE_HINT_NORMAL); -ec-icccm.state = ECORE_X_WINDOW_STATE_HINT_NORMAL; - } + ec-icccm.state = ECORE_X_WINDOW_STATE_HINT_NORMAL; + ecore_x_icccm_state_set(e_client_util_win_get(ec), ECORE_X_WINDOW_STATE_HINT_NORMAL); if (ec-netwm.state.hidden) { ec-netwm.update.state = 1; @@ -1231,10 +1229,8 @@ e_hints_window_iconic_set(E_Client *ec) #else if (!e_pixmap_is_x(ec-pixmap)) return; if (ec-icccm.state != ECORE_X_WINDOW_STATE_HINT_ICONIC) - { -ecore_x_icccm_state_set(e_client_util_win_get(ec), ECORE_X_WINDOW_STATE_HINT_ICONIC); -ec-icccm.state = ECORE_X_WINDOW_STATE_HINT_ICONIC; - } + ec-icccm.state = ECORE_X_WINDOW_STATE_HINT_ICONIC; + ecore_x_icccm_state_set(e_client_util_win_get(ec), ECORE_X_WINDOW_STATE_HINT_ICONIC); if (!ec-netwm.state.hidden) { ec-netwm.update.state = 1; @@ -1252,10 +1248,8 @@ e_hints_window_hidden_set(E_Client *ec) #else if (!e_pixmap_is_x(ec-pixmap)) return; if (ec-icccm.state != ECORE_X_WINDOW_STATE_HINT_WITHDRAWN) - { -ecore_x_icccm_state_set(e_client_util_win_get(ec), ECORE_X_WINDOW_STATE_HINT_WITHDRAWN); -ec-icccm.state = ECORE_X_WINDOW_STATE_HINT_WITHDRAWN; - } + ec-icccm.state = ECORE_X_WINDOW_STATE_HINT_WITHDRAWN; + ecore_x_icccm_state_set(e_client_util_win_get(ec), ECORE_X_WINDOW_STATE_HINT_WITHDRAWN); if (ec-netwm.state.hidden) { ec-netwm.update.state = 1; --
[EGIT] [core/enlightenment] master 05/06: set netwm sync alarm to right struct member
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=d095b392e96cc354aacfe956cb8bac43cfed2516 commit d095b392e96cc354aacfe956cb8bac43cfed2516 Author: Mike Blumenkrantz zm...@samsung.com Date: Wed Jan 15 11:15:50 2014 -0500 set netwm sync alarm to right struct member T778 --- src/bin/e_comp_x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c index bafac31..1f67349 100644 --- a/src/bin/e_comp_x.c +++ b/src/bin/e_comp_x.c @@ -4159,7 +4159,7 @@ _e_comp_x_hook_client_resize_begin(void *d EINA_UNUSED, E_Client *ec) { E_COMP_X_PIXMAP_CHECK; if (!ec-netwm.sync.request) return; - ec-netwm.sync.alarm = ecore_x_sync_alarm_new(ec-comp_data-sync_counter); + ec-comp_data-alarm = ecore_x_sync_alarm_new(ec-comp_data-sync_counter); eina_hash_add(alarm_hash, ec-comp_data-alarm, ec); ec-netwm.sync.alarm = ec-netwm.sync.serial = 1; ec-netwm.sync.wait = 0; --
[EGIT] [core/enlightenment] master 06/06: fix netwm sync resizing to account for frame geometry
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=047bcd7818fb9ca9dc0750bba4ee3a76374befac commit 047bcd7818fb9ca9dc0750bba4ee3a76374befac Author: Mike Blumenkrantz zm...@samsung.com Date: Wed Jan 15 11:50:11 2014 -0500 fix netwm sync resizing to account for frame geometry T778 --- src/bin/e_comp_x.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c index 1f67349..00e8de9 100644 --- a/src/bin/e_comp_x.c +++ b/src/bin/e_comp_x.c @@ -2170,16 +2170,16 @@ _e_comp_x_sync_alarm(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore_X_Event if (pnd) { resize = ((ec-w != pnd-w) || (ec-h != pnd-h)); - ec-w = pnd-w; - ec-h = pnd-h; + e_comp_object_frame_wh_adjust(ec-frame, pnd-w, pnd-h, ec-w, ec-h); E_FREE(pnd); } } if (resize) { -ec-changes.size = 1; -EC_CHANGED(ec); +evas_object_resize(ec-frame, ec-w, ec-h); +if (ec-internal_ecore_evas) + ecore_evas_move_resize(ec-internal_ecore_evas, 0, 0, ec-client.w, ec-client.h); } ecore_x_pointer_xy_get(ec-comp-man-root, --
[EGIT] [core/enlightenment] master 01/06: add comp settings to configure registry
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=bd83ae044f1ff70c305cdf760507155d7277a247 commit bd83ae044f1ff70c305cdf760507155d7277a247 Author: Mike Blumenkrantz zm...@samsung.com Date: Wed Jan 15 10:10:09 2014 -0500 add comp settings to configure registry it's always been in the settings menu, but I forgot to put it into the registry. T779 --- src/bin/e_configure.c | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/bin/e_configure.c b/src/bin/e_configure.c index f16af30..6550c75 100644 --- a/src/bin/e_configure.c +++ b/src/bin/e_configure.c @@ -28,7 +28,13 @@ e_configure_init(void) { e_configure_registry_category_add(extensions, 90, _(Extensions), NULL, preferences-extensions); e_configure_registry_item_add(extensions/modules, 10, _(Modules), NULL, preferences-plugin, e_int_config_modules); - + e_configure_registry_category_add(appearance, 10, _(Look), NULL, + preferences-look); + e_configure_registry_item_add(appearance/comp, 120, _(Compositor), NULL, preferences-composite, e_int_config_comp); + e_configure_registry_category_add(internal, -1, _(Internal), + NULL, enlightenment/internal); + e_configure_registry_item_add(internal/comp_matches, -1, _(Composite Style Settings), + NULL, preferences-composite, e_int_config_comp_match); maug = e_int_menus_menu_augmentation_add_sorted (config/1, _(Modules), _e_configure_menu_add, NULL, NULL, NULL); --
[EGIT] [core/elementary] master 01/02: test: Cleaned up elementary_test internal code.
seoz pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=b29e1d8989bf4553fd768451ff5f3a62d6e9ca0a commit b29e1d8989bf4553fd768451ff5f3a62d6e9ca0a Author: Daniel Juyung Seo seojuyu...@gmail.com Date: Thu Jan 16 02:10:21 2014 +0900 test: Cleaned up elementary_test internal code. - removed unnecessary/unused macro. - fixed formatting. - added prefix '_' for internal function. --- src/bin/test.c | 4 ++-- src/bin/test.h | 21 +++-- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/src/bin/test.c b/src/bin/test.c index 589c5f7..6de3df8 100644 --- a/src/bin/test.c +++ b/src/bin/test.c @@ -247,7 +247,7 @@ struct elm_test }; static int -elm_test_sort(const void *pa, const void *pb) +_elm_test_sort(const void *pa, const void *pb) { const struct elm_test *a = pa, *b = pb; int res = strcasecmp(a-category, b-category); @@ -263,7 +263,7 @@ _elm_test_add(Eina_List **p_list, const char *icon, const char *category, const t-category = category; t-name = name; t-cb = cb; - *p_list = eina_list_sorted_insert(*p_list, elm_test_sort, t); + *p_list = eina_list_sorted_insert(*p_list, _elm_test_sort, t); } void diff --git a/src/bin/test.h b/src/bin/test.h index 1b34c95..a5e78bb 100644 --- a/src/bin/test.h +++ b/src/bin/test.h @@ -1,27 +1,12 @@ #ifndef _TEST_H #define _TEST_H -#define fail_if(expr) \ - do { \ -if ( expr ) \ - { \ - FILE *fp; \ - char buf[1024]; \ - sprintf(buf, fail_%s.txt, elm_win_title_get(win)); \ - if ((fp = fopen(buf, a)) != NULL) \ - { \ - fprintf(fp, Failed at %s:%d on %s\n, \ -__FILE__, __LINE__, #expr); \ - fclose(fp); \ - } \ - } \ - } while(0) -#endif - extern int _log_domain; -#define CRI(...) EINA_LOG_DOM_CRIT(_log_domain, _VA_ARGS__) +#define CRI(...) EINA_LOG_DOM_CRIT(_log_domain, _VA_ARGS__) #define ERR(...) EINA_LOG_DOM_ERR(_log_domain, __VA_ARGS__) #define WRN(...) EINA_LOG_DOM_WARN(_log_domain, __VA_ARGS__) #define INF(...) EINA_LOG_DOM_INFO(_log_domain, __VA_ARGS__) #define DBG(...) EINA_LOG_DOM_DBG(_log_domain, __VA_ARGS__) + +#endif --
[EGIT] [core/elementary] master 02/02: win: Check null before calling elm_widget_highlight_in_theme_get(). It can be null.
seoz pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=b710d1581bb9c8b3a5c5031baed42212021e753c commit b710d1581bb9c8b3a5c5031baed42212021e753c Author: Daniel Juyung Seo seojuyu...@gmail.com Date: Thu Jan 16 02:33:46 2014 +0900 win: Check null before calling elm_widget_highlight_in_theme_get(). It can be null. 'target' can be null when the focus in is just called. --- src/lib/elm_win.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c index 637612a..072cee9 100644 --- a/src/lib/elm_win.c +++ b/src/lib/elm_win.c @@ -1373,7 +1373,7 @@ _elm_win_object_focus_in(void *data, target = _elm_win_focus_target_get(obj); sd-focus_highlight.cur.target = target; - if (elm_widget_highlight_in_theme_get(target)) + if (target elm_widget_highlight_in_theme_get(target)) sd-focus_highlight.cur.handled = EINA_TRUE; else _elm_win_focus_target_callbacks_add(sd); --
[E-devel] Bob
Hello all, I would like to share some ideas for Bob, which I see as an evolution of edje. Please correct me if I'm wrong. Since I've started developing, back in 2008, a C++ Gui Library, which has been already removed from assembla a long time ago, I've already been eyeing the project AdamEve from Adobe Software Library (ASL). Documentation can be found here: http://stlab.adobe.com/group__asl__overview.html I think it is obvious the advantage of writing in a declarative way a UI. But, writing UIs in EFL/Elementary are still a bit awkward and requires more code than is necessary, because edje doesn't offer a more dynamic layout setting. This generally requires box widgets to be instantiated and edje layouts to be placed as small fixed dialogs inside a multiple boxed layout. If bob/edje would incorporate ASL's AdamEve idea, we could develop more fluid and easily portable layouts that would could ease developing applications based in EFL. The layout language could be written in Lua and a C engine could do the automatic layout placement. It would require that the language gives room for manual placement so the layout can be finely-tuned too, but I think this idea can vastly ease development of UI for applications. BTW, there was a question about constraint solver on the ML recently. I think it might've been related to this topic. Regards, -- Felipe Magno de Almeida -- CenturyLink Cloud: The Leader in Enterprise Cloud Services. Learn Why More Businesses Are Choosing CenturyLink Cloud For Critical Workloads, Development Environments Everything In Between. Get a Quote or Start a Free Trial Today. http://pubads.g.doubleclick.net/gampad/clk?id=119420431iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[E-devel] Ecore_Con Example Error
Hi All, Just noticed a little error in the ecore_con_client_simple_example on the website docs (http://docs.enlightenment.org/stable/eina/ecore_con_client_simple_example_8c-example.html#a14) /* start client */ ecore_main_loop_begin(); ecore_con_init(); ecore_init(); eina_init(); return 0; Ummm, shouldn't that be ecore_con_shutdown, ecore_shutdown, eina_shutdown ?? ;) Not sure where this file is located else I would have already fixed it. Cheers, dh -- CenturyLink Cloud: The Leader in Enterprise Cloud Services. Learn Why More Businesses Are Choosing CenturyLink Cloud For Critical Workloads, Development Environments Everything In Between. Get a Quote or Start a Free Trial Today. http://pubads.g.doubleclick.net/gampad/clk?id=119420431iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [enlightenment/modules/tclock] master 01/01: update tclock against latest E source
quaker pushed a commit to branch master. http://git.enlightenment.org/enlightenment/modules/tclock.git/commit/?id=8fd9cefaa69423eeafca2202f4ec7e222f2651a9 commit 8fd9cefaa69423eeafca2202f4ec7e222f2651a9 Author: Daniel Kolesa quake...@gmail.com Date: Wed Jan 15 12:17:04 2014 + update tclock against latest E source --- src/e_mod_config.c | 7 +++ src/e_mod_main.c | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/e_mod_config.c b/src/e_mod_config.c index 32ed794..96e22d2 100644 --- a/src/e_mod_config.c +++ b/src/e_mod_config.c @@ -21,7 +21,6 @@ _config_tclock_module(Config_Item *ci) { E_Config_Dialog *cfd = NULL; E_Config_Dialog_View *v = NULL; - E_Container *con = NULL; char buf[PATH_MAX]; if (e_config_dialog_find(TClock, _e_modules_tclock_config_dialog)) @@ -35,9 +34,9 @@ _config_tclock_module(Config_Item *ci) snprintf(buf, sizeof(buf), %s/e-module-tclock.edj, tclock_config-mod_dir); - con = e_container_current_get(e_manager_current_get()); - cfd = e_config_dialog_new(con, D_(Tclock Settings), TClock, - _e_modules_tclock_config_dialog, buf, 0, v, ci); + cfd = e_config_dialog_new(e_util_comp_current_get(), D_(Tclock Settings), + TClock, _e_modules_tclock_config_dialog, + buf, 0, v, ci); tclock_config-config_dialog = cfd; } diff --git a/src/e_mod_main.c b/src/e_mod_main.c index afad470..e8d58be 100644 --- a/src/e_mod_main.c +++ b/src/e_mod_main.c @@ -206,13 +206,13 @@ _tclock_cb_mouse_in(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, if (!inst-ci-show_tip) return; if (inst-tip) return; - inst-tip = e_gadcon_popup_new(inst-gcc); + inst-tip = e_gadcon_popup_new(inst-gcc, EINA_FALSE); current_time = time(NULL); local_time = localtime(current_time); memset(buf, 0, sizeof(buf)); strftime(buf, 1024, inst-ci-tip_format, local_time); - inst-o_tip = e_widget_label_add(inst-tip-win-evas, buf); + inst-o_tip = e_widget_label_add(e_comp_get(inst-tip)-evas, buf); e_gadcon_popup_content_set(inst-tip, inst-o_tip); e_gadcon_popup_show(inst-tip); --
[EGIT] [core/enlightenment] master 01/01: X override clients are already placed
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=36e2b033762729150c3ed0c359fdbfe1a2c0bc5b commit 36e2b033762729150c3ed0c359fdbfe1a2c0bc5b Author: Mike Blumenkrantz zm...@samsung.com Date: Wed Jan 15 13:51:54 2014 -0500 X override clients are already placed --- src/bin/e_comp_x.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c index 00e8de9..0dbdfab 100644 --- a/src/bin/e_comp_x.c +++ b/src/bin/e_comp_x.c @@ -174,6 +174,7 @@ _e_comp_x_client_new_helper(E_Client *ec) } ec-depth = ec-comp_data-initial_attributes.depth; ec-override = ec-comp_data-initial_attributes.override; + ec-placed |= ec-override; ec-input_only = ec-comp_data-initial_attributes.input_only; ec-border_size = ec-comp_data-initial_attributes.border; ec-icccm.accepts_focus = (!ec-override) (!ec-input_only); --
[EGIT] [core/enlightenment] master 01/01: only set shape mask if client has been reparented
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=a33fa268473702620302e9c0586aeb4bf291519d commit a33fa268473702620302e9c0586aeb4bf291519d Author: Mike Blumenkrantz zm...@samsung.com Date: Wed Jan 15 14:03:50 2014 -0500 only set shape mask if client has been reparented --- src/bin/e_comp_x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c index 0dbdfab..65465b2 100644 --- a/src/bin/e_comp_x.c +++ b/src/bin/e_comp_x.c @@ -2508,7 +2508,7 @@ _e_comp_x_hook_client_post_new_client(void *d EINA_UNUSED, E_Client *ec) if (ec-need_shape_merge) { _e_comp_x_client_shape_input_rectangle_set(ec); -if (!ec-shaped) +if ((!ec-shaped) ec-comp_data-reparented) ecore_x_window_shape_mask_set(e_client_util_pwin_get(ec), 0); ec-need_shape_merge = 0; } --
[EGIT] [core/elementary] master 01/02: panel: Delay elm_layout_theme_set until memebers are initialized in _smart_add
ryuan pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=ec698973246a9d6f9428ff0988fdff88627192c5 commit ec698973246a9d6f9428ff0988fdff88627192c5 Author: Ryuan Choi ryuan.c...@gmail.com Date: Thu Jan 16 04:02:11 2014 +0900 panel: Delay elm_layout_theme_set until memebers are initialized in _smart_add elm_layout_theme_set can call some methods like _elm_panel_smart_theme and there are some warnings when these methods manipulate some member variabls which are not initialized yet. It's because elm_layout_theme_set is called too early in _smart_add. Spotted while digging warnings after rELM4c3e23de9e46 --- src/lib/elm_panel.c | 28 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/src/lib/elm_panel.c b/src/lib/elm_panel.c index 82b2cac..e856a94 100644 --- a/src/lib/elm_panel.c +++ b/src/lib/elm_panel.c @@ -359,16 +359,11 @@ _elm_panel_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) elm_widget_sub_object_parent_add(obj); elm_widget_can_focus_set(obj, EINA_TRUE); - /* just to bootstrap and have theme hook to work */ - if (!elm_layout_theme_set(obj, panel, top, elm_widget_style_get(obj))) - CRI(Failed to set layout!); - eo_do(obj, elm_wdg_theme(NULL)); priv-bx = evas_object_box_add(evas_object_evas_get(obj)); evas_object_size_hint_align_set(priv-bx, 0.5, 0.5); evas_object_box_layout_set(priv-bx, _box_layout_cb, priv, NULL); - elm_layout_content_set(obj, elm.swallow.content, priv-bx); evas_object_show(priv-bx); elm_layout_signal_callback_add @@ -379,16 +374,25 @@ _elm_panel_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) priv-event = evas_object_rectangle_add(evas_object_evas_get(obj)); evas_object_color_set(priv-event, 0, 0, 0, 0); evas_object_pass_events_set(priv-event, EINA_TRUE); - if (edje_object_part_exists - (wd-resize_obj, elm.swallow.event)) + elm_widget_sub_object_add(obj, priv-event); + + /* just to bootstrap and have theme hook to work */ + if (!elm_layout_theme_set(obj, panel, top, elm_widget_style_get(obj))) + CRI(Failed to set layout!); + else { -Evas_Coord minw = 0, minh = 0; +elm_layout_content_set(obj, elm.swallow.content, priv-bx); -elm_coords_finger_size_adjust(1, minw, 1, minh); -evas_object_size_hint_min_set(priv-event, minw, minh); -elm_layout_content_set(obj, elm.swallow.event, priv-event); +if (edje_object_part_exists +(wd-resize_obj, elm.swallow.event)) + { + Evas_Coord minw = 0, minh = 0; + + elm_coords_finger_size_adjust(1, minw, 1, minh); + evas_object_size_hint_min_set(priv-event, minw, minh); + elm_layout_content_set(obj, elm.swallow.event, priv-event); + } } - elm_widget_sub_object_add(obj, priv-event); elm_layout_sizing_eval(obj); } --
[EGIT] [core/elementary] master 02/02: panel: Check whether sd-content is NULL in _panel_toggle
ryuan pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=1c1f95454c878332cc6aa61b43274f747ad22ae2 commit 1c1f95454c878332cc6aa61b43274f747ad22ae2 Author: Ryuan Choi ryuan.c...@gmail.com Date: Thu Jan 16 04:10:38 2014 +0900 panel: Check whether sd-content is NULL in _panel_toggle sd-content can be NULL when elm_panel_hidden_set is called. --- src/lib/elm_panel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/elm_panel.c b/src/lib/elm_panel.c index e856a94..4e43b7d 100644 --- a/src/lib/elm_panel.c +++ b/src/lib/elm_panel.c @@ -237,7 +237,7 @@ _panel_toggle(void *data EINA_UNUSED, elm_layout_signal_emit(obj, elm,action,hide, elm); sd-hidden = EINA_TRUE; evas_object_repeat_events_set(obj, EINA_TRUE); -if (elm_widget_focus_get(sd-content)) +if (sd-content elm_widget_focus_get(sd-content)) { elm_widget_focused_object_clear(obj); elm_widget_focus_steal(obj); --
[EGIT] [core/elementary] master 01/01: panel: Guarantee the integrity of parameter
ryuan pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=5aa098c257b1538b1c6a5f5f2a24c4e1d6ce3f59 commit 5aa098c257b1538b1c6a5f5f2a24c4e1d6ce3f59 Author: Ryuan Choi ryuan.c...@gmail.com Date: Thu Jan 16 04:27:47 2014 +0900 panel: Guarantee the integrity of parameter - Check whether ret is NULL. - Guarantee hidden variable is only EINA_TRUE or EINA_FALSE. --- src/lib/elm_panel.c | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/lib/elm_panel.c b/src/lib/elm_panel.c index 4e43b7d..af9672b 100644 --- a/src/lib/elm_panel.c +++ b/src/lib/elm_panel.c @@ -313,6 +313,8 @@ _elm_panel_smart_content_get(Eo *obj, void *_pd, va_list *list) Elm_Panel_Smart_Data *sd = _pd; const char *part = va_arg(*list, const char *); Evas_Object **ret = va_arg(*list, Evas_Object **); + if (!ret) return; + *ret = NULL; if (part strcmp(part, default)) @@ -492,7 +494,7 @@ _orient_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Elm_Panel_Orient *ret = va_arg(*list, Elm_Panel_Orient *); Elm_Panel_Smart_Data *sd = _pd; - *ret = sd-orient; + if (ret) *ret = sd-orient; } EAPI void @@ -509,7 +511,7 @@ _hidden_set(Eo *obj, void *_pd, va_list *list) Eina_Bool hidden = va_arg(*list, int); Elm_Panel_Smart_Data *sd = _pd; - if (sd-hidden == hidden) return; + if (sd-hidden == !!hidden) return; _panel_toggle(NULL, obj, NULL, NULL); } @@ -529,7 +531,7 @@ _hidden_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Eina_Bool *ret = va_arg(*list, Eina_Bool *); Elm_Panel_Smart_Data *sd = _pd; - *ret = sd-hidden; + if (ret) *ret = sd-hidden; } EAPI void --
[EGIT] [core/efl] master 01/01: Fix ecore_con example file to call shutdown functions.
kuri pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=4ec00f8edc7b80d21ae7265820f68689660b586d commit 4ec00f8edc7b80d21ae7265820f68689660b586d Author: Guillaume Friloux k...@efl.so Date: Wed Jan 15 20:42:50 2014 +0100 Fix ecore_con example file to call shutdown functions. Found by Chris Michael. --- src/examples/ecore/ecore_con_client_simple_example.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/examples/ecore/ecore_con_client_simple_example.c b/src/examples/ecore/ecore_con_client_simple_example.c index d315bd6..e122b26 100644 --- a/src/examples/ecore/ecore_con_client_simple_example.c +++ b/src/examples/ecore/ecore_con_client_simple_example.c @@ -120,9 +120,9 @@ main(int argc, const char *argv[]) /* start client */ ecore_main_loop_begin(); - ecore_con_init(); - ecore_init(); - eina_init(); + ecore_con_shutdown(); + ecore_shutdown(); + eina_shutdown(); return 0; } --
Re: [E-devel] Ecore_Con Example Error
Hello dh, This file is at src/examples/ecore/ecore_con_client_simple_example.c. in src/lib/ecore_con/Ecore_Con.h, the doxygen comments include this file by this line: * @li @ref ecore_con_client_simple_example_c Examples are declared in doc/, in this case in doc/ecore_examples.dox: /** * @example ecore_con_client_simple_example.c * Shows how to setup a simple client that connects to a server and sends a * hello string to it. See the complete example description at @ref * ecore_con_client_simple_example_c */ I pushed the fix for you. On 15/01/2014 18:44, Chris Michael wrote: Hi All, Just noticed a little error in the ecore_con_client_simple_example on the website docs (http://docs.enlightenment.org/stable/eina/ecore_con_client_simple_example_8c-example.html#a14) /* start client */ ecore_main_loop_begin(); ecore_con_init(); ecore_init(); eina_init(); return 0; Ummm, shouldn't that be ecore_con_shutdown, ecore_shutdown, eina_shutdown ?? ;) Not sure where this file is located else I would have already fixed it. Cheers, dh -- CenturyLink Cloud: The Leader in Enterprise Cloud Services. Learn Why More Businesses Are Choosing CenturyLink Cloud For Critical Workloads, Development Environments Everything In Between. Get a Quote or Start a Free Trial Today. http://pubads.g.doubleclick.net/gampad/clk?id=119420431iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- CenturyLink Cloud: The Leader in Enterprise Cloud Services. Learn Why More Businesses Are Choosing CenturyLink Cloud For Critical Workloads, Development Environments Everything In Between. Get a Quote or Start a Free Trial Today. http://pubads.g.doubleclick.net/gampad/clk?id=119420431iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Ecore_Con Example Error
Hi Kuri, Thanks for the quick fix ! :) Saved me a bit of time searching for it ;) Cheers, dh On 15/01/14 19:52, Guillaume Friloux wrote: Hello dh, This file is at src/examples/ecore/ecore_con_client_simple_example.c. in src/lib/ecore_con/Ecore_Con.h, the doxygen comments include this file by this line: * @li @ref ecore_con_client_simple_example_c Examples are declared in doc/, in this case in doc/ecore_examples.dox: /** * @example ecore_con_client_simple_example.c * Shows how to setup a simple client that connects to a server and sends a * hello string to it. See the complete example description at @ref * ecore_con_client_simple_example_c */ I pushed the fix for you. On 15/01/2014 18:44, Chris Michael wrote: Hi All, Just noticed a little error in the ecore_con_client_simple_example on the website docs (http://docs.enlightenment.org/stable/eina/ecore_con_client_simple_example_8c-example.html#a14) /* start client */ ecore_main_loop_begin(); ecore_con_init(); ecore_init(); eina_init(); return 0; Ummm, shouldn't that be ecore_con_shutdown, ecore_shutdown, eina_shutdown ?? ;) Not sure where this file is located else I would have already fixed it. Cheers, dh -- CenturyLink Cloud: The Leader in Enterprise Cloud Services. Learn Why More Businesses Are Choosing CenturyLink Cloud For Critical Workloads, Development Environments Everything In Between. Get a Quote or Start a Free Trial Today. http://pubads.g.doubleclick.net/gampad/clk?id=119420431iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/efl] master 01/01: ecore_getopt: support for categories
quaker pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=d660dd12bbfb984a70375a0482b9252b82fb9695 commit d660dd12bbfb984a70375a0482b9252b82fb9695 Author: Daniel Kolesa quake...@gmail.com Date: Wed Jan 15 20:22:27 2014 + ecore_getopt: support for categories --- src/lib/ecore/Ecore_Getopt.h | 6 +- src/lib/ecore/ecore_getopt.c | 6 ++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/lib/ecore/Ecore_Getopt.h b/src/lib/ecore/Ecore_Getopt.h index 64e3eed..d41ed3e 100644 --- a/src/lib/ecore/Ecore_Getopt.h +++ b/src/lib/ecore/Ecore_Getopt.h @@ -65,7 +65,8 @@ typedef enum { ECORE_GETOPT_ACTION_VERSION, ECORE_GETOPT_ACTION_COPYRIGHT, ECORE_GETOPT_ACTION_LICENSE, - ECORE_GETOPT_ACTION_BREAK + ECORE_GETOPT_ACTION_BREAK, + ECORE_GETOPT_ACTION_CATEGORY } Ecore_Getopt_Action; typedef enum { @@ -389,6 +390,9 @@ struct _Ecore_Getopt ECORE_GETOPT_ACTION_BREAK, \ {.dummy = NULL}} +#define ECORE_GETOPT_CATEGORY(name) \ + {0, NULL, name, NULL, ECORE_GETOPT_ACTION_CATEGORY, {.dummy = NULL}} + #define ECORE_GETOPT_SENTINEL {0, NULL, NULL, NULL, 0, {.dummy = NULL}} #define ECORE_GETOPT_VALUE_STR(val) {.strp = (val)} diff --git a/src/lib/ecore/ecore_getopt.c b/src/lib/ecore/ecore_getopt.c index 2af5d47..b2195be 100644 --- a/src/lib/ecore/ecore_getopt.c +++ b/src/lib/ecore/ecore_getopt.c @@ -629,6 +629,12 @@ _ecore_getopt_help_desc(FILE*fp, int metavarlen = 3; int used; + if (desc-action == ECORE_GETOPT_ACTION_CATEGORY) + { +fprintf(fp, \n%s\n, desc-help); +return; + } + arg_req = _ecore_getopt_desc_arg_requirement(desc); if (arg_req != ECORE_GETOPT_DESC_ARG_REQUIREMENT_NO) _ecore_getopt_help_desc_setup_metavar --
[EGIT] [apps/terminology] master 03/05: Settings option for login_shell
billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=7c4a98927966d8abaef3fdef407f065bac7721b6 commit 7c4a98927966d8abaef3fdef407f065bac7721b6 Author: Markus Törnqvist m...@fadconsulting.com Date: Sat Jan 11 16:22:18 2014 +0200 Settings option for login_shell --- src/bin/options_behavior.c | 39 +-- 1 file changed, 29 insertions(+), 10 deletions(-) diff --git a/src/bin/options_behavior.c b/src/bin/options_behavior.c index 3cd06b3..1e671fa 100644 --- a/src/bin/options_behavior.c +++ b/src/bin/options_behavior.c @@ -252,6 +252,15 @@ _cb_op_behavior_cg_height(void *data, Evas_Object *obj, void *event EINA_UNUSED) } } +static void +_cb_op_behavior_login_shell_chg(void *data, Evas_Object *obj, void *event EINA_UNUSED) +{ + Evas_Object *term = data; + Config *config = termio_config_get(term); + config-login_shell = elm_check_state_get(obj); + config_save(config, NULL); +} + void options_behavior(Evas_Object *opbox, Evas_Object *term) { @@ -268,20 +277,20 @@ options_behavior(Evas_Object *opbox, Evas_Object *term) elm_object_text_set(o, Behavior); elm_box_pack_end(opbox, o); evas_object_show(o); - + sc = o = elm_scroller_add(opbox); elm_scroller_content_min_limit(sc, EINA_TRUE, EINA_FALSE); evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_object_content_set(fr, o); evas_object_show(o); - + bx = o = elm_box_add(opbox); evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.0); elm_object_content_set(sc, o); evas_object_show(o); - + o = elm_check_add(bx); evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5); @@ -321,7 +330,7 @@ options_behavior(Evas_Object *opbox, Evas_Object *term) evas_object_show(o); evas_object_smart_callback_add(o, changed, _cb_op_behavior_cursor_blink_chg, term); - + o = elm_check_add(bx); evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5); @@ -331,7 +340,7 @@ options_behavior(Evas_Object *opbox, Evas_Object *term) evas_object_show(o); evas_object_smart_callback_add(o, changed, _cb_op_behavior_visual_bell_chg, term); - + o = elm_check_add(bx); evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5); @@ -341,7 +350,7 @@ options_behavior(Evas_Object *opbox, Evas_Object *term) evas_object_show(o); evas_object_smart_callback_add(o, changed, _cb_op_behavior_urg_bell_chg, term); - + o = elm_check_add(bx); evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5); @@ -399,6 +408,16 @@ options_behavior(Evas_Object *opbox, Evas_Object *term) o = elm_check_add(bx); evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5); + elm_object_text_set(o, Start as login shell); + elm_check_state_set(o, config-login_shell); + elm_box_pack_end(bx, o); + evas_object_show(o); + evas_object_smart_callback_add(o, changed, + _cb_op_behavior_login_shell_chg, term); + + o = elm_check_add(bx); + evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0); + evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5); elm_object_text_set(o, Always open at size:); elm_check_state_set(o, config-custom_geometry); elm_box_pack_end(bx, o); @@ -450,7 +469,7 @@ options_behavior(Evas_Object *opbox, Evas_Object *term) elm_separator_horizontal_set(o, EINA_TRUE); elm_box_pack_end(bx, o); evas_object_show(o); - + o = elm_label_add(bx); evas_object_size_hint_weight_set(o, 0.0, 0.0); evas_object_size_hint_align_set(o, 0.0, 0.5); @@ -481,14 +500,14 @@ options_behavior(Evas_Object *opbox, Evas_Object *term) elm_separator_horizontal_set(o, EINA_TRUE); elm_box_pack_end(bx, o); evas_object_show(o); - + o = elm_label_add(bx); evas_object_size_hint_weight_set(o, 0.0, 0.0); evas_object_size_hint_align_set(o, 0.0, 0.5); elm_object_text_set(o, Scrollback:); elm_box_pack_end(bx, o); evas_object_show(o); - + o = elm_slider_add(bx); evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.0); @@ -521,7 +540,7 @@ options_behavior(Evas_Object *opbox, Evas_Object *term) evas_object_show(o); evas_object_smart_callback_add(o, delay,changed, _cb_op_behavior_tab_zoom_slider_chg, term); - +
[EGIT] [apps/terminology] master 05/05: Merge remote-tracking branch 'mjtorn/login_shell'
billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=2706eef099a8adba16403e637d5d999720f8701d commit 2706eef099a8adba16403e637d5d999720f8701d Merge: e3adfa2 044a7f9 Author: Boris Faure bill...@gmail.com Date: Wed Jan 15 22:03:26 2014 +0100 Merge remote-tracking branch 'mjtorn/login_shell' Conflicts: src/bin/config.c src/bin/config.c | 27 --- src/bin/config.h | 1 + src/bin/main.c | 14 +- src/bin/options_behavior.c | 39 +-- 4 files changed, 55 insertions(+), 26 deletions(-) diff --cc src/bin/config.c index 3d826b0,ea4fddc..f831fa4 --- a/src/bin/config.c +++ b/src/bin/config.c @@@ -547,19 -507,14 +551,19 @@@ config_fork(Config *config config2 = calloc(1, sizeof(Config)); if (!config2) return NULL; - #define CPY(fld) config2-fld = config-fld; + #define CPY(fld) config2-fld = config-fld; #define SCPY(fld) if (config-fld) config2-fld = eina_stringshare_add(config-fld) - +#define SLSTCPY(fld) \ + do { Eina_List *__l; const char *__s; \ + EINA_LIST_FOREACH(config-fld, __l, __s) \ + config2-fld = eina_list_append \ + (config2-fld, eina_stringshare_add(__s)); } while (0) + CPY(version); -SCPY(font.name); +SCPY(font.name); CPY(font.size); CPY(font.bitmap); -SCPY(helper.email); +SCPY(helper.email); SCPY(helper.url.general); SCPY(helper.url.video); SCPY(helper.url.image); --
[EGIT] [apps/terminology] master 01/05: Make the login_shell option behave as all others
billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=d802bf6324d89eaff8c9540dda2682b0d1331abf commit d802bf6324d89eaff8c9540dda2682b0d1331abf Author: Markus Törnqvist m...@fadconsulting.com Date: Sun Jan 12 20:08:38 2014 +0200 Make the login_shell option behave as all others Cheers cippp! --- src/bin/main.c | 10 +++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/bin/main.c b/src/bin/main.c index 72de4c4..2ec099b 100644 --- a/src/bin/main.c +++ b/src/bin/main.c @@ -2924,9 +2924,13 @@ elm_main(int argc, char **argv) size_h = 24; } } - - // for now if not set - dont do login shell - later from config - if (login_shell == 0xff) login_shell = EINA_FALSE; + + if (login_shell != 0xff) + { +config-login_shell = login_shell; +config-temporary = EINA_TRUE; + } + login_shell = config-login_shell; remote: if ((!single) (config-multi_instance)) --
[EGIT] [apps/terminology] master 02/05: Add configuration for login_shell
billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=2e064a2fe248bc67f0d0a794b13aac0be9072641 commit 2e064a2fe248bc67f0d0a794b13aac0be9072641 Author: Markus Törnqvist m...@fadconsulting.com Date: Sat Jan 11 16:21:59 2014 +0200 Add configuration for login_shell --- src/bin/config.c | 29 + src/bin/config.h | 1 + 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/bin/config.c b/src/bin/config.c index bd93688..ea4fddc 100644 --- a/src/bin/config.c +++ b/src/bin/config.c @@ -26,7 +26,7 @@ config_init(void) elm_need_efreet(); efreet_init(); - + eet_eina_stream_data_descriptor_class_set (eddc, sizeof(eddc), Config, sizeof(Config)); edd_base = eet_data_descriptor_stream_new(eddc); @@ -43,7 +43,7 @@ config_init(void) (edd_color, Config_Color, b, b, EET_T_UCHAR); EET_DATA_DESCRIPTOR_ADD_BASIC (edd_color, Config_Color, a, a, EET_T_UCHAR); - + EET_DATA_DESCRIPTOR_ADD_BASIC (edd_base, Config, version, version, EET_T_INT); EET_DATA_DESCRIPTOR_ADD_BASIC @@ -111,6 +111,8 @@ config_init(void) EET_DATA_DESCRIPTOR_ADD_BASIC (edd_base, Config, drag_links, drag_links, EET_T_UCHAR); EET_DATA_DESCRIPTOR_ADD_BASIC + (edd_base, Config, login_shell, login_shell, EET_T_UCHAR); + EET_DATA_DESCRIPTOR_ADD_BASIC (edd_base, Config, application_server, application_server, EET_T_UCHAR); EET_DATA_DESCRIPTOR_ADD_BASIC (edd_base, Config, application_server_restore_views, @@ -158,7 +160,7 @@ config_save(Config *config, const char *key) config-font.orig_name = NULL; if (config-font.name) config-font.orig_name = eina_stringshare_add(config-font.name); config-font.orig_bitmap = config-font.bitmap; - + cfgdir = _config_home_get(); snprintf(buf, sizeof(buf), %s/terminology/config/standard, cfgdir); ecore_file_mkpath(buf); @@ -208,6 +210,7 @@ config_sync(const Config *config_src, Config *config) config-erase_is_del = config_src-erase_is_del; config-temporary = config_src-temporary; config-custom_geometry = config_src-custom_geometry; + config-login_shell = config_src-login_shell; config-cg_width = config_src-cg_width; config-cg_height = config_src-cg_height; config-colors_use = config_src-colors_use; @@ -422,18 +425,18 @@ config_load(const char *key) 0x1367, 0xa60f, 0x2cfa, - + '`', 0 }; char *s; int slen = 0; - + config = calloc(1, sizeof(Config)); if (config) { int i, j; - + config-version = CONF_VER; config-font.bitmap = EINA_TRUE; config-font.name = eina_stringshare_add(nexus.pcf); @@ -471,6 +474,7 @@ config_load(const char *key) config-xterm_256color = EINA_FALSE; config-erase_is_del = EINA_FALSE; config-custom_geometry = EINA_FALSE; + config-login_shell = EINA_FALSE; config-cg_width = 80; config-cg_height = 24; config-colors_use = EINA_FALSE; @@ -479,7 +483,7 @@ config_load(const char *key) for (i = 0; i 12; i++) { unsigned char rr = 0, gg = 0, bb = 0, aa = 0; - + colors_standard_get(j, i, rr, gg, bb, aa); config-colors[(j * 12) + i].r = rr; config-colors[(j * 12) + i].g = gg; @@ -500,17 +504,17 @@ Config * config_fork(Config *config) { Config *config2; - + config2 = calloc(1, sizeof(Config)); if (!config2) return NULL; -#define CPY(fld) config2-fld = config-fld; +#define CPY(fld) config2-fld = config-fld; #define SCPY(fld) if (config-fld) config2-fld = eina_stringshare_add(config-fld) CPY(version); - SCPY(font.name); + SCPY(font.name); CPY(font.size); CPY(font.bitmap); - SCPY(helper.email); + SCPY(helper.email); SCPY(helper.url.general); SCPY(helper.url.video); SCPY(helper.url.image); @@ -538,11 +542,12 @@ config_fork(Config *config) CPY(xterm_256color); CPY(erase_is_del); CPY(custom_geometry); + CPY(login_shell); CPY(cg_width); CPY(cg_height); CPY(colors_use); memcpy(config2-colors, config-colors, sizeof(config-colors)); - + CPY(temporary); SCPY(config_key); return config2; diff --git a/src/bin/config.h b/src/bin/config.h index ecf6cf5..089af16 100644 --- a/src/bin/config.h +++ b/src/bin/config.h @@ -52,6 +52,7 @@ struct _Config Eina_Bool erase_is_del; Eina_Bool custom_geometry; Eina_Bool drag_links; + Eina_Bool login_shell; int cg_width; int cg_height; Eina_Bool colors_use; --
[EGIT] [apps/terminology] master 04/05: Use config-login_shell
billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=044a7f98b99611aa55baeaf3b9111e5b809e0a19 commit 044a7f98b99611aa55baeaf3b9111e5b809e0a19 Author: Markus Törnqvist m...@fadconsulting.com Date: Sun Jan 12 20:00:38 2014 +0200 Use config-login_shell Thanks cippp for finding this! --- src/bin/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bin/main.c b/src/bin/main.c index 2ec099b..5b166ae 100644 --- a/src/bin/main.c +++ b/src/bin/main.c @@ -293,7 +293,7 @@ _split_split(Split *sp, Eina_Bool horizontal) config = config_fork(sp-term-config); if (termio_cwd_get(sp-term-term, buf, sizeof(buf))) wdir = buf; sp2-term = main_term_new(sp-wn, config, - NULL, EINA_FALSE, wdir, + NULL, config-login_shell, wdir, 80, 24, EINA_FALSE); sp2-terms = eina_list_append(sp2-terms, sp2-term); _term_resize_track_start(sp2); @@ -367,7 +367,7 @@ main_new_with_dir(Evas_Object *win, Evas_Object *term, const char *wdir) config = config_fork(sp-term-config); termio_size_get(sp-term-term, w, h); sp-term = main_term_new(sp-wn, config, -NULL, EINA_FALSE, wdir, +NULL, config-login_shell, wdir, w, h, EINA_FALSE); sp-terms = eina_list_append(sp-terms, sp-term); _term_resize_track_start(sp); --
Re: [E-devel] [EGIT] [core/elementary] master 01/06: Adding elm_tooltip_movement_lock_set() and elm_tooltip_movement_lock_get()
2014/1/15 Daniel Juyung Seo seojuyu...@gmail.com Hmm both sounds ok but I also prefer freeze it is used in various meanings around efl libraries. And freeze is familar than lock in efl API. So, elm_tooltip_move_freeze_set()? hmmm, freeze (in all efl) means that the widget will not redraw itself, in this case we are just set to not move... freeze seems really wrong to me in this context davemds How do you think, Abhi? Thanks. Daniel Juyung Seo (SeoZ) On Wed, Jan 15, 2014 at 7:20 PM, ChunEon Park her...@naver.com wrote: there freeze() apis meaning all are different but simliar. for consistency i suggested. -Regards, Hermet- -Original Message- From: Iván Brianosachi...@gmail.com To: Enlightenment developer list enlightenment-devel@lists.sourceforge.net; Cc: g...@lists.enlightenment.orgg...@lists.enlightenment.org; Sent: 2014-01-15 (수) 18:10:08 Subject: Re: [E-devel] [EGIT] [core/elementary] master 01/06: Adding elm_tooltip_movement_lock_set() and elm_tooltip_movement_lock_get() On Wednesday, January 15, 2014, ChunEon Park wrote: elm_tooltip_movement_lock_set() ? how about _freeze_set() ? we already use the freeze word entirely. Those have a different meaning. -Regards, Hermet- -Original Message- From: abhia.aryadipta@samsung.com To: git@lists.enlightenment.org; Cc: Sent: 2014-01-13 (월) 15:47:26 Subject: [EGIT] [core/elementary] master 01/06: Adding elm_tooltip_movement_lock_set() and elm_tooltip_movement_lock_get() raster pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=1832450176b188773557c39e5cf1eee0f47a8858 commit 1832450176b188773557c39e5cf1eee0f47a8858 Author: abhi a.aryadipta@samsung.com Date: Mon Jan 13 15:22:47 2014 +0900 Adding elm_tooltip_movement_lock_set() and elm_tooltip_movement_lock_get() Summary: These APIs allow to enable/disable a tooltip to move with respect to mouse pointer Test Plan: elm_tooltip_movement_lock_set(), elm_tooltip_movement_lock_get(), elementary_test -to tooltip Reviewers: singh.amitesh, seoz, raster Reviewed By: raster CC: raster Differential Revision: https://phab.enlightenment.org/D369 --- ChangeLog4 NEWS 2 ++ src/bin/test_tooltip.c 24 src/lib/elm_tooltip.h 32 src/lib/els_tooltip.c 29 - 5 files changed, 86 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 56975bb..f845744 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1772,3 +1772,7 @@ 2013-12-01 Mike Blumenkrantz * fix mouse eventing on e border theme + +2013-12-09 Abhinandan Aryadipta (aryarockstar) + +* tooltip: Added elm_tooltip_move_lock_set() and elm_tooltip_move_lock_get(). diff --git a/NEWS b/NEWS index 85da746..a32848f 100644 --- a/NEWS +++ b/NEWS @@ -7,6 +7,8 @@ Changes since Elementary 1.8.0: Additions: + * Add elm_tooltip_move_lock_set() and elm_tooltip_move_lock_get() + Improvements: Fixes: diff --git a/src/bin/test_tooltip.c b/src/bin/test_tooltip.c index 332eced..d5ac0af 100644 --- a/src/bin/test_tooltip.c +++ b/src/bin/test_tooltip.c @@ -200,6 +200,23 @@ _tt_text_replace(void *data EINA_UNUSED, } static void +_tt_move_lock(void *data EINA_UNUSED, + Evas_Object *obj, + void *event_info EINA_UNUSED) +{ + if (!elm_tooltip_move_lock_get(obj)) + { +elm_tooltip_move_lock_set(obj, EINA_TRUE); +elm_object_tooltip_text_set(obj, Locked); + } + else + { +elm_tooltip_move_lock_set(obj, EINA_FALSE); +elm_object_tooltip_text_set(obj, Free); + } +} + +static void _tt_orient_text_replace(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) @@ -489,6 +506,13 @@ test_tooltip(void *data EINA_UNUSED, evas_object_show(bt); bt = elm_button_add(win); + elm_object_text_set(bt, Movement Lock Tooltip, click to change); + elm_object_tooltip_text_set(bt, Free); + evas_object_smart_callback_add(bt, clicked, _tt_move_lock, NULL); + elm_box_pack_end(bx, bt); + evas_object_show(bt); + + bt = elm_button_add(win); elm_object_text_set(bt, Orient Tooltip, click to -- CenturyLink Cloud: The Leader in Enterprise Cloud Services. Learn Why More Businesses Are Choosing CenturyLink Cloud For Critical Workloads,
[EGIT] [core/enlightenment] master 04/04: use live objects for pager16 window drags
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=064362234bf4cfde0bb5849357b53ef77341288e commit 064362234bf4cfde0bb5849357b53ef77341288e Author: Mike Blumenkrantz zm...@samsung.com Date: Wed Jan 15 17:01:10 2014 -0500 use live objects for pager16 window drags --- src/modules/pager16/e_mod_main.c | 16 +++- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/src/modules/pager16/e_mod_main.c b/src/modules/pager16/e_mod_main.c index cc2f414..a7b1c28 100644 --- a/src/modules/pager16/e_mod_main.c +++ b/src/modules/pager16/e_mod_main.c @@ -1045,7 +1045,7 @@ _pager_window_cb_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __U Evas_Event_Mouse_Move *ev; Pager_Win *pw; E_Drag *drag; - Evas_Object *o, *oo; + Evas_Object *o; Evas_Coord x, y, w, h; const char *drag_types[] = { enlightenment/pager_win, enlightenment/border }; @@ -1113,27 +1113,17 @@ _pager_window_cb_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __U evas_object_geometry_get(pw-o_mirror, x, y, w, h); evas_object_hide(pw-o_mirror); - drag = e_drag_new(pw-desk-pager-zone-comp, + drag = e_drag_new(pw-client-comp, x, y, drag_types, 2, pw, -1, _pager_window_cb_drag_convert, _pager_window_cb_drag_finished); - o = edje_object_add(drag-evas); - e_theme_edje_object_set(o, base/theme/modules/pager, - e/modules/pager2/window); + o = e_deskmirror_mirror_copy(pw-o_mirror); evas_object_show(o); - oo = e_client_icon_add(pw-client, drag-evas); - if (oo) - { - evas_object_show(oo); - edje_object_part_swallow(o, e.swallow.icon, oo); - } - e_drag_object_set(drag, o); e_drag_resize(drag, w, h); e_drag_start(drag, x - pw-drag.dx, y - pw-drag.dy); - e_comp_object_util_del_list_append(drag-comp_object, oo); /* this prevents the desk from switching on drags */ pw-drag.from_pager = pw-desk-pager; --
[EGIT] [core/enlightenment] master 03/04: fix keyboard move/resize info display
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=32fd2f1776387fd5eed443a23ba45b6139744ccf commit 32fd2f1776387fd5eed443a23ba45b6139744ccf Author: Mike Blumenkrantz zm...@samsung.com Date: Wed Jan 15 16:59:43 2014 -0500 fix keyboard move/resize info display --- src/bin/e_client.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bin/e_client.c b/src/bin/e_client.c index c6d4a98..e2ccc96 100644 --- a/src/bin/e_client.c +++ b/src/bin/e_client.c @@ -1312,7 +1312,7 @@ _e_client_cb_evas_move(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UN _e_client_event_simple(ec, E_EVENT_CLIENT_MOVE); _e_client_zone_update(ec); - if (ec-moving) + if (ec-moving || (ecmove == ec)) _e_client_hook_call(E_CLIENT_HOOK_MOVE_UPDATE, ec); } @@ -1343,7 +1343,7 @@ _e_client_cb_evas_resize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_ _e_client_zone_update(ec); - if (e_client_resizing_get(ec)) + if (e_client_resizing_get(ec) || (ecresize == ec)) _e_client_hook_call(E_CLIENT_HOOK_RESIZE_UPDATE, ec); } --
[EGIT] [core/enlightenment] master 01/04: add e_deskmirror_mirror_copy
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=30ef7b217a9d6b4b4cfe1835d2a833b597e7351a commit 30ef7b217a9d6b4b4cfe1835d2a833b597e7351a Author: Mike Blumenkrantz zm...@samsung.com Date: Wed Jan 15 16:38:04 2014 -0500 add e_deskmirror_mirror_copy --- src/bin/e_comp_object.c | 1 + src/bin/e_deskmirror.c | 69 - src/bin/e_deskmirror.h | 1 + 3 files changed, 65 insertions(+), 6 deletions(-) diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c index 99942e6..02c9fae 100644 --- a/src/bin/e_comp_object.c +++ b/src/bin/e_comp_object.c @@ -3141,6 +3141,7 @@ e_comp_object_util_mirror_add(Evas_Object *obj) evas_object_image_smooth_scale_set(o, e_comp_config_get()-smooth_windows); cw-obj_mirror = eina_list_append(cw-obj_mirror, o); evas_object_event_callback_add(o, EVAS_CALLBACK_DEL, _e_comp_object_cb_mirror_del, cw); + evas_object_data_set(o, E_Client, cw-ec); evas_object_image_alpha_set(o, evas_object_image_alpha_get(cw-obj)); evas_object_image_size_set(o, w, h); diff --git a/src/bin/e_deskmirror.c b/src/bin/e_deskmirror.c index 4665656..a9d2290 100644 --- a/src/bin/e_deskmirror.c +++ b/src/bin/e_deskmirror.c @@ -269,10 +269,9 @@ _mirror_client_smart_add(Evas_Object *obj) static void _mirror_client_signal_cb(void *data, Evas_Object *obj EINA_UNUSED, const char *emission, const char *src) { - Mirror_Border *mb = data; - edje_object_signal_emit(mb-frame, emission, src); - edje_object_message_signal_process(mb-frame); - edje_object_calc_force(mb-frame); + edje_object_signal_emit(data, emission, src); + edje_object_message_signal_process(data); + edje_object_calc_force(data); } static void @@ -280,7 +279,7 @@ _mirror_client_smart_del(Evas_Object *obj) { Mirror_Border *mb = evas_object_smart_data_get(obj); if (mb-m-comp_object mb-m-ec) - e_comp_object_signal_callback_del_full(mb-m-ec-frame, *, *, _mirror_client_signal_cb, mb); + e_comp_object_signal_callback_del_full(mb-m-ec-frame, *, *, _mirror_client_signal_cb, mb-frame); evas_object_del(mb-frame); evas_object_del(mb-mirror); free(mb); @@ -445,7 +444,7 @@ _mirror_client_new(Mirror *m) edje_object_signal_emit(mb-frame, e,state,shadow,off, e); if (m-comp_object) { -e_comp_object_signal_callback_add(mb-m-comp_object, *, *, _mirror_client_signal_cb, mb); +e_comp_object_signal_callback_add(mb-m-comp_object, *, *, _mirror_client_signal_cb, mb-frame); evas_object_event_callback_add(m-comp_object, EVAS_CALLBACK_DEL, _e_deskmirror_mirror_del_cb, m); } if (mb-m-ec-focused) @@ -735,6 +734,64 @@ e_deskmirror_mirror_list(Evas_Object *deskmirror) return l; } +EAPI Evas_Object * +e_deskmirror_mirror_copy(Evas_Object *obj) +{ + EINA_SAFETY_ON_NULL_RETURN_VAL(obj, NULL); + + if (!e_util_strcmp(evas_object_type_get(obj), mirror_border)) + { +Evas_Object *o, *oo; +Edje_Message_Float msg; +char buf[1024]; +Mirror_Border *mb; + +mb = evas_object_smart_data_get(obj); +o = edje_object_add(evas_object_evas_get(obj)); +snprintf(buf, sizeof(buf), e/deskmirror/frame/%s, mb-m-ec-border.name); +e_theme_edje_object_set(o, base/theme/borders, buf); +if (e_util_client_shadow_state_get(mb-m-ec)) + edje_object_signal_emit(o, e,state,shadow,on, e); +else + edje_object_signal_emit(o, e,state,shadow,off, e); +if (mb-m-comp_object) + e_comp_object_signal_callback_add(mb-m-comp_object, *, *, _mirror_client_signal_cb, o); +if (mb-m-ec-focused) + edje_object_signal_emit(o, e,state,focused, e); +if (mb-m-ec-shaded) + edje_object_signal_emit(o, e,state,shaded, e); +if (mb-m-ec-maximized) + edje_object_signal_emit(o, e,action,maximize, e); +if (mb-m-ec-sticky) + edje_object_signal_emit(o, e,state,sticky, e); +if (mb-m-ec-iconic) + edje_object_signal_emit(o, e,action,iconify, e); +msg.val = mb-m-sd-h / mb-m-sd-desk-zone-h; +edje_object_message_send(o, EDJE_MESSAGE_FLOAT, 0, msg); + +oo = e_comp_object_util_mirror_add(mb-m-comp_object); +edje_object_part_swallow(o, e.swallow.client, oo); +edje_object_part_text_set(o, e.text.title, e_client_name_get(mb-m-ec)); +e_comp_object_util_del_list_append(o, oo); +return o; + } + else if (!e_util_strcmp(evas_object_type_get(obj), image)) + { +if (!e_util_strcmp(evas_object_name_get(obj), m-mirror)) + { + E_Client *ec; + + ec = evas_object_data_get(obj, E_Client); + if (!ec) return NULL; + return e_comp_object_util_mirror_add(ec-frame); + } +else + return e_comp_object_util_mirror_add(obj); + } + CRI(NOT A DESKMIRROR CLIENT); + return
[EGIT] [core/enlightenment] master 02/04: enable -Wpointer-arith for git builds
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=b719a6a8ff6abf895fec09e943bfd2f56a030829 commit b719a6a8ff6abf895fec09e943bfd2f56a030829 Author: Mike Blumenkrantz zm...@samsung.com Date: Wed Jan 15 16:40:41 2014 -0500 enable -Wpointer-arith for git builds --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index 191b7f1..a395404 100644 --- a/configure.ac +++ b/configure.ac @@ -949,6 +949,7 @@ m4_ifdef([v_mic], [ EFL_COMPILER_FLAG([-Wshadow]) EFL_COMPILER_FLAG([-Wall]) +EFL_COMPILER_FLAG([-Wpointer-arith]) EFL_COMPILER_FLAG([-W]) EFL_COMPILER_FLAG([-Wno-missing-field-initializers]) ]) --
[EGIT] [apps/terminology] master 01/01: do not set bg to INVISIBLE when using 256 colors
billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=00f627d3540f540486fce875a3898307339942ed commit 00f627d3540f540486fce875a3898307339942ed Author: Boris Faure bill...@gmail.com Date: Wed Jan 15 23:30:43 2014 +0100 do not set bg to INVISIBLE when using 256 colors --- src/bin/termio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/termio.c b/src/bin/termio.c index fbb0b22..4757d6e 100644 --- a/src/bin/termio.c +++ b/src/bin/termio.c @@ -1407,7 +1407,7 @@ _smart_apply(Evas_Object *obj) { if (cells[x].att.inverse ^ inv) bg = COL_INVERSE; -else +else if (!bgext) bg = COL_INVIS; } if (cells[x].att.fgintense) fg += 48; --
[EGIT] [core/enlightenment] master 01/01: Remove unused variable.
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=ab9d8b8d82e0beac1cc976721c9e6d28b5b27370 commit ab9d8b8d82e0beac1cc976721c9e6d28b5b27370 Author: Chris Michael devilho...@comcast.net Date: Wed Jan 15 22:42:42 2014 + Remove unused variable. Signed-off-by: Chris Michael devilho...@comcast.net --- src/modules/wl_fb/e_mod_main.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/modules/wl_fb/e_mod_main.c b/src/modules/wl_fb/e_mod_main.c index 85a7e60..b533d6f 100644 --- a/src/modules/wl_fb/e_mod_main.c +++ b/src/modules/wl_fb/e_mod_main.c @@ -11,7 +11,6 @@ e_modapi_init(E_Module *m) Ecore_Evas *ee; E_Screen *screen; E_Comp *comp; - unsigned int layer; int w, h; printf(LOAD WL_FB MODULE\n); --
[EGIT] [core/elementary] master 01/01: Fix unknown command warning in generating doxygen
jihoon pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=295898ff86c9add475771c68dbf1451864c48384 commit 295898ff86c9add475771c68dbf1451864c48384 Author: Jihoon Kim jihoon48@samsung.com Date: Thu Jan 16 08:43:58 2014 +0900 Fix unknown command warning in generating doxygen elementary/src/lib/elm_access.h:238: warning: Found unknown command `\type' elementary/src/lib/elm_bg_legacy.h:98: warning: Found unknown command `\r' elementary/src/lib/elm_bg_legacy.h:98: warning: Found unknown command `\g' elementary/src/lib/elm_object.h:124: warning: Found unknown command `\content' elementary/src/lib/elm_image_legacy.h:82: warning: Found unknown command `\group' elementary/src/lib/elm_image_legacy.h:56: warning: Found unknown command `\group' --- src/lib/elm_access.h | 2 +- src/lib/elm_bg_legacy.h| 2 +- src/lib/elm_image_legacy.h | 4 ++-- src/lib/elm_object.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/elm_access.h b/src/lib/elm_access.h index 9a78a5e..8335bd7 100644 --- a/src/lib/elm_access.h +++ b/src/lib/elm_access.h @@ -237,7 +237,7 @@ EAPI void elm_access_highlight_set(Evas_Object* obj); * * @return @c EINA_TRUE on success, @c EINA_FALSE otherwise * - * The return value would be useful, when the @type is ELM_ACCESS_ACTION_HIGHLIGHT_NEXT + * The return value would be useful, when the @p type is ELM_ACCESS_ACTION_HIGHLIGHT_NEXT * or ELM_ACCESS_ACTION_HIGHLIGHT_PREV. If there is no way to give a highlight, * @c EINA_FALSE will be returned. * diff --git a/src/lib/elm_bg_legacy.h b/src/lib/elm_bg_legacy.h index c363f12..cf35f83 100644 --- a/src/lib/elm_bg_legacy.h +++ b/src/lib/elm_bg_legacy.h @@ -98,7 +98,7 @@ EAPI Elm_Bg_Optionelm_bg_option_get(const Evas_Object *obj); * previously called elm_bg_file_set(), so that you just want a solid * color background. * - * @note You can reset the color by setting @r, @g, @b as -1, -1, -1. + * @note You can reset the color by setting @p r, @p g, @p b as -1, -1, -1. * * @see elm_bg_color_get() * diff --git a/src/lib/elm_image_legacy.h b/src/lib/elm_image_legacy.h index 82479e3..46376f4 100644 --- a/src/lib/elm_image_legacy.h +++ b/src/lib/elm_image_legacy.h @@ -56,7 +56,7 @@ EAPI Eina_Boolelm_image_memfile_set(Evas_Object *obj, const void *img, s * @c .edj, for this case). * * @note If you use animated gif image and create multiple image objects with - * one gif image file, you should set the @group differently for each object. + * one gif image file, you should set the @p group differently for each object. * Or image objects will share one evas image cache entry and you will get * unwanted frames. * @@ -82,7 +82,7 @@ EAPI Eina_Boolelm_image_mmap_set(Evas_Object *obj, const Eina_File *file * case). * * @note If you use animated gif image and create multiple image objects with - * one gif image file, you should set the @group differently for each object. + * one gif image file, you should set the @p group differently for each object. * Or image objects will share one evas image cache entry and you will get * unwanted frames. * diff --git a/src/lib/elm_object.h b/src/lib/elm_object.h index 8824553..4e8048f 100644 --- a/src/lib/elm_object.h +++ b/src/lib/elm_object.h @@ -124,7 +124,7 @@ EAPI void elm_object_domain_part_text_translatable_set(Evas_Object *obj, const c * child objects as content at given parts. This sets new content to * a given part. If any object was already set as a content object in * the same part, the previous object will be deleted automatically - * with this call. If the @content is NULL, this call will just delete the + * with this call. If the @p content is NULL, this call will just delete the * previous object. If the If you wish to preserve it, issue * elm_object_part_content_unset() on it first. * --
[EGIT] [core/enlightenment] master 01/06: block comp queues during hide on shutdown
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=fb18230b27da615259e75b19fcdeb05146d4bff7 commit fb18230b27da615259e75b19fcdeb05146d4bff7 Author: Mike Blumenkrantz zm...@samsung.com Date: Wed Jan 15 17:38:53 2014 -0500 block comp queues during hide on shutdown --- src/bin/e_comp_object.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c index 02c9fae..f9f8d1d 100644 --- a/src/bin/e_comp_object.c +++ b/src/bin/e_comp_object.c @@ -1795,6 +1795,7 @@ _e_comp_smart_hide(Evas_Object *obj) evas_object_hide(cw-clip); if (cw-input_obj) evas_object_hide(cw-input_obj); evas_object_hide(cw-effect_obj); + if (stopping) return; if (cw-ec-focused) evas_object_focus_set(cw-ec-frame, 0); e_comp_render_queue(cw-comp); //force nocomp recheck --
[EGIT] [core/enlightenment] master 04/06: fix void ptr arith warning
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=4d72f840c95c03d942f17c7b5a53130e5e2cfe0d commit 4d72f840c95c03d942f17c7b5a53130e5e2cfe0d Author: Mike Blumenkrantz zm...@samsung.com Date: Wed Jan 15 18:49:53 2014 -0500 fix void ptr arith warning --- src/modules/teamwork/e_mod_tw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/teamwork/e_mod_tw.c b/src/modules/teamwork/e_mod_tw.c index 56043ec..c1e718f 100644 --- a/src/modules/teamwork/e_mod_tw.c +++ b/src/modules/teamwork/e_mod_tw.c @@ -976,7 +976,7 @@ tw_video_thread_cb(void *data, Ecore_Thread *eth) if (pos + num = tot) num = tot - pos; -if (write(fd, buf + pos, num) 0) +if (write(fd, (char*)buf + pos, num) 0) { ERR(WRITE FAILED: %s, strerror(errno)); ecore_thread_cancel(eth); --
[EGIT] [core/enlightenment] master 06/06: redo pager16 window dragging
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=e58bf33d38f26bad128b151fe3e5fd9c7b8b9de7 commit e58bf33d38f26bad128b151fe3e5fd9c7b8b9de7 Author: Mike Blumenkrantz zm...@samsung.com Date: Wed Jan 15 18:50:25 2014 -0500 redo pager16 window dragging T784, T777 --- src/modules/pager16/e_mod_main.c | 287 +-- 1 file changed, 128 insertions(+), 159 deletions(-) diff --git a/src/modules/pager16/e_mod_main.c b/src/modules/pager16/e_mod_main.c index 5168d1f..b806b7a 100644 --- a/src/modules/pager16/e_mod_main.c +++ b/src/modules/pager16/e_mod_main.c @@ -49,6 +49,7 @@ struct _Pager unsigned char just_dragged : 1; Evas_Coord dnd_x, dnd_y; Pager_Desk *active_drop_pd; + E_Client *active_drag_client; Eina_Bool invert : 1; }; @@ -108,7 +109,6 @@ static Eina_Bool _pager_cb_event_desk_name_change(void *data __UNUSED__, static Eina_Bool_pager_cb_event_compositor_resize(void *data __UNUSED__, int type __UNUSED__, void *event); static void _pager_window_cb_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED); static void _pager_window_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info); -static void _pager_window_cb_mouse_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info); static void _pager_window_cb_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info); static void*_pager_window_cb_drag_convert(E_Drag *drag, const char *type); static void _pager_window_cb_drag_finished(E_Drag *drag, int dropped); @@ -166,6 +166,35 @@ static Eina_List *pagers = NULL; Config *pager_config = NULL; + +static Pager_Win * +_pager_desk_window_find(Pager_Desk *pd, E_Client *client) +{ + Eina_List *l; + Pager_Win *pw; + + EINA_LIST_FOREACH(pd-wins, l, pw) + if (pw-client == client) return pw; + + return NULL; +} + +static Pager_Win * +_pager_window_find(Pager *p, E_Client *client) +{ + Eina_List *l; + Pager_Desk *pd; + + EINA_LIST_FOREACH(p-desks, l, pd) + { +Pager_Win *pw; + +pw = _pager_desk_window_find(pd, client); +if (pw) return pw; + } + return NULL; +} + static E_Gadcon_Client * _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style) { @@ -635,8 +664,6 @@ _pager_window_new(Pager_Desk *pd, Evas_Object *mirror, E_Client *client) evas_object_event_callback_add(mirror, EVAS_CALLBACK_MOUSE_DOWN, _pager_window_cb_mouse_down, pw); - evas_object_event_callback_add(mirror, EVAS_CALLBACK_MOUSE_UP, - _pager_window_cb_mouse_up, pw); evas_object_event_callback_add(mirror, EVAS_CALLBACK_MOUSE_MOVE, _pager_window_cb_mouse_move, pw); evas_object_event_callback_add(mirror, EVAS_CALLBACK_DEL, @@ -990,6 +1017,7 @@ _pager_window_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __U pw = data; if (!pw) return; + pw-desk-pager-active_drag_client = NULL; if (pw-desk-pager-popup !act_popup) return; if (!pw-desk-pager-popup ev-button == 3) return; if (ev-button == (int)pager_config-btn_desk) return; @@ -1006,36 +1034,7 @@ _pager_window_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __U pw-drag.dy = oy - ev-canvas.y; pw-drag.start = 1; pw-drag.button = ev-button; - } -} - -static void -_pager_window_cb_mouse_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) -{ - Evas_Event_Mouse_Up *ev; - Pager_Win *pw; - Pager *p; - - ev = event_info; - pw = data; - if (!pw) return; - - p = pw-desk-pager; - - if (pw-desk-pager-popup !act_popup) return; - if (ev-button == (int)pager_config-btn_desk) return; - if ((ev-button == (int)pager_config-btn_drag) || - (ev-button == (int)pager_config-btn_noplace)) - { -if (!pw-drag.from_pager) - { - edje_object_signal_emit(pw-desk-o_desk, e,action,drag,out, e); - e_comp_object_effect_unclip(pw-client-frame); - if (!pw-drag.start) p-just_dragged = 1; - pw-drag.in_pager = 0; - pw-drag.start = 0; - p-dragging = 0; - } +pw-desk-pager-active_drag_client = pw-client; } } @@ -1051,8 +1050,6 @@ _pager_window_cb_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __U { enlightenment/pager_win, enlightenment/border }; Evas_Coord dx, dy; unsigned int resist = 0; - Evas_Coord mx, my, vx, vy; - Pager_Desk *pd; ev = event_info; pw = data; @@ -1060,87 +1057,50 @@ _pager_window_cb_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __U if (!pw) return;
[EGIT] [core/enlightenment] master 03/06: add e_drag_current_get
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=a658e4c198ad9c958f02e2574f5d451f175b5fd4 commit a658e4c198ad9c958f02e2574f5d451f175b5fd4 Author: Mike Blumenkrantz zm...@samsung.com Date: Wed Jan 15 18:02:08 2014 -0500 add e_drag_current_get --- src/bin/e_dnd.c | 6 ++ src/bin/e_dnd.h | 1 + 2 files changed, 7 insertions(+) diff --git a/src/bin/e_dnd.c b/src/bin/e_dnd.c index a330f9b..e5a4697 100644 --- a/src/bin/e_dnd.c +++ b/src/bin/e_dnd.c @@ -161,6 +161,12 @@ e_dnd_shutdown(void) } EAPI E_Drag * +e_drag_current_get(void) +{ + return _drag_current; +} + +EAPI E_Drag * e_drag_new(E_Comp *comp, int x, int y, const char **types, unsigned int num_types, void *data, int size, diff --git a/src/bin/e_dnd.h b/src/bin/e_dnd.h index f88317b..cf743e3 100644 --- a/src/bin/e_dnd.h +++ b/src/bin/e_dnd.h @@ -112,6 +112,7 @@ EINTERN int e_dnd_shutdown(void); EAPI int e_dnd_active(void); +EAPI E_Drag *e_drag_current_get(void); /* x and y are the top left coords of the object that is to be dragged */ EAPI E_Drag *e_drag_new(E_Comp *comp, int x, int y, const char **types, unsigned int num_types, --
[EGIT] [core/enlightenment] master 02/06: focus clients after pager drag to desktop
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=a37bfe3d254ca2aae6e170f65ce2ad9d314002df commit a37bfe3d254ca2aae6e170f65ce2ad9d314002df Author: Mike Blumenkrantz zm...@samsung.com Date: Wed Jan 15 17:44:13 2014 -0500 focus clients after pager drag to desktop --- src/modules/pager16/e_mod_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/pager16/e_mod_main.c b/src/modules/pager16/e_mod_main.c index a7b1c28..5168d1f 100644 --- a/src/modules/pager16/e_mod_main.c +++ b/src/modules/pager16/e_mod_main.c @@ -1201,6 +1201,7 @@ _pager_window_cb_drag_finished(E_Drag *drag, int dropped) if (!(pw-client-lock_user_stacking)) evas_object_raise(pw-client-frame); +evas_object_focus_set(pw-client-frame, 1); } if (pw-desk-pager-active_drop_pd) { --
[EGIT] [core/enlightenment] master 05/06: block deskmirror client visibility changes during drags
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=25e39aaa2b52b93f0fe143adedc33affcc49f774 commit 25e39aaa2b52b93f0fe143adedc33affcc49f774 Author: Mike Blumenkrantz zm...@samsung.com Date: Wed Jan 15 18:50:09 2014 -0500 block deskmirror client visibility changes during drags --- src/bin/e_deskmirror.c | 15 +-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/bin/e_deskmirror.c b/src/bin/e_deskmirror.c index a9d2290..d868861 100644 --- a/src/bin/e_deskmirror.c +++ b/src/bin/e_deskmirror.c @@ -405,7 +405,9 @@ _e_deskmirror_mirror_reconfigure(Mirror *m) _e_deskmirror_mirror_geometry_get(m); e_layout_child_move(m-mirror, m-x, m-y); e_layout_child_resize(m-mirror, m-w, m-h); - _mirror_visible_apply(m); + /* assume that anything happening here is the result of a drag */ + if (!e_drag_current_get()) + _mirror_visible_apply(m); } static void @@ -734,6 +736,12 @@ e_deskmirror_mirror_list(Evas_Object *deskmirror) return l; } +static void +_mirror_copy_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) +{ + e_comp_object_signal_callback_del_full(data, *, *, _mirror_client_signal_cb, obj); +} + EAPI Evas_Object * e_deskmirror_mirror_copy(Evas_Object *obj) { @@ -755,7 +763,10 @@ e_deskmirror_mirror_copy(Evas_Object *obj) else edje_object_signal_emit(o, e,state,shadow,off, e); if (mb-m-comp_object) - e_comp_object_signal_callback_add(mb-m-comp_object, *, *, _mirror_client_signal_cb, o); + { + e_comp_object_signal_callback_add(mb-m-comp_object, *, *, _mirror_client_signal_cb, o); + evas_object_event_callback_add(o, EVAS_CALLBACK_DEL, _mirror_copy_del, mb-m-comp_object); + } if (mb-m-ec-focused) edje_object_signal_emit(o, e,state,focused, e); if (mb-m-ec-shaded) --
[EGIT] [core/enlightenment] master 01/01: fix comp style display
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=37b6238d33ff7afa2dbbc440133755dc3b4af049 commit 37b6238d33ff7afa2dbbc440133755dc3b4af049 Author: Mike Blumenkrantz zm...@samsung.com Date: Wed Jan 15 20:39:51 2014 -0500 fix comp style display --- src/bin/e_comp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c index 4f744a3..908b170 100644 --- a/src/bin/e_comp.c +++ b/src/bin/e_comp.c @@ -1258,8 +1258,7 @@ e_comp_style_selector_create(Evas *evas, const char **source) e_layout_pack(oly, oo); e_layout_child_move(oo, 39, 39); e_layout_child_resize(oo, 162, 162); -edje_object_signal_emit(oo, e,state,shadow,on, e); -edje_object_signal_emit(oo, e,state,visible,on, e); +edje_object_signal_emit(oo, e,state,visible, e); evas_object_show(oo); ds_it-frame = edje_object_add(evas); @@ -1275,6 +1274,7 @@ e_comp_style_selector_create(Evas *evas, const char **source) e/widgets/border/default/border); edje_object_part_text_set(obd, e.text.title, _(Title)); edje_object_signal_emit(obd, e,state,focused, e); +edje_object_signal_emit(obd, e,state,shadow,on, e); edje_object_part_swallow(oo, e.swallow.content, obd); evas_object_show(obd); --
[EGIT] [core/enlightenment] master 01/01: check/set button for pager window drags
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=cb5c473786d31596897f2e0bdd24328333697b20 commit cb5c473786d31596897f2e0bdd24328333697b20 Author: Mike Blumenkrantz zm...@samsung.com Date: Wed Jan 15 20:52:27 2014 -0500 check/set button for pager window drags T789 --- src/modules/pager16/e_mod_main.c | 12 1 file changed, 12 insertions(+) diff --git a/src/modules/pager16/e_mod_main.c b/src/modules/pager16/e_mod_main.c index b806b7a..07ffdc8 100644 --- a/src/modules/pager16/e_mod_main.c +++ b/src/modules/pager16/e_mod_main.c @@ -109,6 +109,7 @@ static Eina_Bool _pager_cb_event_desk_name_change(void *data __UNUSED__, static Eina_Bool_pager_cb_event_compositor_resize(void *data __UNUSED__, int type __UNUSED__, void *event); static void _pager_window_cb_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED); static void _pager_window_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info); +static void _pager_window_cb_mouse_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info); static void _pager_window_cb_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info); static void*_pager_window_cb_drag_convert(E_Drag *drag, const char *type); static void _pager_window_cb_drag_finished(E_Drag *drag, int dropped); @@ -664,6 +665,8 @@ _pager_window_new(Pager_Desk *pd, Evas_Object *mirror, E_Client *client) evas_object_event_callback_add(mirror, EVAS_CALLBACK_MOUSE_DOWN, _pager_window_cb_mouse_down, pw); + evas_object_event_callback_add(mirror, EVAS_CALLBACK_MOUSE_UP, + _pager_window_cb_mouse_up, pw); evas_object_event_callback_add(mirror, EVAS_CALLBACK_MOUSE_MOVE, _pager_window_cb_mouse_move, pw); evas_object_event_callback_add(mirror, EVAS_CALLBACK_DEL, @@ -1008,6 +1011,14 @@ _pager_window_cb_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUS } static void +_pager_window_cb_mouse_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info EINA_UNUSED) +{ + Pager_Win *pw = data; + + pw-drag.button = 0; +} + +static void _pager_window_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) { Evas_Event_Mouse_Down *ev; @@ -1057,6 +1068,7 @@ _pager_window_cb_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __U if (!pw) return; if (pw-client-lock_user_location) return; if ((pw-desk-pager-popup) (!act_popup)) return; + if (!pw-drag.button) return; /* prevent drag for a few pixels */ if (!pw-drag.start) return; --
[EGIT] [core/enlightenment] master 03/03: fix remember geometry updating
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=b0d53be21d55a07a13cfaa49676bc7b96c1029c2 commit b0d53be21d55a07a13cfaa49676bc7b96c1029c2 Author: Mike Blumenkrantz zm...@samsung.com Date: Wed Jan 15 22:52:14 2014 -0500 fix remember geometry updating T791 --- src/bin/e_client.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/bin/e_client.c b/src/bin/e_client.c index e6cceb1..ece8a84 100644 --- a/src/bin/e_client.c +++ b/src/bin/e_client.c @@ -1314,6 +1314,7 @@ _e_client_cb_evas_move(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UN _e_client_zone_update(ec); if (ec-moving || (ecmove == ec)) _e_client_hook_call(E_CLIENT_HOOK_MOVE_UPDATE, ec); + e_remember_update(ec); } static void @@ -1345,6 +1346,7 @@ _e_client_cb_evas_resize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_ if (e_client_resizing_get(ec) || (ecresize == ec)) _e_client_hook_call(E_CLIENT_HOOK_RESIZE_UPDATE, ec); + e_remember_update(ec); } static void --
[EGIT] [core/enlightenment] master 02/03: use current client position for post frame set any time changes.pos is set
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=2410660dd102c9c39bd0e92bfe9f3a8f504b3fe2 commit 2410660dd102c9c39bd0e92bfe9f3a8f504b3fe2 Author: Mike Blumenkrantz zm...@samsung.com Date: Wed Jan 15 21:14:38 2014 -0500 use current client position for post frame set any time changes.pos is set T790 --- src/bin/e_comp_object.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c index f9f8d1d..a329452 100644 --- a/src/bin/e_comp_object.c +++ b/src/bin/e_comp_object.c @@ -2635,7 +2635,7 @@ reshadow: */ int x, y; - if (cw-ec-placed cw-ec-new_client) + if (cw-ec-changes.size) { x = cw-ec-x; y = cw-ec-y; --
[EGIT] [core/enlightenment] master 01/03: override/placed gets set on compositor side
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=17291018db8387ddfe0a835581674280ed926e69 commit 17291018db8387ddfe0a835581674280ed926e69 Author: Mike Blumenkrantz zm...@samsung.com Date: Wed Jan 15 21:04:10 2014 -0500 override/placed gets set on compositor side --- src/bin/e_client.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/bin/e_client.c b/src/bin/e_client.c index e2ccc96..e6cceb1 100644 --- a/src/bin/e_client.c +++ b/src/bin/e_client.c @@ -1585,8 +1585,6 @@ _e_client_eval(E_Client *ec) if ((x != ec-x) || (y != ec-y)) ec-changes.pos = 1; ec-placed = 1; } -if (ec-override) - ec-placed = 1; if (!ec-placed) { /* FIXME: special placement for dialogs etc. etc. etc goes --
[EGIT] [core/enlightenment] master 01/02: add e_comp_object_frame_icon_geometry_get
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=18c74cb382b491c65bdd67cb33ecc94effa14b7c commit 18c74cb382b491c65bdd67cb33ecc94effa14b7c Author: Mike Blumenkrantz zm...@samsung.com Date: Wed Jan 15 22:58:42 2014 -0500 add e_comp_object_frame_icon_geometry_get --- src/bin/e_comp_object.c | 13 + src/bin/e_comp_object.h | 1 + 2 files changed, 14 insertions(+) diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c index a329452..99e4bb4 100644 --- a/src/bin/e_comp_object.c +++ b/src/bin/e_comp_object.c @@ -2496,6 +2496,19 @@ e_comp_object_frame_geometry_get(Evas_Object *obj, int *l, int *r, int *t, int * if (b) *b = cw-client_inset.b; } +EAPI void +e_comp_object_frame_icon_geometry_get(Evas_Object *obj, int *x, int *y, int *w, int *h) +{ + API_ENTRY; + + if (x) *x = 0; + if (y) *y = 0; + if (w) *w = 0; + if (h) *h = 0; + if (!cw-frame_icon) return; + evas_object_geometry_get(cw-frame_icon, x, y, w, h); +} + EAPI Eina_Bool e_comp_object_frame_title_set(Evas_Object *obj, const char *name) { diff --git a/src/bin/e_comp_object.h b/src/bin/e_comp_object.h index 1fca825..1f55f5e 100644 --- a/src/bin/e_comp_object.h +++ b/src/bin/e_comp_object.h @@ -50,6 +50,7 @@ EAPI void e_comp_object_util_center_on(Evas_Object *obj, Evas_Object *on); EAPI void e_comp_object_util_center_pos_get(Evas_Object *obj, int *x, int *y); EAPI void e_comp_object_util_fullscreen(Evas_Object *obj); EAPI void e_comp_object_frame_geometry_get(Evas_Object *obj, int *l, int *r, int *t, int *b); +EAPI void e_comp_object_frame_icon_geometry_get(Evas_Object *obj, int *x, int *y, int *w, int *h); EAPI Eina_Bool e_comp_object_frame_title_set(Evas_Object *obj, const char *name); EAPI Eina_Bool e_comp_object_frame_exists(Evas_Object *obj); EAPI void e_comp_object_frame_icon_update(Evas_Object *obj); --
[EGIT] [core/enlightenment] master 02/02: adjust frame icon drag geometry
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=f12cdee3cae9c0e7308fee5072d82c5094ef5945 commit f12cdee3cae9c0e7308fee5072d82c5094ef5945 Author: Mike Blumenkrantz zm...@samsung.com Date: Wed Jan 15 23:11:12 2014 -0500 adjust frame icon drag geometry T776 --- src/bin/e_client.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/bin/e_client.c b/src/bin/e_client.c index ece8a84..b60798a 100644 --- a/src/bin/e_client.c +++ b/src/bin/e_client.c @@ -2630,15 +2630,17 @@ e_client_mouse_move(E_Client *ec, Evas_Point *output) if (ec-netwm.icons || ec-desktop || ec-internal_icon) { Evas_Object *o = NULL; + int x, y, w, h; const char *drag_types[] = { enlightenment/border }; e_object_ref(E_OBJECT(ec)); + e_comp_object_frame_icon_geometry_get(ec-frame, x, y, w, h); client_drag = e_drag_new(ec-zone-comp, output-x, output-y, drag_types, 1, ec, -1, NULL, _e_client_cb_drag_finished); - e_drag_resize(client_drag, e_scale * 48, e_scale * 48); + e_drag_resize(client_drag, w, h); o = e_client_icon_add(ec, client_drag-evas); if (!o) { --
Re: [E-devel] [EGIT] [core/elementary] master 01/06: Adding elm_tooltip_movement_lock_set() and elm_tooltip_movement_lock_get()
hmm. which api? elm_scroller_freeze_push()? rendering should be transparent to the api users. why we need to set the api names depends on the redraw? -Regards, Hermet- -Original Message- From: Davide Andreolid...@gurumeditation.it To: Enlightenment developer listenlightenment-devel@lists.sourceforge.net; Cc: g...@lists.enlightenment.org; a.aryadi...@samsung.com; Sent: 2014-01-16 (목) 06:58:17 Subject: Re: [E-devel] [EGIT] [core/elementary] master 01/06: Adding elm_tooltip_movement_lock_set() and elm_tooltip_movement_lock_get() 2014/1/15 Daniel Juyung Seo seojuyung2@gmail.com Hmm both sounds ok but I also prefer freeze it is used in various meanings around efl libraries. And freeze is familar than lock in efl API. So, elm_tooltip_move_freeze_set()? hmmm, freeze (in all efl) means that the widget will not redraw itself, in this case we are just set to not move... freeze seems really wrong to me in this context davemds How do you think, Abhi? Thanks. Daniel Juyung Seo (SeoZ) On Wed, Jan 15, 2014 at 7:20 PM, ChunEon Park hermet@naver.com wrote: there freeze() apis meaning all are different but simliar. for consistency i suggested. -Regards, Hermet- -Original Message- From: Iván Brianosachieru@gmail.com To: Enlightenment developer list enlightenment-devel@lists.sourceforge.net; Cc: g...@lists.enlightenment.orggit@lists.enlightenment.org; Sent: 2014-01-15 (수) 18:10:08 Subject: Re: [E-devel] [EGIT] [core/elementary] master 01/06: Adding elm_tooltip_movement_lock_set() and elm_tooltip_movement_lock_get() On Wednesday, January 15, 2014, ChunEon Park wrote: elm_tooltip_movement_lock_set() ? how about _freeze_set() ? we already use the freeze word entirely. Those have a different meaning. -Regards, Hermet- -Original Message- From: abhia.aryadipta@samsung.com To: git@lists.enlightenment.org; Cc: Sent: 2014-01-13 (월) 15:47:26 Subject: [EGIT] [core/elementary] master 01/06: Adding elm_tooltip_movement_lock_set() and elm_tooltip_movement_lock_get() raster pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=1832450176b188773557c39e5cf1eee0f47a8858 commit 1832450176b188773557c39e5cf1eee0f47a8858 Author: abhi a.aryadipta@samsung.com Date: Mon Jan 13 15:22:47 2014 +0900 Adding elm_tooltip_movement_lock_set() and elm_tooltip_movement_lock_get() Summary: These APIs allow to enable/disable a tooltip to move with respect to mouse pointer Test Plan: elm_tooltip_movement_lock_set(), elm_tooltip_movement_lock_get(), elementary_test -to tooltip Reviewers: singh.amitesh, seoz, raster Reviewed By: raster CC: raster Differential Revision: https://phab.enlightenment.org/D369 --- ChangeLog4 NEWS 2 ++ src/bin/test_tooltip.c 24 src/lib/elm_tooltip.h 32 src/lib/els_tooltip.c 29 - 5 files changed, 86 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 56975bb..f845744 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1772,3 +1772,7 @@ 2013-12-01 Mike Blumenkrantz * fix mouse eventing on e border theme + +2013-12-09 Abhinandan Aryadipta (aryarockstar) + +* tooltip: Added elm_tooltip_move_lock_set() and elm_tooltip_move_lock_get(). diff --git a/NEWS b/NEWS index 85da746..a32848f 100644 --- a/NEWS +++ b/NEWS @@ -7,6 +7,8 @@ Changes since Elementary 1.8.0: Additions: + * Add elm_tooltip_move_lock_set() and elm_tooltip_move_lock_get() + Improvements: Fixes: diff --git a/src/bin/test_tooltip.c b/src/bin/test_tooltip.c index 332eced..d5ac0af 100644 --- a/src/bin/test_tooltip.c +++ b/src/bin/test_tooltip.c @@ -200,6 +200,23 @@ _tt_text_replace(void *data EINA_UNUSED, } static void +_tt_move_lock(void *data EINA_UNUSED, + Evas_Object *obj, + void *event_info EINA_UNUSED) +{ + if (!elm_tooltip_move_lock_get(obj)) + { +elm_tooltip_move_lock_set(obj, EINA_TRUE); +elm_object_tooltip_text_set(obj, Locked); + } + else + { +elm_tooltip_move_lock_set(obj, EINA_FALSE); +elm_object_tooltip_text_set(obj, Free); + } +} + +static void _tt_orient_text_replace(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) @@ -489,6 +506,13 @@ test_tooltip(void *data EINA_UNUSED, evas_object_show(bt); bt =
Re: [E-devel] [EGIT] [core/elementary] master 01/06: Adding elm_tooltip_movement_lock_set() and elm_tooltip_movement_lock_get()
On Thu, Jan 16, 2014 at 1:26 PM, ChunEon Park her...@naver.com wrote: hmm. which api? elm_scroller_freeze_push()? rendering should be transparent to the api users. why we need to set the api names depends on the redraw? It was the other way, most API in efl that use freeze as a key word refer to stopping redraw and event propagation. -Regards, Hermet- -Original Message- From: Davide Andreolid...@gurumeditation.it To: Enlightenment developer listenlightenment-devel@lists.sourceforge.net; Cc: g...@lists.enlightenment.org; a.aryadi...@samsung.com; Sent: 2014-01-16 (목) 06:58:17 Subject: Re: [E-devel] [EGIT] [core/elementary] master 01/06: Adding elm_tooltip_movement_lock_set() and elm_tooltip_movement_lock_get() 2014/1/15 Daniel Juyung Seo seojuyung2@gmail.com Hmm both sounds ok but I also prefer freeze it is used in various meanings around efl libraries. And freeze is familar than lock in efl API. So, elm_tooltip_move_freeze_set()? hmmm, freeze (in all efl) means that the widget will not redraw itself, in this case we are just set to not move... freeze seems really wrong to me in this context davemds How do you think, Abhi? Thanks. Daniel Juyung Seo (SeoZ) On Wed, Jan 15, 2014 at 7:20 PM, ChunEon Park hermet@naver.com wrote: there freeze() apis meaning all are different but simliar. for consistency i suggested. -Regards, Hermet- -Original Message- From: Iván Brianosachieru@gmail.com To: Enlightenment developer list enlightenment-devel@lists.sourceforge.net; Cc: g...@lists.enlightenment.orggit@lists.enlightenment.org; Sent: 2014-01-15 (수) 18:10:08 Subject: Re: [E-devel] [EGIT] [core/elementary] master 01/06: Adding elm_tooltip_movement_lock_set() and elm_tooltip_movement_lock_get() On Wednesday, January 15, 2014, ChunEon Park wrote: elm_tooltip_movement_lock_set() ? how about _freeze_set() ? we already use the freeze word entirely. Those have a different meaning. -Regards, Hermet- -Original Message- From: abhia.aryadipta@samsung.com To: git@lists.enlightenment.org; Cc: Sent: 2014-01-13 (월) 15:47:26 Subject: [EGIT] [core/elementary] master 01/06: Adding elm_tooltip_movement_lock_set() and elm_tooltip_movement_lock_get() raster pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=1832450176b188773557c39e5cf1eee0f47a8858 commit 1832450176b188773557c39e5cf1eee0f47a8858 Author: abhi a.aryadipta@samsung.com Date: Mon Jan 13 15:22:47 2014 +0900 Adding elm_tooltip_movement_lock_set() and elm_tooltip_movement_lock_get() Summary: These APIs allow to enable/disable a tooltip to move with respect to mouse pointer Test Plan: elm_tooltip_movement_lock_set(), elm_tooltip_movement_lock_get(), elementary_test -to tooltip Reviewers: singh.amitesh, seoz, raster Reviewed By: raster CC: raster Differential Revision: https://phab.enlightenment.org/D369 --- ChangeLog4 NEWS 2 ++ src/bin/test_tooltip.c 24 src/lib/elm_tooltip.h 32 src/lib/els_tooltip.c 29 - 5 files changed, 86 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 56975bb..f845744 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1772,3 +1772,7 @@ 2013-12-01 Mike Blumenkrantz * fix mouse eventing on e border theme + +2013-12-09 Abhinandan Aryadipta (aryarockstar) + +* tooltip: Added elm_tooltip_move_lock_set() and elm_tooltip_move_lock_get(). diff --git a/NEWS b/NEWS index 85da746..a32848f 100644 --- a/NEWS +++ b/NEWS @@ -7,6 +7,8 @@ Changes since Elementary 1.8.0: Additions: + * Add elm_tooltip_move_lock_set() and elm_tooltip_move_lock_get() + Improvements: Fixes: diff --git a/src/bin/test_tooltip.c b/src/bin/test_tooltip.c index 332eced..d5ac0af 100644 --- a/src/bin/test_tooltip.c +++ b/src/bin/test_tooltip.c @@ -200,6 +200,23 @@ _tt_text_replace(void *data EINA_UNUSED, } static void +_tt_move_lock(void *data EINA_UNUSED, + Evas_Object *obj, + void *event_info EINA_UNUSED) +{ + if (!elm_tooltip_move_lock_get(obj)) + { +elm_tooltip_move_lock_set(obj, EINA_TRUE); +elm_object_tooltip_text_set(obj, Locked); + } + else + { +elm_tooltip_move_lock_set(obj, EINA_FALSE); +elm_object_tooltip_text_set(obj, Free); + } +} + +static void _tt_orient_text_replace(void *data EINA_UNUSED,
Re: [E-devel] [EGIT] [core/elementary] master 01/06: Adding elm_tooltip_movement_lock_set() and elm_tooltip_movement_lock_get()
But elm_object_scroll_freeze() has a behavior that not block the event nor redraw but stopping the scrolling. ecore_timer_freeze()? Feeze meaning depends on the context as if it stop/block something behavior. -Regards, Hermet- -Original Message- From: Cedric BAILcedric.b...@free.fr To: Enlightenment developer listenlightenment-devel@lists.sourceforge.net; Cc: Sent: 2014-01-16 (목) 14:58:28 Subject: Re: [E-devel] [EGIT] [core/elementary] master 01/06: Adding elm_tooltip_movement_lock_set() and elm_tooltip_movement_lock_get() On Thu, Jan 16, 2014 at 1:26 PM, ChunEon Park hermet@naver.com wrote: hmm. which api? elm_scroller_freeze_push()? rendering should be transparent to the api users. why we need to set the api names depends on the redraw? It was the other way, most API in efl that use freeze as a key word refer to stopping redraw and event propagation. -Regards, Hermet- -Original Message- From: Davide Andreolidave@gurumeditation.it To: Enlightenment developer listenlightenment-devel@lists.sourceforge.net; Cc: git@lists.enlightenment.org; a.aryadipta@samsung.com; Sent: 2014-01-16 (목) 06:58:17 Subject: Re: [E-devel] [EGIT] [core/elementary] master 01/06: Adding elm_tooltip_movement_lock_set() and elm_tooltip_movement_lock_get() 2014/1/15 Daniel Juyung Seo seojuyung2@gmail.com Hmm both sounds ok but I also prefer freeze it is used in various meanings around efl libraries. And freeze is familar than lock in efl API. So, elm_tooltip_move_freeze_set()? hmmm, freeze (in all efl) means that the widget will not redraw itself, in this case we are just set to not move... freeze seems really wrong to me in this context davemds How do you think, Abhi? Thanks. Daniel Juyung Seo (SeoZ) On Wed, Jan 15, 2014 at 7:20 PM, ChunEon Park hermet@naver.com wrote: there freeze() apis meaning all are different but simliar. for consistency i suggested. -Regards, Hermet- -Original Message- From: Iván Brianosachieru@gmail.com To: Enlightenment developer list enlightenment-devel@lists.sourceforge.net; Cc: g...@lists.enlightenment.orggit@lists.enlightenment.org; Sent: 2014-01-15 (수) 18:10:08 Subject: Re: [E-devel] [EGIT] [core/elementary] master 01/06: Adding elm_tooltip_movement_lock_set() and elm_tooltip_movement_lock_get() On Wednesday, January 15, 2014, ChunEon Park wrote: elm_tooltip_movement_lock_set() ? how about _freeze_set() ? we already use the freeze word entirely. Those have a different meaning. -Regards, Hermet- -Original Message- From: abhia.aryadipta@samsung.com To: git@lists.enlightenment.org; Cc: Sent: 2014-01-13 (월) 15:47:26 Subject: [EGIT] [core/elementary] master 01/06: Adding elm_tooltip_movement_lock_set() and elm_tooltip_movement_lock_get() raster pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=1832450176b188773557c39e5cf1eee0f47a8858 commit 1832450176b188773557c39e5cf1eee0f47a8858 Author: abhi a.aryadipta@samsung.com Date: Mon Jan 13 15:22:47 2014 +0900 Adding elm_tooltip_movement_lock_set() and elm_tooltip_movement_lock_get() Summary: These APIs allow to enable/disable a tooltip to move with respect to mouse pointer Test Plan: elm_tooltip_movement_lock_set(), elm_tooltip_movement_lock_get(), elementary_test -to tooltip Reviewers: singh.amitesh, seoz, raster Reviewed By: raster CC: raster Differential Revision: https://phab.enlightenment.org/D369 --- ChangeLog4 NEWS 2 ++ src/bin/test_tooltip.c 24 src/lib/elm_tooltip.h 32 src/lib/els_tooltip.c 29 - 5 files changed, 86 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 56975bb..f845744 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1772,3 +1772,7 @@ 2013-12-01 Mike Blumenkrantz * fix mouse eventing on e border theme + +2013-12-09 Abhinandan Aryadipta (aryarockstar) + +* tooltip: Added elm_tooltip_move_lock_set() and elm_tooltip_move_lock_get(). diff --git a/NEWS b/NEWS index 85da746..a32848f 100644 --- a/NEWS +++ b/NEWS @@ -7,6 +7,8 @@ Changes since Elementary 1.8.0: Additions: + * Add elm_tooltip_move_lock_set() and elm_tooltip_move_lock_get() + Improvements: Fixes: diff --git a/src/bin/test_tooltip.c b/src/bin/test_tooltip.c index 332eced..d5ac0af 100644 --- a/src/bin/test_tooltip.c +++ b/src/bin/test_tooltip.c @@ -200,6 +200,23 @@ _tt_text_replace(void *data EINA_UNUSED, } static
[E-devel] Switch users feature req.
Hi. Many times i had to restart e and well i thought that if there was an ability to switch users not just log out, then maybe those processes could be restored back. on my view this can be easily done with e-analog of dtach or something else that usually puts terminal apps into background. i'm not really sure on how to do that with some desktop managers or systemd - that's something that i don't understand much, as a user i just want to kinda suspend my session and run another new user session and switch between em - that's a usual option everyone knows where. and in case of errors well such function just could restore whole-e. -- Symbiants oe ai -- CenturyLink Cloud: The Leader in Enterprise Cloud Services. Learn Why More Businesses Are Choosing CenturyLink Cloud For Critical Workloads, Development Environments Everything In Between. Get a Quote or Start a Free Trial Today. http://pubads.g.doubleclick.net/gampad/clk?id=119420431iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Bob
Felipe Magno de Almeida wrote: Hello all, I would like to share some ideas for Bob, which I see as an evolution of edje. Please correct me if I'm wrong. Since I've started developing, back in 2008, a C++ Gui Library, which has been already removed from assembla a long time ago, I've already been eyeing the project AdamEve from Adobe Software Library (ASL). Documentation can be found here: http://stlab.adobe.com/group__asl__overview.html I think it is obvious the advantage of writing in a declarative way a UI. But, writing UIs in EFL/Elementary are still a bit awkward and requires more code than is necessary, because edje doesn't offer a more dynamic layout setting. This generally requires box widgets to be instantiated and edje layouts to be placed as small fixed dialogs inside a multiple boxed layout. If bob/edje would incorporate ASL's AdamEve idea, we could develop more fluid and easily portable layouts that would could ease developing applications based in EFL. The layout language could be written in Lua and a C engine could do the automatic layout placement. It would require that the language gives room for manual placement so the layout can be finely-tuned too, but I think this idea can vastly ease development of UI for applications. BTW, there was a question about constraint solver on the ML recently. I think it might've been related to this topic. Regards, A, surely you were around during the great config data wars. No? Well, it's complicated... but in brief: There was a time, not too long ago, when chaos ruled. It's true. Everyone had their own way of storing various kinds of data, had to write their own parsers, apis, etc. It was a lively time but lacked unity and clarity. Then some great WWWizards got together and created XML and the DOM. Everyone rejoiced! At last, one method to rule them all! It was da thing. It even allowed for more dynamic aspects via your choice of scripting languages, though javascript was generally the ruling one. Soon, following the example of HTML, this was applied to describing UI's by many... Mozilla, Adobe, MS, and others did it and we saw things like xul, mxml, xaml, and other x and l combinations. Some even allowed for various mixings of them (notably Mozilla which had allowed for mixed html, svg and xul namespaces in a single file). But not everyone was happy... some cried that ze DOM was too slow, and ze XML syntax too verbose... Many independent minded rebels went their own way, one even did an edc thing... Soon, a rebel alliance, using the dominant javascript scripting language as a guide, came up with JSON. Many then rejoiced anew... alas, it is this one that is da true thing! And some like Sun, Nokia/Qt, and others embraced this new thing and we saw javafx, qml, and other new declarative/scripted UI's. But perhaps neither one is truly, da true thing after all you say? Maybe it's a Lua based thingy that will be better? U.. As to edje and elm. Well, edje predates elem by quite a few years and so you don't see edje part types that correspond to elem widget types (rather, you actually use basic edje parts to theme elem widgets, as ewl and etk did long ago). Edje was not extensible so you couldn't just extend the lib by adding new part types.. so some people came up with a simple 'modules' based method to add some amount of extensibility and hence you have the edje EXTERNAL part type. Such an edje module for elem exists (or did) and if you use it you can indeed define elem guis via edje/edc. You can ask Gustavo and I'm sure he'll be able to show you some good examples.. it can actually be very powerful. However, it's not pretty... Using the EXTERNAL part in this way (ie. with something like elem) was not really its intended use at the start (though Brian did want that), and last I recall (several years ago) there were still issues with signal propagation to nested children. Do THIS before eating carbs #40;every time#41; 1 EASY tip to increase fat-burning, lower blood sugar decrease fat storage http://thirdpartyoffers.juno.com/TGL3141/52d78ab7a081cab33eb3st01duc -- CenturyLink Cloud: The Leader in Enterprise Cloud Services. Learn Why More Businesses Are Choosing CenturyLink Cloud For Critical Workloads, Development Environments Everything In Between. Get a Quote or Start a Free Trial Today. http://pubads.g.doubleclick.net/gampad/clk?id=119420431iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/efl] master 01/01: edje_entry: When preediting, cursor should not be moved.
woohyun pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=1d189f43f6c4e9a9e6cdc3f3bffcdb0fc2493560 commit 1d189f43f6c4e9a9e6cdc3f3bffcdb0fc2493560 Author: WooHyun Jung wh0705.j...@samsung.com Date: Thu Jan 16 16:31:36 2014 +0900 edje_entry: When preediting, cursor should not be moved. --- src/lib/edje/edje_entry.c | 4 1 file changed, 4 insertions(+) diff --git a/src/lib/edje/edje_entry.c b/src/lib/edje/edje_entry.c index 8d992d7..f4b42fa 100644 --- a/src/lib/edje/edje_entry.c +++ b/src/lib/edje/edje_entry.c @@ -1304,6 +1304,10 @@ _edje_key_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, (!strcmp(ev-key, KP_Down) !ev-string) || !strcmp(ev-key, Up) || (!strcmp(ev-key, KP_Up) !ev-string) || + !strcmp(ev-key, Left) || + (!strcmp(ev-key, KP_Left) !ev-string) || + !strcmp(ev-key, Right) || + (!strcmp(ev-key, KP_Right) !ev-string) || !strcmp(ev-key, Next) || (!strcmp(ev-key, KP_Next) !ev-string) || !strcmp(ev-key, Prior) || --