Re: [E-devel] Enlightenment Korean Dinner
On Mon, Nov 11, 2013 at 6:25 PM, Cedric BAIL cedric.b...@free.fr wrote: So who is in on Saturday night ? I am. -- Leandro -- November Webinars for C, C++, Fortran Developers Accelerate application performance with scalable programming models. Explore techniques for threading, error checking, porting, and tuning. Get the most from the latest Intel processors and coprocessors. See abstracts and register http://pubads.g.doubleclick.net/gampad/clk?id=60136231iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Enlightenment Korean Dinner
Ah, I can't attend since I've had a schedule on the Saturday. Sorry. -Regards, Hermet- -Original Message- From: Leandro Pereiralean...@profusion.mobi To: Enlightenment developer listenlightenment-devel@lists.sourceforge.net; Cc: E Usersenlightenment-us...@lists.sourceforge.net; Sent: 2013-11-12 (화) 17:14:59 Subject: Re: [E-devel] Enlightenment Korean Dinner On Mon, Nov 11, 2013 at 6:25 PM, Cedric BAIL cedric.bail@free.fr wrote: So who is in on Saturday night ? I am. -- Leandro -- November Webinars for C, C++, Fortran Developers Accelerate application performance with scalable programming models. Explore techniques for threading, error checking, porting, and tuning. Get the most from the latest Intel processors and coprocessors. See abstracts and register http://pubads.g.doubleclick.net/gampad/clk?id=60136231iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- November Webinars for C, C++, Fortran Developers Accelerate application performance with scalable programming models. Explore techniques for threading, error checking, porting, and tuning. Get the most from the latest Intel processors and coprocessors. See abstracts and register http://pubads.g.doubleclick.net/gampad/clk?id=60136231iu=/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: eina: fix uninitialized data use.
cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=1281a8369f5200c2723fb027edc1625a4a939874 commit 1281a8369f5200c2723fb027edc1625a4a939874 Author: Cedric Bail cedric.b...@samsung.com Date: Tue Nov 12 19:01:10 2013 +0900 eina: fix uninitialized data use. --- src/lib/eina/eina_stringshare.c| 2 +- src/tests/eina/eina_test_stringshare.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/eina/eina_stringshare.c b/src/lib/eina/eina_stringshare.c index a630368..36af6d4 100644 --- a/src/lib/eina/eina_stringshare.c +++ b/src/lib/eina/eina_stringshare.c @@ -680,7 +680,7 @@ eina_stringshare_nprintf(unsigned int len, const char *fmt, ...) if (size 1) return NULL; - return eina_stringshare_add_length(tmp, len); + return eina_stringshare_add_length(tmp, size); } EAPI Eina_Stringshare * diff --git a/src/tests/eina/eina_test_stringshare.c b/src/tests/eina/eina_test_stringshare.c index 9842b11..13c7247 100644 --- a/src/tests/eina/eina_test_stringshare.c +++ b/src/tests/eina/eina_test_stringshare.c @@ -224,7 +224,7 @@ START_TEST(eina_stringshare_print) fail_if(strcmp(t3, xTEST1y) != 0); fail_if(((int)strlen(TEST1) + 2) != eina_stringshare_strlen(t1)); fail_if(((int)strlen(TEST1) + 2) != eina_stringshare_strlen(t2)); - fail_if(10 != eina_stringshare_strlen(t3)); + fail_if(8 != eina_stringshare_strlen(t3)); eina_stringshare_del(t1); eina_stringshare_del(t2); eina_stringshare_del(t3); --
[EGIT] [core/efl] master 01/01: efl: let's try to force that thread things this way.
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=4ff18573a0ab9d88f00ae4bb456dafc0114e7831
commit 4ff18573a0ab9d88f00ae4bb456dafc0114e7831
Author: Cedric Bail cedric.b...@samsung.com
Date: Tue Nov 12 19:29:45 2013 +0900
efl: let's try to force that thread things this way.
---
m4/efl_threads.m4 | 5 +
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/m4/efl_threads.m4 b/m4/efl_threads.m4
index acea5a9..e06022d 100644
--- a/m4/efl_threads.m4
+++ b/m4/efl_threads.m4
@@ -14,7 +14,7 @@ AC_DEFUN([EFL_CHECK_THREADS],
dnl Generic thread detection
-EFL_PTHREAD_CFLAGS=
+EFL_PTHREAD_CFLAGS=-D_REENTRANT
EFL_PTHREAD_LIBS=
_efl_have_posix_threads=no
@@ -127,9 +127,6 @@ if test x${efl_have_posix_threads_spinlock} = xyes ;
then
AC_DEFINE([EFL_HAVE_POSIX_THREADS_SPINLOCK], [1], [Define to mention that
POSIX threads spinlocks are supported])
fi
-echo _efl_have_posix_threads: ${_efl_have_posix_threads}
-echo _efl_have_win32_threads: ${_efl_have_win32_threads}
-
AS_IF([test x$_efl_have_posix_threads = xyes || test
x$_efl_have_win32_threads = xyes],
[$1],
[m4_if([$2], [$2], [AC_MSG_ERROR([Threads are required.])])])
--
[EGIT] [core/efl] master 01/01: eina: adjust precision for all our targeted convertion.
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=2dc092d36e0741bcdffca23f82b2acbac8e0cda7
commit 2dc092d36e0741bcdffca23f82b2acbac8e0cda7
Author: Cedric Bail cedric.b...@samsung.com
Date: Tue Nov 12 20:12:54 2013 +0900
eina: adjust precision for all our targeted convertion.
---
src/tests/eina/eina_test_value.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/tests/eina/eina_test_value.c b/src/tests/eina/eina_test_value.c
index fc74e8b..a7d2531 100644
--- a/src/tests/eina/eina_test_value.c
+++ b/src/tests/eina/eina_test_value.c
@@ -26,8 +26,8 @@
#include eina_suite.h
#include Eina.h
-#define FP_ERR (0.001)
-#define CHECK_FP(a, b) ((a - b) FP_ERR)
+#define FP_ERR (1)
+#define CHECK_FP(a, b) ((a - b) = FP_ERR)
START_TEST(eina_value_test_simple)
{
--
[EGIT] [core/elementary] master 01/02: dayselector/gesture_layer/layout: typo doxygen
yakov pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=484eecae6afee7ef5ea6b3982885bd92b8b2739f commit 484eecae6afee7ef5ea6b3982885bd92b8b2739f Author: Yakov Goldberg yako...@samsung.com Date: Tue Nov 12 15:50:17 2013 +0200 dayselector/gesture_layer/layout: typo doxygen --- src/lib/elm_dayselector_eo.h | 2 -- src/lib/elm_gesture_layer_eo.h | 1 - src/lib/elm_layout_eo.h| 3 +++ 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/elm_dayselector_eo.h b/src/lib/elm_dayselector_eo.h index 9bcce99..734efd6 100644 --- a/src/lib/elm_dayselector_eo.h +++ b/src/lib/elm_dayselector_eo.h @@ -142,7 +142,6 @@ enum * * Set the weekdays's names * - * @param[in] day * @param[in] weekdays * * @see elm_dayselector_weekdays_names_set @@ -157,7 +156,6 @@ enum * * Get the weekdays' names * - * @param[in] day * @param[out] ret * * @see elm_dayselector_weekdays_names_get diff --git a/src/lib/elm_gesture_layer_eo.h b/src/lib/elm_gesture_layer_eo.h index fa7cbfb..1d4daae 100644 --- a/src/lib/elm_gesture_layer_eo.h +++ b/src/lib/elm_gesture_layer_eo.h @@ -192,7 +192,6 @@ enum * It is recommended to not set a too much big or little value to avoid weird * behaviors. * - * @param[in] obj gesture-layer. * @param[in] fsize Finger size * * @see elm_gesture_layer_tap_finger_size_get diff --git a/src/lib/elm_layout_eo.h b/src/lib/elm_layout_eo.h index 1abb538..819ff3f 100644 --- a/src/lib/elm_layout_eo.h +++ b/src/lib/elm_layout_eo.h @@ -324,6 +324,9 @@ * * Eval sizing, restricted to current width and/or height * + * @param[in] w Restrict minimum size to the current width + * @param[in] h Restrict minimum size ot the current height + * * @see elm_layout_sizing_restricted_eval */ #define elm_obj_layout_sizing_restricted_eval(width, height) ELM_OBJ_LAYOUT_ID(ELM_OBJ_LAYOUT_SUB_ID_SIZING_RESTRICTED_EVAL), EO_TYPECHECK(Eina_Bool, width), EO_TYPECHECK(Eina_Bool, height) --
[EGIT] [core/elementary] master 02/02: elm_app_client: fix eo define for not yet implemented func
yakov pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=b746d5e1931f4cc6839e4159e7d72db2f3fbe93c commit b746d5e1931f4cc6839e4159e7d72db2f3fbe93c Author: Yakov Goldberg yako...@samsung.com Date: Tue Nov 12 15:54:58 2013 +0200 elm_app_client: fix eo define for not yet implemented func --- src/lib/elm_app_client_view_eo.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/elm_app_client_view_eo.h b/src/lib/elm_app_client_view_eo.h index 63999dc..d34cb8e 100644 --- a/src/lib/elm_app_client_view_eo.h +++ b/src/lib/elm_app_client_view_eo.h @@ -103,7 +103,7 @@ typedef void *(*Elm_App_Client_View_Cb)(void *data, Elm_App_Client_View *view, c * @param[out] has_alpha if icon have alpha channel * @param[out] pixels unsigned char array, with all bytes of icon */ -#define elm_app_client_view_icon_pixels_get(w, h, has_alpha, pixels) ELM_APP_CLIENT_VIEW_ID(ELM_APP_CLIENT_VIEW_SUB_ID_ICON_PIXELS_GET), EO_TYPECHECK(unsigned int *, h), EO_TYPECHECK(Eina_Bool *, has_alpha), EO_TYPECHECK(const unsigned char **, pixels) +#define elm_app_client_view_icon_pixels_get(w, h, has_alpha, pixels) ELM_APP_CLIENT_VIEW_ID(ELM_APP_CLIENT_VIEW_SUB_ID_ICON_PIXELS_GET), EO_TYPECHECK(unsigned int *, w), EO_TYPECHECK(unsigned int *, h), EO_TYPECHECK(Eina_Bool *, has_alpha), EO_TYPECHECK(const unsigned char **, pixels) /** * @def elm_app_client_view_progress_get --
[EGIT] [core/elementary] master 01/01: deps removal - fix pc file to match
raster pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=896a287589e6e3c03bc32124cdea801378b7c9c3
commit 896a287589e6e3c03bc32124cdea801378b7c9c3
Author: Carsten Haitzler (Rasterman) ras...@rasterman.com
Date: Tue Nov 12 23:13:41 2013 +0900
deps removal - fix pc file to match
---
elementary.pc.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/elementary.pc.in b/elementary.pc.in
index ee2a80c..b03734d 100644
--- a/elementary.pc.in
+++ b/elementary.pc.in
@@ -9,5 +9,5 @@ Name: elementary
Description: Mobile device touchscreen widget library
@pkgconfig_requires_private@: @requirement_elm@
Version: @VERSION@
-Libs: -L${libdir} -lelementary @my_libs@ @ELEMENTARY_LIBS@ @EVIL_LIBS@
@ELEMENTARY_EFREET_LIBS@ @ELEMENTARY_ETHUMB_LIBS@ @ELEMENTARY_WEB_LIBS@
@ELEMENTARY_EMAP_LIBS@ @ELEMENTARY_ECORE_IMF_LIBS@ @ELEMENTARY_ECORE_CON_LIBS@
+Libs: -L${libdir} -lelementary @my_libs@ @ELEMENTARY_LIBS@ @EVIL_LIBS@
@ELEMENTARY_WEB_LIBS@ @ELEMENTARY_EMAP_LIBS@
Cflags: -I${includedir}/elementary-@VMAJ@
--
[EGIT] [website/planet] master 02/02: added princeamd feed
thanatermesis pushed a commit to branch master. http://git.enlightenment.org/website/planet.git/commit/?id=b142f411bbaf8ce3cb254dd4e927dc05991b4004 commit b142f411bbaf8ce3cb254dd4e927dc05991b4004 Author: Thanatermesis thanaterme...@gmail.com Date: Tue Nov 12 01:54:48 2013 +0100 added princeamd feed --- conf/config.ini | 4 1 file changed, 4 insertions(+) diff --git a/conf/config.ini b/conf/config.ini index 5ea50b9..144e571 100644 --- a/conf/config.ini +++ b/conf/config.ini @@ -107,6 +107,10 @@ user = morlenxus name = ~Brian Miculcy face = yes +[http://princeamd.wordpress.com/feed/] +user = princeamd +name = ~Deon Thomas + [http://www.elivecd.org/feed/] user = thanatermesis name = ~Thanatermesis --
[EGIT] [website/planet] master 01/02: switched author feed
thanatermesis pushed a commit to branch master. http://git.enlightenment.org/website/planet.git/commit/?id=556322d979fc972b1a9f5a7d39d29b8fb43d7a89 commit 556322d979fc972b1a9f5a7d39d29b8fb43d7a89 Author: Thanatermesis thanaterme...@gmail.com Date: Tue Nov 12 01:52:42 2013 +0100 switched author feed --- conf/config.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/config.ini b/conf/config.ini index a72b029..5ea50b9 100644 --- a/conf/config.ini +++ b/conf/config.ini @@ -108,8 +108,8 @@ name = ~Brian Miculcy face = yes [http://www.elivecd.org/feed/] -user = princeamd -name = ~Deon Thomas +user = thanatermesis +name = ~Thanatermesis [http://www.rasterman.com/rss.php] user = raster --
[EGIT] [core/elementary] master 03/03: elm_dayselector.c: fixed wrong widget style name set on smart add.
seoz pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=2a8e9eede97fb5ad853add6ca49bbe52718b474c commit 2a8e9eede97fb5ad853add6ca49bbe52718b474c Author: Daniel Juyung Seo seojuyu...@gmail.com Date: Wed Nov 13 03:24:59 2013 +0900 elm_dayselector.c: fixed wrong widget style name set on smart add. --- src/lib/elm_dayselector.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/elm_dayselector.c b/src/lib/elm_dayselector.c index 8a71908..e2e1da5 100644 --- a/src/lib/elm_dayselector.c +++ b/src/lib/elm_dayselector.c @@ -434,7 +434,8 @@ _elm_dayselector_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, dayselector, base, dayselector)) + if (!elm_layout_theme_set(obj, dayselector, base, + elm_widget_style_get(obj))) CRITICAL(Failed to set layout!); priv-week_start = _elm_config-week_start; --
[EGIT] [core/elementary] master 01/03: elm_dayselector.c: fixed formatting before working on it.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=63c67dcfa74f4eb152dbb588c4abfa5be6ab7dd0
commit 63c67dcfa74f4eb152dbb588c4abfa5be6ab7dd0
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Wed Nov 13 03:24:03 2013 +0900
elm_dayselector.c: fixed formatting before working on it.
---
src/lib/elm_dayselector.c | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/lib/elm_dayselector.c b/src/lib/elm_dayselector.c
index ff9702b..46e9e1e 100644
--- a/src/lib/elm_dayselector.c
+++ b/src/lib/elm_dayselector.c
@@ -680,9 +680,9 @@ _weekdays_name_set(Eo *obj, void *_pd, va_list *list)
sd-weekdays_names_set = EINA_TRUE;
else
{
- now = time(NULL);
- localtime_r(now, time_daysel);
- sd-weekdays_names_set = EINA_FALSE;
+now = time(NULL);
+localtime_r(now, time_daysel);
+sd-weekdays_names_set = EINA_FALSE;
}
for (idx = 0; idx ELM_DAYSELECTOR_MAX; idx++)
@@ -692,11 +692,11 @@ _weekdays_name_set(Eo *obj, void *_pd, va_list *list)
if (sd-weekdays_names_set)
elm_object_text_set(VIEW(it), weekdays[idx]);
else
-{
- time_daysel.tm_wday = idx;
- strftime(buf, sizeof(buf), %a, time_daysel);
- elm_object_text_set(VIEW(it), buf);
-}
+ {
+ time_daysel.tm_wday = idx;
+ strftime(buf, sizeof(buf), %a, time_daysel);
+ elm_object_text_set(VIEW(it), buf);
+ }
}
}
--
[EGIT] [core/elementary] master 01/01: configure.ac: say 'no' not 'none' when webkit is not detected during autogen.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=76b539e309cadf4818bc50452deea73dd6da741e
commit 76b539e309cadf4818bc50452deea73dd6da741e
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Wed Nov 13 03:26:48 2013 +0900
configure.ac: say 'no' not 'none' when webkit is not detected during
autogen.
---
configure.ac | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index dd4d732..630048f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -554,7 +554,7 @@ AC_SUBST(ELM_EMAP_DEF)
ELM_WEB_DEF=#undef
elementary_web_backend=detect
-elementary_web=none
+elementary_web=no
want_elementary_web=
AC_ARG_WITH([elementary-web-backend],
[AC_HELP_STRING([--with-elementary-web-backend=@:@ewebkit/ewebkit2/detect/none@:@],
[Select the WebKit backend for Elementary to support web
@:@default=detect@:@])],
@@ -592,10 +592,10 @@ if test x$want_elementary_web != xnone; then
ELM_WEB_DEF=#define
requirement_elm=${want_elementary_web} ${requirement_elm}
],
- [elementary_web=none]
+ [elementary_web=no]
)
else
-elementary_web=none
+elementary_web=no
fi
if test x$elementary_web_backend = xewebkit -o x$elementary_web_backend
= xewebkit2; then
--
[EGIT] [core/elementary] master 02/03: elm_dayselector.c: fixed wrong widget name check.
seoz pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=e915999df5d17303390cd80ff7064c5dc79e735a commit e915999df5d17303390cd80ff7064c5dc79e735a Author: Daniel Juyung Seo seojuyu...@gmail.com Date: Wed Nov 13 03:24:26 2013 +0900 elm_dayselector.c: fixed wrong widget name check. This fixes T481. https://phab.enlightenment.org/T481 --- src/lib/elm_dayselector.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/elm_dayselector.c b/src/lib/elm_dayselector.c index 46e9e1e..8a71908 100644 --- a/src/lib/elm_dayselector.c +++ b/src/lib/elm_dayselector.c @@ -242,7 +242,7 @@ _elm_dayselector_smart_content_set(Eo *obj, void *_pd, va_list *list) Elm_Dayselector_Smart_Data *sd = _pd; - if (strcmp(elm_object_widget_type_get(content), elm_check)) + if (strcmp(elm_object_widget_type_get(content), Elm_Check)) return; if (!item) return; --
[EGIT] [core/elementary] master 01/01: fix doc typo and breakage due widget_type case changes.
barbieri pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=3749a48e54c497b547bed183858304e61bd4fc3b
commit 3749a48e54c497b547bed183858304e61bd4fc3b
Author: Gustavo Sverzut Barbieri barbi...@profusion.mobi
Date: Tue Nov 12 17:03:49 2013 -0200
fix doc typo and breakage due widget_type case changes.
elm_widget_type_get() is not lowercase anymoe, rather Elm_Win. As
other parts of the elementary source were using evas_object_type_get()
use it, and it still returns the legacy lowercase name.
---
src/lib/elc_fileselector_button.c| 2 +-
src/lib/elc_fileselector_button_legacy.h | 2 +-
src/lib/elc_fileselector_entry_legacy.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/lib/elc_fileselector_button.c
b/src/lib/elc_fileselector_button.c
index c036265..db78579 100644
--- a/src/lib/elc_fileselector_button.c
+++ b/src/lib/elc_fileselector_button.c
@@ -108,7 +108,7 @@ _new_window_add(Elm_Fileselector_Button_Smart_Data *sd)
static Evas_Object *
_parent_win_get(Evas_Object *obj)
{
- while ((obj) (strcmp(elm_widget_type_get(obj), elm_win)))
+ while ((obj) (strcmp(evas_object_type_get(obj), elm_win)))
obj = elm_object_parent_widget_get(obj);
return obj;
diff --git a/src/lib/elc_fileselector_button_legacy.h
b/src/lib/elc_fileselector_button_legacy.h
index 86f5b28..9d80684 100644
--- a/src/lib/elc_fileselector_button_legacy.h
+++ b/src/lib/elc_fileselector_button_legacy.h
@@ -221,7 +221,7 @@ EAPI Eina_Bool
elm_fileselector_button_is_save_get(const Evas_
*
* @param obj The file selector button widget
* @param value @c EINA_TRUE to make it use an inner window, @c
- * EINA_TRUE to make it use a dedicated window
+ * EINA_FALSE to make it use a dedicated window
*
* @see elm_win_inwin_add() for more information on inner windows
* @see elm_fileselector_button_inwin_mode_get()
diff --git a/src/lib/elc_fileselector_entry_legacy.h
b/src/lib/elc_fileselector_entry_legacy.h
index a01855a..e6f2099 100644
--- a/src/lib/elc_fileselector_entry_legacy.h
+++ b/src/lib/elc_fileselector_entry_legacy.h
@@ -236,7 +236,7 @@ EAPI void
elm_fileselector_entry_inwin_mode_set(Evas_Obje
* dedicated Elementary window.
*
* @param obj The file selector entry widget
- * @return @c EINA_TRUE if will use an inner window, @c EINA_TRUE
+ * @return @c EINA_TRUE if will use an inner window, @c EINA_FALSE
* if it will use a dedicated window
*
* @see elm_fileselector_entry_inwin_mode_set() for more details
--
Re: [E-devel] Different 'flavors(?)' of Evas_Object?
At Tue, 12 Nov 2013 11:33:32 +0900 Carsten Haitzler (The Rasterman) ras...@rasterman.com wrote: On Mon, 11 Nov 2013 19:05:35 -0500 Robert Heller hel...@deepsoft.com said: At Tue, 12 Nov 2013 08:43:20 +0900 Carsten Haitzler (The Rasterman) ras...@rasterman.com wrote: On Mon, 11 Nov 2013 14:54:06 -0500 Robert Heller hel...@deepsoft.com said: If I create an object of type Evas_Object using edje_object_add: o = edje_object_add(mi-menu-evas); mi-separator_object = o; e_theme_edje_object_set(o, base/theme/start_menus, e/widgets/startmenu/default/separator); evas_object_show(o); edje_object_size_min_calc(mi-separator_object, ww, hh); mi-separator_w = ww; mi-separator_h = hh; does it make sense to later add this to some sort of e_widget container: (o = mi-separator_object or something similar and m-favorites_box was created with e_widget_list_add()) e_widget_list_object_append(m-favorites_box,o, 1, /* fill */ 1, /* expand */ 0.0 /* align */ ); Next question: there isn't an e_mumble_pack_options_set() type fucntion for e_widget_list's, so how does one properly propagate geometry? Calling e_box_pack_options_set() seems to be the wrong thing to do (well I get segfaults). e_widget_list's seem to be a higher-level box-like thing (there isn't an e_widget_box thing). just in the list of feed a man a fish vs teach a man to fish... did u try reading e_widget_list.c ? the anser is screaming at you from e_widget_list_object_append() you were asking about... :) (how does indeed the widget get the minimum size... or then set it again on itself... :)) Yes. And it does not work. it requires you wrap your edje obj in an e_widget so it can store the min size. :) just like the e_widget_table wraps e_table. as i mentioned - you're dealing with ancient infra. these days all of this is now in core evas or in elementary and is integrated. we will kill off e_widget* stuff in the coming months/years. Can I replace this code snipet: o = edje_object_add(mi-menu-evas); mi-bg_object = o; evas_object_intercept_move_callback_add(o, _e_start_menu_cb_intercept_item_move, mi); evas_object_intercept_resize_callback_add(o, _e_start_menu_cb_intercept_item_resize, mi); e_theme_edje_object_set(mi-bg_object, base/theme/start_menus, e/widgets/startmenu/default/item_bg); with something like this: o = e_widget_add(mi-menu-evas); mi-bg_object = o; evas_object_intercept_move_callback_add(o, _e_start_menu_cb_intercept_item_move, mi); evas_object_intercept_resize_callback_add(o, _e_start_menu_cb_intercept_item_resize, mi); e_theme_edje_object_set(mi-bg_object, base/theme/start_menus, e/widgets/startmenu/default/item_bg); That is replace edje_object_add with e_widget_add. What is really confusing, is that all of these functions return the same *type* (Evas_Object *), but return different things. This smells like the sorts of games X11 XToolkit does: faked OO programming in a non-OO language (plain C). Arg... (This is one of the reasons I stopped trying to write GUI code in C or C++ -- Tcl/Tk is a so much saner way to write GUI code.) Or do I need to invent a new widget type, that uses e_theme_edje_object_set on an underlying edje_object (eg copy e_widget_something.c .h and hack it to suit)? It is not clear to me, sorry to be so dense, but the documentation (such as it is) is just not helping me out. And the available source code is not jumping out with an *obvious* solution either. *OR* should we just abandon this project and wait for the E developers to re-write everything? Telling my that all of this code is going to be replaced in the 'comming months/years' does me no good. I am trying to implement this using the *existing* (poorly documented) system. We would like to release Version 1 this project soon. -- Robert Heller -- 978-544-6933 / hel...@deepsoft.com Deepwoods Software-- http://www.deepsoft.com/ () ascii ribbon campaign -- against html e-mail /\ www.asciiribbon.org -- against proprietary attachments -- DreamFactory - Open Source REST JSON Services for HTML5 Native Apps OAuth, Users, Roles, SQL, NoSQL, BLOB Storage and External API Access Free app hosting. Or install the open source package on any LAMP server. Sign up and see examples for AngularJS, jQuery, Sencha Touch and Native!
[EGIT] [core/elementary] master 01/01: delete window and children when button is gone
barbieri pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=472affcea56c9c207cb8dc51b6aad57549fc470f
commit 472affcea56c9c207cb8dc51b6aad57549fc470f
Author: Gustavo Sverzut Barbieri barbi...@profusion.mobi
Date: Tue Nov 12 17:17:13 2013 -0200
delete window and children when button is gone
---
src/lib/elc_fileselector_button.c | 6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/src/lib/elc_fileselector_button.c
b/src/lib/elc_fileselector_button.c
index db78579..90b9be8 100644
--- a/src/lib/elc_fileselector_button.c
+++ b/src/lib/elc_fileselector_button.c
@@ -204,11 +204,7 @@ _elm_fileselector_button_smart_del(Eo *obj, void *_pd,
va_list *list EINA_UNUSED
if (sd-window_title) eina_stringshare_del(sd-window_title);
if (sd-fsd.path) eina_stringshare_del(sd-fsd.path);
- if (sd-fs)
- {
-win = evas_object_data_del(obj, win);
-evas_object_del(win);
- }
+ if (sd-fsw) evas_object_del(sd-fsw);
eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
}
--
[EGIT] [core/elementary] master 01/01: remove unused var.
barbieri pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=6984724ded80e4f911eb02f48400ab1aeb260d1e
commit 6984724ded80e4f911eb02f48400ab1aeb260d1e
Author: Gustavo Sverzut Barbieri barbi...@profusion.mobi
Date: Tue Nov 12 17:56:45 2013 -0200
remove unused var.
---
src/lib/elc_fileselector_button.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/lib/elc_fileselector_button.c
b/src/lib/elc_fileselector_button.c
index 90b9be8..e43a924 100644
--- a/src/lib/elc_fileselector_button.c
+++ b/src/lib/elc_fileselector_button.c
@@ -198,8 +198,6 @@ _elm_fileselector_button_smart_add(Eo *obj, void *_pd,
va_list *list EINA_UNUSED
static void
_elm_fileselector_button_smart_del(Eo *obj, void *_pd, va_list *list
EINA_UNUSED)
{
- Evas_Object *win;
-
Elm_Fileselector_Button_Smart_Data *sd = _pd;
if (sd-window_title) eina_stringshare_del(sd-window_title);
--
Re: [E-devel] Different 'flavors(?)' of Evas_Object?
On Tue, 12 Nov 2013 14:19:28 -0500 Robert Heller hel...@deepsoft.com said: At Tue, 12 Nov 2013 11:33:32 +0900 Carsten Haitzler (The Rasterman) ras...@rasterman.com wrote: On Mon, 11 Nov 2013 19:05:35 -0500 Robert Heller hel...@deepsoft.com said: At Tue, 12 Nov 2013 08:43:20 +0900 Carsten Haitzler (The Rasterman) ras...@rasterman.com wrote: On Mon, 11 Nov 2013 14:54:06 -0500 Robert Heller hel...@deepsoft.com said: If I create an object of type Evas_Object using edje_object_add: o = edje_object_add(mi-menu-evas); mi-separator_object = o; e_theme_edje_object_set(o, base/theme/start_menus, e/widgets/startmenu/default/separator); evas_object_show(o); edje_object_size_min_calc(mi-separator_object, ww, hh); mi-separator_w = ww; mi-separator_h = hh; does it make sense to later add this to some sort of e_widget container: (o = mi-separator_object or something similar and m-favorites_box was created with e_widget_list_add()) e_widget_list_object_append(m-favorites_box,o, 1, /* fill */ 1, /* expand */ 0.0 /* align */ ); Next question: there isn't an e_mumble_pack_options_set() type fucntion for e_widget_list's, so how does one properly propagate geometry? Calling e_box_pack_options_set() seems to be the wrong thing to do (well I get segfaults). e_widget_list's seem to be a higher-level box-like thing (there isn't an e_widget_box thing). just in the list of feed a man a fish vs teach a man to fish... did u try reading e_widget_list.c ? the anser is screaming at you from e_widget_list_object_append() you were asking about... :) (how does indeed the widget get the minimum size... or then set it again on itself... :)) Yes. And it does not work. it requires you wrap your edje obj in an e_widget so it can store the min size. :) just like the e_widget_table wraps e_table. as i mentioned - you're dealing with ancient infra. these days all of this is now in core evas or in elementary and is integrated. we will kill off e_widget* stuff in the coming months/years. Can I replace this code snipet: o = edje_object_add(mi-menu-evas); mi-bg_object = o; evas_object_intercept_move_callback_add(o, _e_start_menu_cb_intercept_item_move, mi); evas_object_intercept_resize_callback_add(o, _e_start_menu_cb_intercept_item_resize, mi); e_theme_edje_object_set(mi-bg_object, base/theme/start_menus, e/widgets/startmenu/default/item_bg); with something like this: o = e_widget_add(mi-menu-evas); mi-bg_object = o; evas_object_intercept_move_callback_add(o, _e_start_menu_cb_intercept_item_move, mi); evas_object_intercept_resize_callback_add(o, _e_start_menu_cb_intercept_item_resize, mi); e_theme_edje_object_set(mi-bg_object, base/theme/start_menus, e/widgets/startmenu/default/item_bg); while this will give an appearance of working for a set of uses, it will fall apart in many cases you haven't hit yet. 1. stacking - your object is now a child of the list - thus this stacked above the list or below it wont stack above/below your child edje object 2. things like proxy, map etc. wont find your object inside the list so they can't render the list with this content in it for mapping onto other surfaces etc. you want to do what the e_widget_*.c do - make an e_widget THEN add your edje object in as the resize object (child/master object) and then it gets stuffed inside and controlled by e_widget - size/move/raise/lower/show/hide/etc. the e_widget and your edje child does so too. it's stuffed inside the widget container. of course note that you wsant to show the obj and add as sub obj and set as the resize obj - becuase show/hide of your obj is independent of show/hide of the widget master - so if your obj s now shown - u can show/hide the parent all u like - u'll never see it. you can aso attach data to hold custom thigs with e_widget_data_set/get and use the del hook to handle cleaning up that custom data on delete. That is replace edje_object_add with e_widget_add. What is really confusing, is that all of these functions return the same *type* (Evas_Object *), but return different things. This smells like the sorts of games X11 XToolkit does: faked OO programming in a non-OO language (plain C). Arg... (This is one of the reasons I stopped trying to write GUI code in C or C++ -- Tcl/Tk is a so much saner way to write GUI code.) Or do I need to invent a new
[EGIT] [core/elementary] master 05/06: test_toolbar.c: fixed wrong image name.
seoz pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=cd13ca2fb0f53b21fe6cffb46314805c3b4a2668 commit cd13ca2fb0f53b21fe6cffb46314805c3b4a2668 Author: Daniel Juyung Seo seojuyu...@gmail.com Date: Wed Nov 13 10:19:47 2013 +0900 test_toolbar.c: fixed wrong image name. Give a warm spank to jeyzu :) --- src/bin/test_toolbar.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/test_toolbar.c b/src/bin/test_toolbar.c index ab573df..93be77e 100644 --- a/src/bin/test_toolbar.c +++ b/src/bin/test_toolbar.c @@ -535,7 +535,7 @@ test_toolbar5(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ elm_object_item_disabled_set(tb_it, EINA_TRUE); elm_toolbar_item_priority_set(tb_it, 100); - snprintf(buf, sizeof(buf), %s/images/icon_04.pngj, elm_app_data_dir_get()); + snprintf(buf, sizeof(buf), %s/images/icon_04.png, elm_app_data_dir_get()); tb_it = elm_toolbar_item_append(tb, buf, World, _tb_sel2_cb, ph1); elm_toolbar_item_priority_set(tb_it, -100); --
[EGIT] [core/elementary] master 01/06: test_hoversel.c: removed unnecessary weight/align set.
seoz pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=716f2b40a594878363ce572d4d594aacc37c28f6 commit 716f2b40a594878363ce572d4d594aacc37c28f6 Author: Daniel Juyung Seo seojuyu...@gmail.com Date: Wed Nov 13 09:32:20 2013 +0900 test_hoversel.c: removed unnecessary weight/align set. --- src/bin/test_hoversel.c | 12 1 file changed, 12 deletions(-) diff --git a/src/bin/test_hoversel.c b/src/bin/test_hoversel.c index 117d112..f30c38d 100644 --- a/src/bin/test_hoversel.c +++ b/src/bin/test_hoversel.c @@ -154,8 +154,6 @@ test_hoversel(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ elm_hoversel_item_add(hoversel, Item 2, NULL, ELM_ICON_NONE, NULL, NULL); elm_hoversel_item_add(hoversel, Item 3, NULL, ELM_ICON_NONE, NULL, NULL); elm_hoversel_item_add(hoversel, Item 4 - Long Label Here, close, ELM_ICON_STANDARD, NULL, NULL); - evas_object_size_hint_weight_set(hoversel, 0.0, 0.0); - evas_object_size_hint_align_set(hoversel, 0.5, 0.5); evas_object_smart_callback_add(hoversel, clicked, _hoversel_clicked_cb, NULL); evas_object_smart_callback_add(hoversel, selected, @@ -174,8 +172,6 @@ test_hoversel(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ NULL); elm_hoversel_item_add(hoversel, Item 4, close, ELM_ICON_STANDARD, NULL, NULL); - evas_object_size_hint_weight_set(hoversel, 0.0, 0.0); - evas_object_size_hint_align_set(hoversel, 0.5, 0.5); elm_box_pack_end(bx, hoversel); evas_object_show(hoversel); @@ -190,8 +186,6 @@ test_hoversel(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ NULL); elm_hoversel_item_add(hoversel, Item 4, close, ELM_ICON_STANDARD, NULL, NULL); - evas_object_size_hint_weight_set(hoversel, 0.0, 0.0); - evas_object_size_hint_align_set(hoversel, 0.5, 0.5); elm_box_pack_end(bx, hoversel); evas_object_show(hoversel); @@ -206,8 +200,6 @@ test_hoversel(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ NULL); elm_hoversel_item_add(hoversel, Item 4, close, ELM_ICON_STANDARD, NULL, NULL); - evas_object_size_hint_weight_set(hoversel, 0.0, 0.0); - evas_object_size_hint_align_set(hoversel, 0.5, 0.5); elm_box_pack_end(bx, hoversel); evas_object_show(hoversel); @@ -219,8 +211,6 @@ test_hoversel(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ elm_hoversel_item_add(hoversel, Item 2, close, ELM_ICON_STANDARD, NULL, NULL); elm_object_disabled_set(hoversel, 1); - evas_object_size_hint_weight_set(hoversel, 0.0, 0.0); - evas_object_size_hint_align_set(hoversel, 0.5, 0.5); elm_box_pack_end(bx, hoversel); evas_object_show(hoversel); @@ -242,8 +232,6 @@ test_hoversel(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ NULL); elm_hoversel_item_add(hoversel, Item 4, close, ELM_ICON_STANDARD, NULL, NULL); - evas_object_size_hint_weight_set(hoversel, 0.0, 0.0); - evas_object_size_hint_align_set(hoversel, 0.5, 0.5); elm_box_pack_end(bx, hoversel); evas_object_show(hoversel); --
[EGIT] [core/elementary] master 02/06: test_hoversel.c: print out hoversel item's text when it's selected.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=459cf184344d47e5908444f31b4b53d818141dec
commit 459cf184344d47e5908444f31b4b53d818141dec
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Wed Nov 13 09:34:58 2013 +0900
test_hoversel.c: print out hoversel item's text when it's selected.
---
src/bin/test_hoversel.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/bin/test_hoversel.c b/src/bin/test_hoversel.c
index f30c38d..e0417d3 100644
--- a/src/bin/test_hoversel.c
+++ b/src/bin/test_hoversel.c
@@ -104,7 +104,8 @@ static void
_hoversel_selected_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
void *event_info)
{
- printf('selected' callback is called. (selected item : %p)\n, event_info);
+ printf('selected' callback is called. (selected item : %s)\n,
+ elm_object_item_text_get(event_info));
}
static void
--
[EGIT] [core/elementary] master 04/06: test_toolbar.c: gave more meaningful name 'Toolbar Vartical' to toolbar test 6.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=1568519bf072da70b014dbb7290eb7fc4f9b208a
commit 1568519bf072da70b014dbb7290eb7fc4f9b208a
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Wed Nov 13 10:16:33 2013 +0900
test_toolbar.c: gave more meaningful name 'Toolbar Vartical' to toolbar
test 6.
---
src/bin/test.c | 4 ++--
src/bin/test_toolbar.c | 16
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/bin/test.c b/src/bin/test.c
index e7de590..340d038 100755
--- a/src/bin/test.c
+++ b/src/bin/test.c
@@ -69,7 +69,7 @@ void test_toolbar5(void *data, Evas_Object *obj, void
*event_info);
void test_toolbar6(void *data, Evas_Object *obj, void *event_info);
void test_toolbar7(void *data, Evas_Object *obj, void *event_info);
void test_toolbar8(void *data, Evas_Object *obj, void *event_info);
-void test_toolbar9(void *data, Evas_Object *obj, void *event_info);
+void test_toolbar_vertical(void *data, Evas_Object *obj, void *event_info);
void test_hoversel(void *data, Evas_Object *obj, void *event_info);
void test_list(void *data, Evas_Object *obj, void *event_info);
void test_list_horizontal(void *data, Evas_Object *obj, void *event_info);
@@ -621,7 +621,7 @@ add_tests:
ADD_TEST(NULL, Toolbars, Toolbar 6, test_toolbar6);
ADD_TEST(NULL, Toolbars, Toolbar 7, test_toolbar7);
ADD_TEST(NULL, Toolbars, Toolbar 8, test_toolbar8);
- ADD_TEST(NULL, Toolbars, Toolbar 9, test_toolbar9);
+ ADD_TEST(NULL, Toolbars, Toolbar Vertical, test_toolbar_vertical);
//--//
ADD_TEST(NULL, Lists - List, List, test_list);
diff --git a/src/bin/test_toolbar.c b/src/bin/test_toolbar.c
index b6fc380..ab573df 100644
--- a/src/bin/test_toolbar.c
+++ b/src/bin/test_toolbar.c
@@ -611,7 +611,7 @@ test_toolbar5(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_
}
void
-test_toolbar6(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
*event_info EINA_UNUSED)
+test_toolbar_vertical(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{
Evas_Object *win, *bx, *tb, *ph, *menu;
Evas_Object *ph1, *ph2, *ph3, *ph4;
@@ -619,7 +619,7 @@ test_toolbar6(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_
Elm_Object_Item *menu_it;
char buf[PATH_MAX];
- win = elm_win_util_standard_add(toolbar6, Toolbar 6);
+ win = elm_win_util_standard_add(toolbar-vertical, Toolbar Vertical);
elm_win_autodel_set(win, EINA_TRUE);
bx = elm_box_add(win);
@@ -715,7 +715,7 @@ test_toolbar6(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_
}
void
-test_toolbar7(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
*event_info EINA_UNUSED)
+test_toolbar6(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
*event_info EINA_UNUSED)
{
Evas_Object *win, *bx, *tb, *ph, *menu;
Evas_Object *ph1, *ph2, *ph3, *ph4;
@@ -723,7 +723,7 @@ test_toolbar7(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_
Elm_Object_Item *menu_it;
char buf[PATH_MAX];
- win = elm_win_util_standard_add(toolbar7, Toolbar 7);
+ win = elm_win_util_standard_add(toolbar6, Toolbar 6);
elm_win_autodel_set(win, EINA_TRUE);
bx = elm_box_add(win);
@@ -820,14 +820,14 @@ test_toolbar7(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_
}
void
-test_toolbar8(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
*event_info EINA_UNUSED)
+test_toolbar7(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
*event_info EINA_UNUSED)
{
Evas_Object *win, *bx, *tb, *ph, *sl;
Evas_Object *ph1, *ph2, *ph3, *ph4;
Elm_Object_Item *tb_it;
char buf[PATH_MAX];
- win = elm_win_util_standard_add(toolbar8, Toolbar 8);
+ win = elm_win_util_standard_add(toolbar7, Toolbar 7);
elm_win_autodel_set(win, EINA_TRUE);
bx = elm_box_add(win);
@@ -959,13 +959,13 @@ test_toolbar8(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_
}
void
-test_toolbar9(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
*event_info EINA_UNUSED)
+test_toolbar8(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
*event_info EINA_UNUSED)
{
Evas_Object *win, *bx, *tb, *ph;
Evas_Object *ph1, *ph2, *ph3, *ph4;
char buf[PATH_MAX];
- win = elm_win_util_standard_add(toolbar9, Toolbar 9);
+ win = elm_win_util_standard_add(toolbar8, Toolbar 8);
elm_win_autodel_set(win, EINA_TRUE);
bx = elm_box_add(win);
--
[EGIT] [core/elementary] master 03/06: button,check,colorselector,diskselector,flipselector,image,radio,toolbar: fixed formatting of smart_event functions before working on it.
seoz pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=af651dffe6f470f25da534ab9bca824862c7ba61 commit af651dffe6f470f25da534ab9bca824862c7ba61 Author: Daniel Juyung Seo seojuyu...@gmail.com Date: Wed Nov 13 09:54:37 2013 +0900 button,check,colorselector,diskselector,flipselector,image,radio,toolbar: fixed formatting of smart_event functions before working on it. Now they look more consistent. --- src/lib/elm_button.c| 2 +- src/lib/elm_check.c | 2 +- src/lib/elm_colorselector.c | 1 + src/lib/elm_diskselector.c | 1 - src/lib/elm_flipselector.c | 1 - src/lib/elm_image.c | 2 +- src/lib/elm_radio.c | 2 +- src/lib/elm_toolbar.c | 1 - 8 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/lib/elm_button.c b/src/lib/elm_button.c index d89916f..e1f3da8 100644 --- a/src/lib/elm_button.c +++ b/src/lib/elm_button.c @@ -185,9 +185,9 @@ _elm_button_smart_event(Eo *obj, void *_pd EINA_UNUSED, va_list *list) return; _activate(obj); - ev-event_flags |= EVAS_EVENT_FLAG_ON_HOLD; elm_layout_signal_emit(obj, elm,anim,activate, elm); + ev-event_flags |= EVAS_EVENT_FLAG_ON_HOLD; if (ret) *ret = EINA_TRUE; } diff --git a/src/lib/elm_check.c b/src/lib/elm_check.c index e7595e8..1ce37ab 100644 --- a/src/lib/elm_check.c +++ b/src/lib/elm_check.c @@ -164,8 +164,8 @@ _elm_check_smart_event(Eo *obj, void *_pd EINA_UNUSED, va_list *list) return; _activate(obj); - ev-event_flags |= EVAS_EVENT_FLAG_ON_HOLD; + ev-event_flags |= EVAS_EVENT_FLAG_ON_HOLD; if (ret) *ret = EINA_TRUE; } diff --git a/src/lib/elm_colorselector.c b/src/lib/elm_colorselector.c index e7f0c79..d471ea6 100644 --- a/src/lib/elm_colorselector.c +++ b/src/lib/elm_colorselector.c @@ -1744,6 +1744,7 @@ _elm_colorselector_smart_event(Eo *obj, void *_pd, va_list *list) } else if (!cl sd-focused == ELM_COLORSELECTOR_PALETTE) return; + ev-event_flags |= EVAS_EVENT_FLAG_ON_HOLD; if (ret) *ret = EINA_TRUE; } diff --git a/src/lib/elm_diskselector.c b/src/lib/elm_diskselector.c index 78424bc..6135dd8 100644 --- a/src/lib/elm_diskselector.c +++ b/src/lib/elm_diskselector.c @@ -1009,7 +1009,6 @@ _elm_diskselector_smart_event(Eo *obj, void *_pd, va_list *list) } ev-event_flags |= EVAS_EVENT_FLAG_ON_HOLD; - if (ret) *ret = EINA_TRUE; } diff --git a/src/lib/elm_flipselector.c b/src/lib/elm_flipselector.c index 5d09a9c..736cd37 100644 --- a/src/lib/elm_flipselector.c +++ b/src/lib/elm_flipselector.c @@ -466,7 +466,6 @@ _elm_flipselector_smart_event(Eo *obj, void *_pd, va_list *list) _flipselector_unwalk(sd); ev-event_flags |= EVAS_EVENT_FLAG_ON_HOLD; - if (ret) *ret = EINA_TRUE; } diff --git a/src/lib/elm_image.c b/src/lib/elm_image.c index bda4fe4..e304e4b 100644 --- a/src/lib/elm_image.c +++ b/src/lib/elm_image.c @@ -658,8 +658,8 @@ _elm_image_smart_event(Eo *obj, void *_pd EINA_UNUSED, va_list *list) return; _activate(obj); - ev-event_flags |= EVAS_EVENT_FLAG_ON_HOLD; + ev-event_flags |= EVAS_EVENT_FLAG_ON_HOLD; if (ret) *ret = EINA_TRUE; } diff --git a/src/lib/elm_radio.c b/src/lib/elm_radio.c index d30d6cc..b6c9933 100644 --- a/src/lib/elm_radio.c +++ b/src/lib/elm_radio.c @@ -168,8 +168,8 @@ _elm_radio_smart_event(Eo *obj, void *_pd EINA_UNUSED, va_list *list) return; _activate(obj); - ev-event_flags |= EVAS_EVENT_FLAG_ON_HOLD; + ev-event_flags |= EVAS_EVENT_FLAG_ON_HOLD; if (ret) *ret = EINA_TRUE; } diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c index 9c6af1f..245e037 100644 --- a/src/lib/elm_toolbar.c +++ b/src/lib/elm_toolbar.c @@ -736,7 +736,6 @@ _elm_toolbar_smart_event(Eo *obj, void *_pd, va_list *list) ev-event_flags |= EVAS_EVENT_FLAG_ON_HOLD; if (ret) *ret = EINA_TRUE; - return; } static void --
[EGIT] [core/elementary] master 06/06: ctxpopup, player, slideshow, spinner, toolbar, video: internal refactoring of smart event routines.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=19993f2d86c654b9569d5e573e24535d316d6ef0
commit 19993f2d86c654b9569d5e573e24535d316d6ef0
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Wed Nov 13 10:29:30 2013 +0900
ctxpopup, player, slideshow, spinner, toolbar, video: internal refactoring
of smart event routines.
Now most of smart events codes look consistent.
---
src/lib/elc_ctxpopup.c | 49 -
src/lib/elc_player.c| 25 +
src/lib/elm_slideshow.c | 31 ---
src/lib/elm_spinner.c | 21 +++--
src/lib/elm_toolbar.c | 33 +
src/lib/elm_video.c | 27 +++
6 files changed, 76 insertions(+), 110 deletions(-)
diff --git a/src/lib/elc_ctxpopup.c b/src/lib/elc_ctxpopup.c
index 55862ff..f0db8a2 100644
--- a/src/lib/elc_ctxpopup.c
+++ b/src/lib/elc_ctxpopup.c
@@ -138,39 +138,30 @@ _elm_ctxpopup_smart_event(Eo *obj, void *_pd, va_list
*list)
return;
}
- if (((!strcmp(ev-key, Left)) ||
-(!strcmp(ev-key, KP_Left)) ||
-(!strcmp(ev-key, Right)) ||
-(!strcmp(ev-key, KP_Right)) ||
-(!strcmp(ev-key, Up)) ||
-(!strcmp(ev-key, KP_Up)) ||
-(!strcmp(ev-key, Down)) ||
-(!strcmp(ev-key, KP_Down))) (!ev-string))
+ if (sd-box)
{
-if (sd-box)
- {
- if ((!strcmp(ev-key, Left)) ||
- (!strcmp(ev-key, KP_Left)))
- elm_widget_focus_cycle(sd-box, ELM_FOCUS_LEFT);
- else if ((!strcmp(ev-key, Right)) ||
- (!strcmp(ev-key, KP_Right)))
- elm_widget_focus_cycle(sd-box, ELM_FOCUS_RIGHT);
- else if ((!strcmp(ev-key, Up)) ||
- (!strcmp(ev-key, KP_Up)))
- elm_widget_focus_cycle(sd-box, ELM_FOCUS_UP);
- else if ((!strcmp(ev-key, Down)) ||
- (!strcmp(ev-key, KP_Down)))
- elm_widget_focus_cycle(sd-box, ELM_FOCUS_DOWN);
-
- ev-event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
- if (ret) *ret = EINA_TRUE;
- return;
- }
+if ((!strcmp(ev-key, Left)) ||
+((!strcmp(ev-key, KP_Left)) (!ev-string)))
+ elm_widget_focus_cycle(sd-box, ELM_FOCUS_LEFT);
+else if ((!strcmp(ev-key, Right)) ||
+ ((!strcmp(ev-key, KP_Right)) (!ev-string)))
+ elm_widget_focus_cycle(sd-box, ELM_FOCUS_RIGHT);
+else if ((!strcmp(ev-key, Up)) ||
+ ((!strcmp(ev-key, KP_Up)) (!ev-string)))
+ elm_widget_focus_cycle(sd-box, ELM_FOCUS_UP);
+else if ((!strcmp(ev-key, Down)) ||
+ ((!strcmp(ev-key, KP_Down)) (!ev-string)))
+ elm_widget_focus_cycle(sd-box, ELM_FOCUS_DOWN);
+
+goto success;
}
- if (strcmp(ev-key, Escape)) return;
+ if (!strcmp(ev-key, Escape))
+ evas_object_hide(obj);
+ else
+ return;
- evas_object_hide(obj);
+success:
ev-event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
if (ret) *ret = EINA_TRUE;
}
diff --git a/src/lib/elc_player.c b/src/lib/elc_player.c
index b5d8ebf..b921889 100644
--- a/src/lib/elc_player.c
+++ b/src/lib/elc_player.c
@@ -86,12 +86,10 @@ _elm_player_smart_event(Eo *obj, void *_pd, va_list *list)
elm_video_play_position_set(sd-video, current);
}
-ev-event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
-if (ret) *ret = EINA_TRUE;
-return;
+goto success;
}
- if ((!strcmp(ev-key, Right)) ||
- ((!strcmp(ev-key, KP_Right)) (!ev-string)))
+ else if ((!strcmp(ev-key, Right)) ||
+((!strcmp(ev-key, KP_Right)) (!ev-string)))
{
double current, last;
@@ -105,20 +103,23 @@ _elm_player_smart_event(Eo *obj, void *_pd, va_list *list)
elm_video_play_position_set(sd-video, current);
}
-ev-event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
-if (ret) *ret = EINA_TRUE;
-return;
+goto success;
}
- if (!strcmp(ev-key, space))
+ else if (!strcmp(ev-key, space))
{
if (elm_video_is_playing_get(sd-video))
elm_video_pause(sd-video);
else
elm_video_play(sd-video);
-ev-event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
-if (ret) *ret = EINA_TRUE;
-return;
+
+goto success;
}
+
+ return;
+
+success:
+ ev-event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
+ if (ret) *ret = EINA_TRUE;
}
static void
diff --git a/src/lib/elm_slideshow.c b/src/lib/elm_slideshow.c
index cb3cfa9..acfcaf5 100644
--- a/src/lib/elm_slideshow.c
+++ b/src/lib/elm_slideshow.c
@@ -46,25 +46,17 @@ _elm_slideshow_smart_event(Eo *obj, void *_pd, va_list
*list)
((!strcmp(ev-key, KP_Left)) (!ev-string)))
{
elm_slideshow_previous(obj);
-
[EGIT] [core/elementary] master 01/01: test_button.c: added dynamic label change example to button.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=c9d02c32d8ee1e0d1f547b76d0807c472db0dc26
commit c9d02c32d8ee1e0d1f547b76d0807c472db0dc26
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Wed Nov 13 10:53:43 2013 +0900
test_button.c: added dynamic label change example to button.
---
src/bin/test_button.c | 18 +-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/src/bin/test_button.c b/src/bin/test_button.c
index 2672214..0028863 100644
--- a/src/bin/test_button.c
+++ b/src/bin/test_button.c
@@ -23,6 +23,21 @@ _bt_clicked(void *data, Evas_Object *obj EINA_UNUSED, void
*event_info EINA_UNUS
printf(clicked event on Button:%d\n, param);
}
+#define NUM_LABEL 4
+const char *btn_label[NUM_LABEL] =
+{
+ Label Only, Label Only Test, Label Only Test 2, Short
+};
+
+static void
+_bt_clicked_label_change_cb(void *data EINA_UNUSED, Evas_Object *obj, void
*event_info EINA_UNUSED)
+{
+ static int i = 1;
+ elm_object_text_set(obj, btn_label[i]);
+ i++;
+ if (i = NUM_LABEL) i = 0;
+}
+
static void
_bt_unpressed(void *data, Evas_Object *obj EINA_UNUSED, void *event_info
EINA_UNUSED)
{
@@ -107,7 +122,8 @@ test_button(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_in
bt = elm_button_add(win);
elm_object_text_set(bt, Label Only);
- evas_object_smart_callback_add(bt, clicked, _bt_clicked, (void *)5);
+ evas_object_smart_callback_add(bt, clicked,
+ _bt_clicked_label_change_cb, NULL);
evas_object_smart_callback_add(bt, unpressed, _bt_unpressed, (void *)5);
elm_box_pack_end(bx, bt);
evas_object_smart_callback_add(bt, repeated, _bt_repeated, NULL);
--
Re: [E-devel] First probies !
Sounds cool. (I'm biased, I just want to see some probies already!). On 12 Nov 2013 11:36, Cedric BAIL cedric.b...@free.fr wrote: Hello everyone, I would like to request a probie access for : - Vyacheslav Reutskiy v.reuts...@samsung.com - Vitalii Vorobiov vi.vorob...@samsung.com - Mykyta Biliavskyi m.biliavs...@samsung.com - Andrii Kroitor an.kroi...@samsung.com You may have seen their recent contribution, mostly around Edje_Edit and edje_cc. They want to help more on EFL, Enlightenment and Terminology. Also they should be able to upload soon a new tool, Edje Theme Editor (a graphical UI to edit theme) that they have been working on. Does anyone have a problem in giving them a probie acces ? If nobody mind, I will do that on Friday. Regards, -- Cedric BAIL -- November Webinars for C, C++, Fortran Developers Accelerate application performance with scalable programming models. Explore techniques for threading, error checking, porting, and tuning. Get the most from the latest Intel processors and coprocessors. See abstracts and register http://pubads.g.doubleclick.net/gampad/clk?id=60136231iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- DreamFactory - Open Source REST JSON Services for HTML5 Native Apps OAuth, Users, Roles, SQL, NoSQL, BLOB Storage and External API Access Free app hosting. Or install the open source package on any LAMP server. Sign up and see examples for AngularJS, jQuery, Sencha Touch and Native! http://pubads.g.doubleclick.net/gampad/clk?id=63469471iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Enlightenment Korean Dinner
I'm leaving Friday morning... Will miss that. Unfortunate. -- Tom. On 11 Nov 2013 18:26, Cedric BAIL cedric.b...@free.fr wrote: Hello everyone, As this Saturday we will see our beloved president of the Enlightenment foundation in Korea, Philippe Caseiro (Not bad for an introduction, I think I should be doing marketing !). I think it will be a good idea to plan a little diner in Seoul. So who is in on Saturday night ? And also maybe it would be nice to find a good Korean restaurant, so if anyone as a recommendation, do not be shy ! As it will be Saturday, we might need to book in advance, so please raise your hand if you are planning to come. Enjoy the party, -- Cedric BAIL -- November Webinars for C, C++, Fortran Developers Accelerate application performance with scalable programming models. Explore techniques for threading, error checking, porting, and tuning. Get the most from the latest Intel processors and coprocessors. See abstracts and register http://pubads.g.doubleclick.net/gampad/clk?id=60136231iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- DreamFactory - Open Source REST JSON Services for HTML5 Native Apps OAuth, Users, Roles, SQL, NoSQL, BLOB Storage and External API Access Free app hosting. Or install the open source package on any LAMP server. Sign up and see examples for AngularJS, jQuery, Sencha Touch and Native! http://pubads.g.doubleclick.net/gampad/clk?id=63469471iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/elementary] master 01/01: elementary/entry - clean up the magnifier code.
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=68d29ec36ec3107af6cf8abd1f8ffa220d01eabf
commit 68d29ec36ec3107af6cf8abd1f8ffa220d01eabf
Author: ChunEon Park her...@hermet.pe.kr
Date: Wed Nov 13 13:29:28 2013 +0900
elementary/entry - clean up the magnifier code.
---
src/lib/elm_entry.c | 50 +-
1 file changed, 17 insertions(+), 33 deletions(-)
diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index ea4ceab..e6a32b6 100644
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -1394,46 +1394,41 @@ _magnifier_create(void *data)
ELM_ENTRY_DATA_GET(data, sd);
double scale = _elm_config-magnifier_scale;
+ Evas *e;
Evas_Coord w, h, mw, mh;
- if (sd-mgf_proxy)
- {
-evas_object_image_source_unset(sd-mgf_proxy);
-evas_object_clip_unset(sd-mgf_proxy);
-evas_object_del(sd-mgf_proxy);
- }
+ if (sd-mgf_proxy) evas_object_del(sd-mgf_proxy);
if (sd-mgf_bg) evas_object_del(sd-mgf_bg);
if (sd-mgf_clip) evas_object_del(sd-mgf_clip);
- sd-mgf_bg = edje_object_add(evas_object_evas_get(data));
+ e = evas_object_evas_get(data);
+
+ sd-mgf_bg = edje_object_add(e);
_elm_theme_object_set(data, sd-mgf_bg, entry, magnifier, default);
evas_object_show(sd-mgf_bg);
- sd-mgf_clip = evas_object_rectangle_add(evas_object_evas_get(data));
- evas_object_color_set(sd-mgf_clip, 255, 255, 255, 255);
+ sd-mgf_clip = evas_object_rectangle_add(e);
edje_object_part_swallow(sd-mgf_bg, elm.swallow.content, sd-mgf_clip);
+ sd-mgf_proxy = evas_object_image_add(e);
+
if (sd-scroll)
{
-sd-mgf_proxy =
evas_object_image_add(evas_object_evas_get(sd-scr_edje));
evas_object_image_source_set(sd-mgf_proxy, sd-scr_edje);
evas_object_geometry_get(sd-scr_edje, NULL, NULL, w, h);
}
else
{
-sd-mgf_proxy = evas_object_image_add(evas_object_evas_get(data));
evas_object_image_source_set(sd-mgf_proxy, data);
evas_object_geometry_get(data, NULL, NULL, w, h);
}
mw = (Evas_Coord)(scale * (float) w);
mh = (Evas_Coord)(scale * (float) h);
- if ((mw = 0) || (mh = 0))
- return;
+ if ((mw = 0) || (mh = 0)) return;
evas_object_resize(sd-mgf_proxy, mw, mh);
evas_object_image_fill_set(sd-mgf_proxy, 0, 0, mw, mh);
- evas_object_color_set(sd-mgf_proxy, 255, 255, 255, 255);
evas_object_pass_events_set(sd-mgf_proxy, EINA_TRUE);
evas_object_show(sd-mgf_proxy);
evas_object_clip_set(sd-mgf_proxy, sd-mgf_clip);
@@ -1454,23 +1449,17 @@ _magnifier_move(void *data, Evas_Coord px, Evas_Coord
py)
double scale = _elm_config-magnifier_scale;
edje_object_parts_extends_calc(sd-mgf_bg, x, y, w, h);
- evas_object_move(sd-mgf_bg, px - x - w/2, py - y - h);
+ evas_object_move(sd-mgf_bg, px - x - (w / 2), py - y - h);
obj_content = edje_object_part_object_get(sd-mgf_bg,
elm.swallow.content);
evas_object_geometry_get(obj_content, x, y, w, h);
- sx = px - (x + w/2);
- sy = py - (y + h/2);
+ sx = px - (x + (w / 2));
+ sy = py - (y + (h / 2));
- if (sd-scroll)
- {
-evas_object_geometry_get(sd-scr_edje, ex, ey, NULL, NULL);
- }
- else
- {
-evas_object_geometry_get(data, ex, ey, NULL, NULL);
- }
- evas_object_move(sd-mgf_proxy, ex * scale - (px * scale - px) - sx,
-ey * scale - (py * scale - py) - sy);
+ if (sd-scroll) evas_object_geometry_get(sd-scr_edje, ex, ey, NULL,
NULL);
+ else evas_object_geometry_get(data, ex, ey, NULL, NULL);
+ evas_object_move(sd-mgf_proxy, (ex * scale) - ((px * scale) - px) - sx,
+(ey * scale) - ((py * scale) - py) - sy);
}
static void
@@ -3345,12 +3334,7 @@ _elm_entry_smart_del(Eo *obj, void *_pd, va_list *list
EINA_UNUSED)
if ((sd-api) (sd-api-obj_unhook))
sd-api-obj_unhook(obj); // module - unhook
- if (sd-mgf_proxy)
- {
-evas_object_image_source_unset(sd-mgf_proxy);
-evas_object_clip_unset(sd-mgf_proxy);
-evas_object_del(sd-mgf_proxy);
- }
+ if (sd-mgf_proxy) evas_object_del(sd-mgf_proxy);
if (sd-mgf_bg) evas_object_del(sd-mgf_bg);
if (sd-mgf_clip) evas_object_del(sd-mgf_clip);
--
[EGIT] [core/elementary] master 01/01: elementary/entry - clean up the magnifier code.
hermet pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=46b007a7c9d0028aeab43587bc773724c06d0ec8 commit 46b007a7c9d0028aeab43587bc773724c06d0ec8 Author: ChunEon Park her...@hermet.pe.kr Date: Wed Nov 13 14:25:21 2013 +0900 elementary/entry - clean up the magnifier code. --- src/lib/elm_entry.c| 9 - src/lib/elm_widget_entry.h | 1 - 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c index e6a32b6..7a46db4 100644 --- a/src/lib/elm_entry.c +++ b/src/lib/elm_entry.c @@ -1395,11 +1395,11 @@ _magnifier_create(void *data) double scale = _elm_config-magnifier_scale; Evas *e; + Evas_Object *mgf_clip; Evas_Coord w, h, mw, mh; if (sd-mgf_proxy) evas_object_del(sd-mgf_proxy); if (sd-mgf_bg) evas_object_del(sd-mgf_bg); - if (sd-mgf_clip) evas_object_del(sd-mgf_clip); e = evas_object_evas_get(data); @@ -1407,8 +1407,8 @@ _magnifier_create(void *data) _elm_theme_object_set(data, sd-mgf_bg, entry, magnifier, default); evas_object_show(sd-mgf_bg); - sd-mgf_clip = evas_object_rectangle_add(e); - edje_object_part_swallow(sd-mgf_bg, elm.swallow.content, sd-mgf_clip); + mgf_clip = evas_object_rectangle_add(e); + edje_object_part_swallow(sd-mgf_bg, elm.swallow.content, mgf_clip); sd-mgf_proxy = evas_object_image_add(e); @@ -1431,7 +1431,7 @@ _magnifier_create(void *data) evas_object_image_fill_set(sd-mgf_proxy, 0, 0, mw, mh); evas_object_pass_events_set(sd-mgf_proxy, EINA_TRUE); evas_object_show(sd-mgf_proxy); - evas_object_clip_set(sd-mgf_proxy, sd-mgf_clip); + evas_object_clip_set(sd-mgf_proxy, mgf_clip); evas_object_layer_set(sd-mgf_bg, EVAS_LAYER_MAX); evas_object_layer_set(sd-mgf_proxy, EVAS_LAYER_MAX); @@ -3336,7 +3336,6 @@ _elm_entry_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED) if (sd-mgf_proxy) evas_object_del(sd-mgf_proxy); if (sd-mgf_bg) evas_object_del(sd-mgf_bg); - if (sd-mgf_clip) evas_object_del(sd-mgf_clip); entries = eina_list_remove(entries, obj); #ifdef HAVE_ELEMENTARY_X diff --git a/src/lib/elm_widget_entry.h b/src/lib/elm_widget_entry.h index 6548781..8b0b750 100644 --- a/src/lib/elm_widget_entry.h +++ b/src/lib/elm_widget_entry.h @@ -27,7 +27,6 @@ struct _Elm_Entry_Smart_Data Evas_Object *hoversel; Evas_Object *mgf_bg; - Evas_Object *mgf_clip; Evas_Object *mgf_proxy; Evas_Object *start_handler; Evas_Object *end_handler; --
[E-devel] Who created the 1.8.0-alpha1 tags?
Hey, Whoever created it, created normal tags not annotated which is bad. I wrote down to (technologically) limit that and prevent that from happening in the future, however, until then, whoever is doing releases should do correct tags. Git tag -a Cheers, Tom. -- DreamFactory - Open Source REST JSON Services for HTML5 Native Apps OAuth, Users, Roles, SQL, NoSQL, BLOB Storage and External API Access Free app hosting. Or install the open source package on any LAMP server. Sign up and see examples for AngularJS, jQuery, Sencha Touch and Native! http://pubads.g.doubleclick.net/gampad/clk?id=63469471iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/elementary] master 01/01: Revert elementary/entry - clean up the magnifier code.
hermet pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=d66ebf41faca92020490a0d52119763da40e121d commit d66ebf41faca92020490a0d52119763da40e121d Author: ChunEon Park her...@hermet.pe.kr Date: Wed Nov 13 14:36:22 2013 +0900 Revert elementary/entry - clean up the magnifier code. This reverts commit 46b007a7c9d0028aeab43587bc773724c06d0ec8. sorry, this is wrong fix. clip should be removed explicitly. --- src/lib/elm_entry.c| 9 + src/lib/elm_widget_entry.h | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c index 7a46db4..e6a32b6 100644 --- a/src/lib/elm_entry.c +++ b/src/lib/elm_entry.c @@ -1395,11 +1395,11 @@ _magnifier_create(void *data) double scale = _elm_config-magnifier_scale; Evas *e; - Evas_Object *mgf_clip; Evas_Coord w, h, mw, mh; if (sd-mgf_proxy) evas_object_del(sd-mgf_proxy); if (sd-mgf_bg) evas_object_del(sd-mgf_bg); + if (sd-mgf_clip) evas_object_del(sd-mgf_clip); e = evas_object_evas_get(data); @@ -1407,8 +1407,8 @@ _magnifier_create(void *data) _elm_theme_object_set(data, sd-mgf_bg, entry, magnifier, default); evas_object_show(sd-mgf_bg); - mgf_clip = evas_object_rectangle_add(e); - edje_object_part_swallow(sd-mgf_bg, elm.swallow.content, mgf_clip); + sd-mgf_clip = evas_object_rectangle_add(e); + edje_object_part_swallow(sd-mgf_bg, elm.swallow.content, sd-mgf_clip); sd-mgf_proxy = evas_object_image_add(e); @@ -1431,7 +1431,7 @@ _magnifier_create(void *data) evas_object_image_fill_set(sd-mgf_proxy, 0, 0, mw, mh); evas_object_pass_events_set(sd-mgf_proxy, EINA_TRUE); evas_object_show(sd-mgf_proxy); - evas_object_clip_set(sd-mgf_proxy, mgf_clip); + evas_object_clip_set(sd-mgf_proxy, sd-mgf_clip); evas_object_layer_set(sd-mgf_bg, EVAS_LAYER_MAX); evas_object_layer_set(sd-mgf_proxy, EVAS_LAYER_MAX); @@ -3336,6 +3336,7 @@ _elm_entry_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED) if (sd-mgf_proxy) evas_object_del(sd-mgf_proxy); if (sd-mgf_bg) evas_object_del(sd-mgf_bg); + if (sd-mgf_clip) evas_object_del(sd-mgf_clip); entries = eina_list_remove(entries, obj); #ifdef HAVE_ELEMENTARY_X diff --git a/src/lib/elm_widget_entry.h b/src/lib/elm_widget_entry.h index 8b0b750..6548781 100644 --- a/src/lib/elm_widget_entry.h +++ b/src/lib/elm_widget_entry.h @@ -27,6 +27,7 @@ struct _Elm_Entry_Smart_Data Evas_Object *hoversel; Evas_Object *mgf_bg; + Evas_Object *mgf_clip; Evas_Object *mgf_proxy; Evas_Object *start_handler; Evas_Object *end_handler; --
[EGIT] [core/elementary] master 01/01: elementary/entry - use a convenient api.
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=0a871e1864cded8f1b1bb5cfa27b3f3a3d7b4daa
commit 0a871e1864cded8f1b1bb5cfa27b3f3a3d7b4daa
Author: ChunEon Park her...@hermet.pe.kr
Date: Wed Nov 13 14:51:55 2013 +0900
elementary/entry - use a convenient api.
And actually magnifier needs to update fill area if it is resized.
---
src/lib/elm_entry.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index e6a32b6..d509981 100644
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -1410,7 +1410,7 @@ _magnifier_create(void *data)
sd-mgf_clip = evas_object_rectangle_add(e);
edje_object_part_swallow(sd-mgf_bg, elm.swallow.content, sd-mgf_clip);
- sd-mgf_proxy = evas_object_image_add(e);
+ sd-mgf_proxy = evas_object_image_filled_add(e);
if (sd-scroll)
{
@@ -1428,7 +1428,6 @@ _magnifier_create(void *data)
if ((mw = 0) || (mh = 0)) return;
evas_object_resize(sd-mgf_proxy, mw, mh);
- evas_object_image_fill_set(sd-mgf_proxy, 0, 0, mw, mh);
evas_object_pass_events_set(sd-mgf_proxy, EINA_TRUE);
evas_object_show(sd-mgf_proxy);
evas_object_clip_set(sd-mgf_proxy, sd-mgf_clip);
--
[EGIT] [core/efl] master 01/01: evas_gl : Fixed macro substitution bug in evas_gl
sung pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=90bbc21d02b9cdc7e074884812950d27e015c2ac
commit 90bbc21d02b9cdc7e074884812950d27e015c2ac
Author: Sung W. Park dunamis.p...@samsung.com
Date: Wed Nov 13 15:39:12 2013 +0900
evas_gl : Fixed macro substitution bug in evas_gl
In evas_gl_api_ext_def.h there're calls such as:
_EVASGL_EXT_DRVNAME(EGL_KHR_image_base)
The macro is defined in evas_gl_api_ext.c as:
(strstr(glexts, #name) != NULL || strstr(glueexts, #name) != NULL)
if (_EVASGL_EXT_CHECK_SUPPORT(name)) *ext_support = 1;
But EGL_KHR_image_base is itself a macro, which is defined
in EGL/eglext.h like this:
Thus, the _EVASGL_EXT_CHECK_SUPPORT macro will unwrap into:
(strstr(glexts, 1) != NULL || strstr(glueexts, 1) != NULL)
instead of intended:
(strstr(glexts, EGL_KHR_image_base) != NULL ||
strstr(glueexts, EGL_KHR_image_base) != NULL)
This patch fixes this by applying stringification earlier in
_EVASGL_EXT_DRVNAME
Bugfix reported by jinhyung...@samsung.com
---
src/modules/evas/engines/gl_common/evas_gl_api_ext.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/modules/evas/engines/gl_common/evas_gl_api_ext.c
b/src/modules/evas/engines/gl_common/evas_gl_api_ext.c
index dcf5f1c..0573c6d 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_api_ext.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_api_ext.c
@@ -184,13 +184,13 @@ re-info-info.screen);
}
#define _EVASGL_EXT_CHECK_SUPPORT(name) \
- (strstr(glexts, #name) != NULL || strstr(glueexts, #name) != NULL)
+ (strstr(glexts, name) != NULL || strstr(glueexts, name) != NULL)
#define _EVASGL_EXT_DISCARD_SUPPORT() \
*ext_support = 0;
#define _EVASGL_EXT_DRVNAME(name) \
- if (_EVASGL_EXT_CHECK_SUPPORT(name)) *ext_support = 1;
+ if (_EVASGL_EXT_CHECK_SUPPORT(#name)) *ext_support = 1;
#define _EVASGL_EXT_FUNCTION_BEGIN(ret, name, param) \
{ \
--
