Menu
▾
▴
enlightenment-git — GIT Commits Mailing List
You can subscribe to this list here.
| 2013 |
Jan
|
Feb
(511) |
Mar
(1170) |
Apr
(1093) |
May
(812) |
Jun
(937) |
Jul
(870) |
Aug
(722) |
Sep
(254) |
Oct
|
Nov
|
Dec
|
|---|
|
From: Yakov G. - E. G. <no-...@en...> - 2013-09-08 15:35:17
|
yakov pushed a commit to branch master.
commit 3e403dc08c4bfc032787e4da5254e68abc5d0bfd
Author: Yakov Goldberg <ya...@sa...>
Date: Sun Sep 8 18:07:42 2013 +0300
fileselector: comments typo
---
src/lib/elc_fileselector_eo.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lib/elc_fileselector_eo.h b/src/lib/elc_fileselector_eo.h
index 38485d1..72fbedf 100644
--- a/src/lib/elc_fileselector_eo.h
+++ b/src/lib/elc_fileselector_eo.h
@@ -210,7 +210,7 @@ enum
#define elm_obj_fileselector_selected_set(_path, ret) ELM_OBJ_FILESELECTOR_ID(ELM_OBJ_FILESELECTOR_SUB_ID_SELECTED_SET), EO_TYPECHECK(const char *, _path), EO_TYPECHECK(Eina_Bool *, ret)
/**
- * @def elm_obj_fileselector_mime_type_filter_append
+ * @def elm_obj_fileselector_mime_types_filter_append
* @since 1.8
*
* Append mime type based filter into filter list
@@ -219,7 +219,7 @@ enum
* @param[in] filter_name
* @param[out] ret
*
- * @see elm_fileselector_mime_type_filter_append
+ * @see elm_fileselector_mime_types_filter_append
*/
#define elm_obj_fileselector_mime_types_filter_append(mime_types, filter_name, ret) ELM_OBJ_FILESELECTOR_ID(ELM_OBJ_FILESELECTOR_SUB_ID_MIME_TYPES_FILTER_APPEND), EO_TYPECHECK(const char *, mime_types), EO_TYPECHECK(const char *, filter_name), EO_TYPECHECK(Eina_Bool *, ret)
--
|
|
From: Daniel J. S. - E. G. <no-...@en...> - 2013-09-08 15:04:26
|
seoz pushed a commit to branch master.
commit df676e6eccc5138be0382054c21793b7ad63e600
Author: Daniel Juyung Seo <seo...@gm...>
Date: Sun Sep 8 21:11:03 2013 +0900
config.c: remove unused variable.
---
src/bin/config.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/bin/config.c b/src/bin/config.c
index 29b226c..853c365 100644
--- a/src/bin/config.c
+++ b/src/bin/config.c
@@ -1341,13 +1341,12 @@ _profile_reset(void *data,
Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{
- const char *selection, *curr;
+ const char *selection;
const char *pdir;
Evas_Object *li;
li = data;
selection = elm_object_item_data_get(elm_list_selected_item_get(li));
- curr = elm_config_profile_get();
elm_config_all_flush();
elm_config_save(); /* dump config into old profile's data dir */
--
|
|
From: Rafael A. - E. G. <no-...@en...> - 2013-09-08 15:04:26
|
seoz pushed a commit to branch elementary-1.7.
commit a3c9d9263c2938cdf180a26cc65a3769cc7c409c
Author: Rafael Antognolli <raf...@in...>
Date: Sat Aug 24 17:02:01 2013 -0300
list: Fix list_example_03 - call elm_list_go().
---
src/examples/list_example_03.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/src/examples/list_example_03.c b/src/examples/list_example_03.c
index 3b79bb9..8c6e1df 100644
--- a/src/examples/list_example_03.c
+++ b/src/examples/list_example_03.c
@@ -30,6 +30,7 @@ _prepend_cb(void *data, Evas_Object *obj, void *event_info)
snprintf(label, sizeof(label), "Item %i", counter++);
list_it = elm_list_item_prepend(li, label, NULL, NULL, NULL, NULL);
+ elm_list_go(li);
if (!list_it)
printf("Error adding item\n");
}
@@ -43,6 +44,7 @@ _add_cb(void *data, Evas_Object *obj, void *event_info)
snprintf(label, sizeof(label), "Item %i", counter++);
list_it = elm_list_item_append(li, label, NULL, NULL, NULL, NULL);
+ elm_list_go(li);
if (!list_it)
printf("Error adding item\n");
}
@@ -60,6 +62,7 @@ _add_ic_cb(void *data, Evas_Object *obj, void *event_info)
elm_image_resizable_set(ic, EINA_FALSE, EINA_FALSE);
list_it = elm_list_item_append(li, label, ic, NULL, NULL, NULL);
+ elm_list_go(li);
if (!list_it)
printf("Error adding item with icon\n");
}
@@ -80,6 +83,7 @@ _add_func_cb(void *data, Evas_Object *obj, void *event_info)
snprintf(label, sizeof(label), "Item %i", counter++);
list_it = elm_list_item_append(li, label, NULL, NULL, _sel_cb, NULL);
+ elm_list_go(li);
if (!list_it)
printf("Error adding item\n");
}
@@ -110,6 +114,7 @@ _add_data_cb(void *data, Evas_Object *obj, void *event_info)
snprintf(content, 32, "Item content %i", counter);
snprintf(label, sizeof(label), "Item %i", counter++);
list_it = elm_list_item_append(li, label, NULL, NULL, _sel_data_cb, content);
+ elm_list_go(li);
if (!list_it) {
printf("Error adding item\n");
return;
@@ -125,6 +130,7 @@ _del_cb(void *data, Evas_Object *obj, void *event_info)
selected_item = elm_list_selected_item_get(li);
elm_object_item_del(selected_item);
+ elm_list_go(li);
}
static void
@@ -183,6 +189,7 @@ _insert_after_cb(void *data, Evas_Object *obj, void *event_info)
snprintf(label, sizeof(label), "Item %i", counter++);
list_it = elm_list_item_insert_after(li, selected_item, label, NULL, NULL,
NULL, NULL);
+ elm_list_go(li);
if (!list_it)
printf("Error adding item\n");
}
@@ -214,6 +221,7 @@ _insert_before_cb(void *data, Evas_Object *obj, void *event_info)
snprintf(label, sizeof(label), "Item %i", counter++);
list_it = elm_list_item_insert_before(li, selected_item, label, NULL, NULL,
NULL, NULL);
+ elm_list_go(li);
if (!list_it)
printf("Error adding item\n");
}
@@ -227,6 +235,7 @@ _set_separator_cb(void *data, Evas_Object *obj, void *event_info)
selected_item = elm_list_selected_item_get(li);
if (!selected_item) return;
elm_list_item_separator_set(selected_item, EINA_TRUE);
+ elm_list_go(li);
}
static void
--
|
|
From: Daniel J. S. - E. G. <no-...@en...> - 2013-09-08 15:04:25
|
seoz pushed a commit to branch master.
commit a6116b02d04d9259edb4e94691d6e7a62c76d1fe
Author: Daniel Juyung Seo <seo...@gm...>
Date: Sun Sep 8 18:50:00 2013 +0900
elm_gengrid.c: more ELM_SAFE_FREE macro for gengrid.
---
src/lib/elm_gengrid.c | 18 +++++-------------
1 file changed, 5 insertions(+), 13 deletions(-)
diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c
index 7b256f9..c8269d2 100644
--- a/src/lib/elm_gengrid.c
+++ b/src/lib/elm_gengrid.c
@@ -660,10 +660,8 @@ _elm_gengrid_item_index_update(Elm_Gen_Item *it)
static void
_item_unrealize_cb(Elm_Gen_Item *it)
{
- evas_object_del(VIEW(it));
- VIEW(it) = NULL;
- evas_object_del(it->spacer);
- it->spacer = NULL;
+ ELM_SAFE_FREE(VIEW(it), evas_object_del);
+ ELM_SAFE_FREE(it->spacer, evas_object_del);
}
static char *
@@ -2233,11 +2231,7 @@ _elm_gengrid_clear(Evas_Object *obj,
if (!standby) sd->generation++;
- if (sd->state)
- {
- eina_inlist_sorted_state_free(sd->state);
- sd->state = NULL;
- }
+ ELM_SAFE_FREE(sd->state, eina_inlist_sorted_state_free);
if (sd->walking > 0)
{
@@ -2450,8 +2444,7 @@ _elm_gengrid_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
elm_gengrid_clear(obj);
eo_unref(sd->pan_obj);
- evas_object_del(sd->pan_obj);
- sd->pan_obj = NULL;
+ ELM_SAFE_FREE(sd->pan_obj, evas_object_del);
ELM_SAFE_FREE(sd->stack, evas_object_del);
if (sd->calc_job) ecore_job_del(sd->calc_job);
@@ -3330,8 +3323,7 @@ elm_gengrid_item_cursor_unset(Elm_Object_Item *item)
if (VIEW(it))
elm_widget_item_cursor_unset(it);
- eina_stringshare_del(it->mouse_cursor);
- it->mouse_cursor = NULL;
+ ELM_SAFE_FREE(it->mouse_cursor, eina_stringshare_del);
}
EAPI void
--
|
|
From: Rafael A. - E. G. <no-...@en...> - 2013-09-08 15:04:25
|
seoz pushed a commit to branch elementary-1.7.
commit 7c61aa0cb550ae22a0657ce45f0aea4cf95a74aa
Author: Rafael Antognolli <raf...@in...>
Date: Tue Aug 27 18:04:53 2013 -0300
elm/index: Fix example, must call elm_index_level_go().
---
src/examples/index_example_01.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/examples/index_example_01.c b/src/examples/index_example_01.c
index fefdb5c..6572316 100644
--- a/src/examples/index_example_01.c
+++ b/src/examples/index_example_01.c
@@ -166,6 +166,7 @@ elm_main(int argc,
evas_object_smart_callback_add(d.index, "delay,changed", _index_changed,
NULL);
evas_object_smart_callback_add(d.index, "selected", _index_selected, NULL);
+ elm_index_level_go(d.index, 0);
/* attribute setting knobs */
sep = elm_separator_add(win);
--
|
|
From: Tom 'T. H. - E. G. <no-...@en...> - 2013-09-08 15:04:25
|
seoz pushed a commit to branch elementary-1.7.
commit 49a3f7ee22b6ddf0869a6ba82660308c3f4d0bbd
Author: Tom 'TAsn' Hacohen <to...@st...>
Date: Fri Aug 30 16:39:51 2013 +0100
Added clouseau integration.
You need to make sure the clouseau daemon is running (clouseaud), and then
you can just run applications by setting the env var ELM_CLOUSEAU to 1.
This is very useful for platforms that do not have LD_PRELOAD, or block
them for any reason.
Most people should just stick to using clouseau_start or clouseau.
---
ChangeLog | 5 ++++
NEWS | 3 +++
src/lib/elm_main.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 80 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index bdfa90e..29ce358 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -840,3 +840,8 @@
2013-08-02 Eduardo Lima (Etrunko)
* 1.7.8 release
+
+2013-08-30 Tom Hacohen (TAsn)
+
+ * Clouseau: Added clouseau integration.
+
diff --git a/NEWS b/NEWS
index 21c2a59..6866407 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,9 @@ Elementary 1.7.8
Changes since Elementary 1.7.7:
-------------------------
+Improvements:
+ * Clouseau: Added clouseau integration.
+
Fixes:
* Fix potential free'ed memory dereference in naviframe.
diff --git a/src/lib/elm_main.c b/src/lib/elm_main.c
index 1a09663..81e6103 100644
--- a/src/lib/elm_main.c
+++ b/src/lib/elm_main.c
@@ -23,6 +23,12 @@
#define SEMI_BROKEN_QUICKLAUNCH 1
+#ifdef __CYGWIN__
+# define LIBEXT ".dll"
+#else
+# define LIBEXT ".so"
+#endif
+
static Elm_Version _version = { VMAJ, VMIN, VMIC, VREV };
EAPI Elm_Version *elm_version = &_version;
@@ -198,6 +204,55 @@ _prefix_shutdown(void)
app_pfx = NULL;
}
+static struct {
+ Eina_Module *handle;
+ void (*init)(void);
+ void (*shutdown)(void);
+ Eina_Bool (*app_connect)(const char *appname);
+} _clouseau_info;
+
+#define _CLOUSEAU_LOAD_SYMBOL(cls_struct, sym) \
+ do \
+ { \
+ (cls_struct).sym = eina_module_symbol_get((cls_struct).handle, "clouseau_" #sym); \
+ if (!(cls_struct).sym) \
+ { \
+ WRN("Failed loading symbol '%s' from the clouseau library.", "clouseau_" #sym); \
+ eina_module_free((cls_struct).handle); \
+ (cls_struct).handle = NULL; \
+ return EINA_FALSE; \
+ } \
+ } \
+ while (0)
+
+static Eina_Bool
+_clouseau_module_load()
+{
+ const char *elm_clouseau_env = getenv("ELM_CLOUSEAU");
+ Eina_Bool want_cls = EINA_FALSE;
+ if (elm_clouseau_env)
+ want_cls = atoi(elm_clouseau_env);
+
+ if (!want_cls)
+ return EINA_FALSE;
+
+ _clouseau_info.handle = eina_module_new(
+ PACKAGE_LIB_DIR "/clouseau/libclouseau" LIBEXT);
+ if (!eina_module_load(_clouseau_info.handle))
+ {
+ WRN("Failed loading the clouseau library.");
+ eina_module_free(_clouseau_info.handle);
+ _clouseau_info.handle = NULL;
+ return EINA_FALSE;
+ }
+
+ _CLOUSEAU_LOAD_SYMBOL(_clouseau_info, init);
+ _CLOUSEAU_LOAD_SYMBOL(_clouseau_info, shutdown);
+ _CLOUSEAU_LOAD_SYMBOL(_clouseau_info, app_connect);
+
+ return EINA_TRUE;
+}
+
EAPI int
elm_init(int argc,
char **argv)
@@ -206,6 +261,16 @@ elm_init(int argc,
if (_elm_init_count > 1) return _elm_init_count;
elm_quicklaunch_sub_init(argc, argv);
_prefix_shutdown();
+
+ if (_clouseau_module_load())
+ {
+ _clouseau_info.init();
+ if(!_clouseau_info.app_connect(argv[0]))
+ {
+ ERR("Failed connecting to the clouseau server.");
+ }
+ }
+
return _elm_init_count;
}
@@ -221,6 +286,13 @@ elm_shutdown(void)
if (_elm_init_count > 0) return _elm_init_count;
_elm_win_shutdown();
while (_elm_win_deferred_free) ecore_main_loop_iterate();
+
+ if (_clouseau_info.shutdown)
+ {
+ _clouseau_info.shutdown();
+ eina_module_free(_clouseau_info.handle);
+ _clouseau_info.handle = NULL;
+ }
// wrningz :(
// _prefix_shutdown();
elm_quicklaunch_sub_shutdown();
--
|
|
From: Carsten H. (R. - E. G. <no-...@en...> - 2013-09-08 01:04:50
|
raster pushed a commit to branch master.
commit c1556b711239193cb7a63be3f647e185da83134d
Author: Carsten Haitzler (Rasterman) <ra...@ra...>
Date: Sun Sep 8 10:03:35 2013 +0900
eina - remove deadlock from share-common + remove extra lock/unlock
---
src/lib/eina/eina_share_common.c | 34 ++++++++++++++++++++++++----------
1 file changed, 24 insertions(+), 10 deletions(-)
diff --git a/src/lib/eina/eina_share_common.c b/src/lib/eina/eina_share_common.c
index 0dbf37d..c2b64ac 100644
--- a/src/lib/eina/eina_share_common.c
+++ b/src/lib/eina/eina_share_common.c
@@ -236,11 +236,9 @@ _eina_share_common_population_stats(Eina_Share *share)
share->population_group[i].max);
}
-void
-eina_share_common_population_add(Eina_Share *share, int slen)
+static void
+eina_share_common_population_nolock_add(Eina_Share *share, int slen)
{
- eina_lock_take(&_mutex_big);
-
share->population.count++;
if (share->population.count > share->population.max)
share->population.max = share->population.count;
@@ -253,19 +251,29 @@ eina_share_common_population_add(Eina_Share *share, int slen)
share->population_group[slen].max =
share->population_group[slen].count;
}
-
- eina_lock_release(&_mutex_big);
}
void
-eina_share_common_population_del(Eina_Share *share, int slen)
+eina_share_common_population_add(Eina_Share *share, int slen)
{
eina_lock_take(&_mutex_big);
+ eina_share_common_population_nolock_add(share, slen);
+ eina_lock_release(&_mutex_big);
+}
+static void
+eina_share_common_population_nolock_del(Eina_Share *share, int slen)
+{
share->population.count--;
if (slen < 4)
share->population_group[slen].count--;
+}
+void
+eina_share_common_population_del(Eina_Share *share, int slen)
+{
+ eina_lock_take(&_mutex_big);
+ eina_share_common_population_nolock_del(chare, slen);
eina_lock_release(&_mutex_big);
}
@@ -301,9 +309,15 @@ static void _eina_share_common_population_shutdown(EINA_UNUSED Eina_Share *share
}
static void _eina_share_common_population_stats(EINA_UNUSED Eina_Share *share) {
}
+static void eina_share_common_population_nolock_add(EINA_UNUSED Eina_Share *share,
+ EINA_UNUSED int slen) {
+}
void eina_share_common_population_add(EINA_UNUSED Eina_Share *share,
EINA_UNUSED int slen) {
}
+static void eina_share_common_population_nolock_del(EINA_UNUSED Eina_Share *share,
+ EINA_UNUSED int slen) {
+}
void eina_share_common_population_del(EINA_UNUSED Eina_Share *share,
EINA_UNUSED int slen) {
}
@@ -801,9 +815,9 @@ eina_share_common_ref(Eina_Share *share, const char *str)
}
node->references++;
- eina_lock_release(&_mutex_big);
+ eina_share_common_population_nolock_add(share, node->length);
- eina_share_common_population_add(share, node->length);
+ eina_lock_release(&_mutex_big);
return str;
}
@@ -827,7 +841,7 @@ eina_share_common_del(Eina_Share *share, const char *str)
goto on_error;
slen = node->length;
- eina_share_common_population_del(share, slen);
+ eina_share_common_population_nolock_del(share, slen);
if (node->references > 1)
{
node->references--;
--
|
|
From: Boris F. - E. G. <no-...@en...> - 2013-09-07 20:01:28
|
billiob pushed a commit to branch master.
commit 71d4f155be9c81841d861d1451844043ed3cb3c8
Author: Boris Faure <bi...@gm...>
Date: Sat Sep 7 17:53:06 2013 +0200
change cursor/selection when changing theme
---
src/bin/options_theme.c | 1 +
src/bin/termio.c | 11 +++++++----
src/bin/termio.h | 1 +
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/bin/options_theme.c b/src/bin/options_theme.c
index 56f6207..dddda4c 100644
--- a/src/bin/options_theme.c
+++ b/src/bin/options_theme.c
@@ -70,6 +70,7 @@ _cb_op_theme_sel(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUS
if (!theme_apply(edje, config, "terminology/background"))
ERR("Couldn't find terminology theme!");
colors_term_init(termio_textgrid_get(t->term), edje);
+ termio_config_set(t->term, config);
}
static int
diff --git a/src/bin/termio.c b/src/bin/termio.c
index 97867c0..5c3e9a8 100644
--- a/src/bin/termio.c
+++ b/src/bin/termio.c
@@ -3291,8 +3291,8 @@ _win_obj_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event EINA
}
}
-static void
-_termio_config_set(Evas_Object *obj, Config *config)
+void
+termio_config_set(Evas_Object *obj, Config *config)
{
Termio *sd = evas_object_smart_data_get(obj);
Evas_Coord w = 2, h = 2;
@@ -3315,7 +3315,10 @@ _termio_config_set(Evas_Object *obj, Config *config)
evas_object_scale_set(sd->grid.obj, elm_config_scale_get());
evas_object_textgrid_font_set(sd->grid.obj, sd->font.name, sd->font.size);
- evas_object_textgrid_size_set(sd->grid.obj, 1, 1);
+ evas_object_textgrid_size_get(sd->grid.obj, &w, &h);
+ if (w < 1) w = 1;
+ if (h < 1) h = 1;
+ evas_object_textgrid_size_set(sd->grid.obj, w, h);
evas_object_textgrid_cell_size_get(sd->grid.obj, &w, &h);
if (w < 1) w = 1;
if (h < 1) h = 1;
@@ -4129,7 +4132,7 @@ termio_add(Evas_Object *parent, Config *config, const char *cmd, Eina_Bool login
sd = evas_object_smart_data_get(obj);
if (!sd) return obj;
- _termio_config_set(obj, config);
+ termio_config_set(obj, config);
sd->glayer = g = elm_gesture_layer_add(parent);
elm_gesture_layer_attach(g, sd->event);
diff --git a/src/bin/termio.h b/src/bin/termio.h
index 485a311..f6e82dc 100644
--- a/src/bin/termio.h
+++ b/src/bin/termio.h
@@ -30,5 +30,6 @@ Evas_Object *termio_mirror_add(Evas_Object *obj);
const char *termio_title_get(Evas_Object *obj);
const char *termio_icon_name_get(Evas_Object *obj);
void termio_debugwhite_set(Evas_Object *obj, Eina_Bool dbg);
+void termio_config_set(Evas_Object *obj, Config *config);
#endif
--
|
|
From: Shinwoo K. - E. G. <no-...@en...> - 2013-09-07 02:56:24
|
kimcinoo pushed a commit to branch master.
commit e74b8896c5eb37609d8a829e6c1f978c29012a05
Author: Shinwoo Kim <cin...@sa...>
Date: Sat Sep 7 11:56:11 2013 +0900
[spinner] change part name to access.text from access_text for naming consistency
---
NEWS | 1 +
data/themes/widgets/spinner.edc | 12 ++++++------
src/lib/elm_spinner.c | 6 +++---
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/NEWS b/NEWS
index c6046bd..30d5df0 100644
--- a/NEWS
+++ b/NEWS
@@ -275,6 +275,7 @@ Fixes:
imf is available, the keyboard mode should be decided by ime, but not entry.
This prevents the asynchronous states between ime and conformant.
* Flip : Fix the flip page to not flip on a direction if the direction is disabled.
+ * Spinner : change part name to access.text from access_text on default style.
Removals:
diff --git a/data/themes/widgets/spinner.edc b/data/themes/widgets/spinner.edc
index ac518e1..3edad88 100644
--- a/data/themes/widgets/spinner.edc
+++ b/data/themes/widgets/spinner.edc
@@ -355,7 +355,7 @@ group { name: "elm/spinner/base/default";
visible: 1;
}
}
- part { name: "access_text";
+ part { name: "access.text";
type: RECT;
repeat_events: 1;
description { state: "default" 0.0;
@@ -518,7 +518,7 @@ group { name: "elm/spinner/base/default";
target: "right_over1";
target: "right_over2";
target: "disabler";
- target: "access_text";
+ target: "access.text";
after: "disable_text";
}
program { name: "disable_text";
@@ -549,7 +549,7 @@ group { name: "elm/spinner/base/default";
target: "right_over1";
target: "right_over2";
target: "disabler";
- target: "access_text";
+ target: "access.text";
after: "enable_text";
}
program { name: "enable_text";
@@ -908,7 +908,7 @@ group { name: "elm/spinner/base/vertical";
visible: 1;
}
}
- part { name: "access_text";
+ part { name: "access.text";
type: RECT;
repeat_events: 1;
description { state: "default" 0.0;
@@ -993,7 +993,7 @@ group { name: "elm/spinner/base/vertical";
target: "down_bt";
target: "up_bt";
target: "disabler";
- target: "access_text";
+ target: "access.text";
after: "disable_text";
}
program { name: "disable_text";
@@ -1020,7 +1020,7 @@ group { name: "elm/spinner/base/vertical";
target: "down_bt";
target: "up_bt";
target: "disabler";
- target: "access_text";
+ target: "access.text";
after: "enable_text";
}
program { name: "enable_text";
diff --git a/src/lib/elm_spinner.c b/src/lib/elm_spinner.c
index 5861c04..1afe98b 100644
--- a/src/lib/elm_spinner.c
+++ b/src/lib/elm_spinner.c
@@ -614,7 +614,7 @@ _access_spinner_register(Evas_Object *obj, Eina_Bool is_access)
(obj, elm_layout_edje_get(obj), decrement_part);
_elm_access_edje_object_part_object_unregister
- (obj, elm_layout_edje_get(obj), "access_text");
+ (obj, elm_layout_edje_get(obj), "access.text");
return;
}
@@ -639,7 +639,7 @@ _access_spinner_register(Evas_Object *obj, Eina_Bool is_access)
/* register spinner label */
ao = _elm_access_edje_object_part_object_register
- (obj, elm_layout_edje_get(obj), "access_text");
+ (obj, elm_layout_edje_get(obj), "access.text");
ai = _elm_access_info_get(ao);
_elm_access_text_set(ai, ELM_ACCESS_TYPE, E_("spinner"));
@@ -797,7 +797,7 @@ _elm_spinner_smart_focus_next(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
decrement_part = "left_bt";
}
- ao = _access_object_get(obj, "access_text");
+ ao = _access_object_get(obj, "access.text");
items = eina_list_append(items, ao);
ao = _access_object_get(obj, decrement_part);
--
|
|
From: Shinwoo K. - E. G. <no-...@en...> - 2013-09-07 02:34:34
|
kimcinoo pushed a commit to branch master.
commit e6090ed8ddabcffa38dcc235c8bc8403af198b2b
Author: Shinwoo Kim <cin...@sa...>
Date: Sat Sep 7 11:34:04 2013 +0900
[access] delete access object in job when its hover object is deleted
---
ChangeLog | 4 ++
src/lib/elm_access.c | 130 +++++++++++++++++++++++++++++++++++++--------------
2 files changed, 98 insertions(+), 36 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index ea24b35..1718c8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1589,3 +1589,7 @@
2013-09-04 Ryuan Choi (ryuan)
* elm_config : profile may be broken when clicked reset button in profiles tab
+
+2013-09-07 Shinwoo Kim
+
+ * elm_access : delete access object in job when its hover object is deleted
diff --git a/src/lib/elm_access.c b/src/lib/elm_access.c
index 684b9e3..164039c 100644
--- a/src/lib/elm_access.c
+++ b/src/lib/elm_access.c
@@ -292,7 +292,7 @@ _access_obj_over_timeout_cb(void *data)
}
static void
-_access_obj_mouse_in_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+_access_hover_mouse_in_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
Elm_Access_Info *ac;
if (!mouse_event_enable) return;
@@ -307,7 +307,7 @@ _access_obj_mouse_in_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSE
}
static void
-_access_obj_mouse_out_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+_access_hover_mouse_out_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
Elm_Access_Info *ac;
if (!mouse_event_enable) return;
@@ -321,13 +321,6 @@ _access_obj_mouse_out_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUS
}
static void
-_access_obj_del_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
-{
- _elm_access_object_unregister(data, obj);
- _access_object_unregister(obj);
-}
-
-static void
_access_read_done(void *data __UNUSED__)
{
DBG("read done");
@@ -940,17 +933,7 @@ _access_object_unregister(Evas_Object *obj)
if (ao)
{
- evas_object_data_del(obj, "_part_access_obj");
-
- /* delete callbacks */
- evas_object_event_callback_del_full(obj, EVAS_CALLBACK_RESIZE,
- _content_resize, ao);
- evas_object_event_callback_del_full(obj, EVAS_CALLBACK_MOVE,
- _content_move, ao);
-
- /* unregister access object */
- _elm_access_object_unregister(ao, obj);
-
+ /* delete callbacks and unregister access object in _access_obj_del_cb*/
evas_object_del(ao);
}
else
@@ -1019,17 +1002,86 @@ _elm_access_object_hilight_disable(Evas *e)
elm_widget_parent_highlight_set(ptarget, EINA_FALSE);
}
+static void
+_access_obj_del_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
+{
+
+ Ecore_Job *ao_del_job = NULL;
+
+ evas_object_event_callback_del(obj, EVAS_CALLBACK_DEL, _access_obj_del_cb);
+
+ if (data) /* hover object */
+ {
+ evas_object_event_callback_del_full(data, EVAS_CALLBACK_RESIZE,
+ _content_resize, obj);
+ evas_object_event_callback_del_full(data, EVAS_CALLBACK_MOVE,
+ _content_move, obj);
+
+ _elm_access_object_unregister(obj, data);
+ }
+
+ ao_del_job = evas_object_data_get(obj, "_access_obj_del_job");
+
+ if (ao_del_job)
+ {
+ ecore_job_del(ao_del_job);
+ evas_object_data_del(obj, "_access_obj_del_job");
+ }
+}
+
+static void
+_access_obj_del_job(void *data)
+{
+ if (!data) return;
+
+ evas_object_data_del(data, "_access_obj_del_job");
+
+ evas_object_event_callback_del(data, EVAS_CALLBACK_DEL, _access_obj_del_cb);
+ evas_object_del(data);
+}
+
+static void
+_access_hover_del_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
+{
+ Ecore_Job *ao_del_job = NULL;
+
+ /* data - access object - could be NULL */
+ if (!data) return;
+
+ evas_object_event_callback_del_full(obj, EVAS_CALLBACK_RESIZE,
+ _content_resize, data);
+ evas_object_event_callback_del_full(obj, EVAS_CALLBACK_MOVE,
+ _content_move, data);
+
+ _elm_access_object_unregister(data, obj);
+
+ /* delete access object in job */
+ ao_del_job = evas_object_data_get(data, "_access_obj_del_job");
+ if (ao_del_job)
+ {
+ ecore_job_del(ao_del_job);
+ evas_object_data_del(data, "_access_obj_del_job");
+ }
+
+ ao_del_job = ecore_job_add(_access_obj_del_job, data);
+ evas_object_data_set(data, "_access_obj_del_job", ao_del_job);
+}
+
EAPI void
_elm_access_object_register(Evas_Object *obj, Evas_Object *hoverobj)
{
Elm_Access_Info *ac;
evas_object_event_callback_add(hoverobj, EVAS_CALLBACK_MOUSE_IN,
- _access_obj_mouse_in_cb, obj);
+ _access_hover_mouse_in_cb, obj);
evas_object_event_callback_add(hoverobj, EVAS_CALLBACK_MOUSE_OUT,
- _access_obj_mouse_out_cb, obj);
+ _access_hover_mouse_out_cb, obj);
evas_object_event_callback_add(hoverobj, EVAS_CALLBACK_DEL,
- _access_obj_del_cb, obj);
+ _access_hover_del_cb, obj);
+
+ evas_object_event_callback_add(obj, EVAS_CALLBACK_DEL,
+ _access_obj_del_cb, hoverobj);
+
ac = calloc(1, sizeof(Elm_Access_Info));
evas_object_data_set(obj, "_elm_access", ac);
@@ -1040,18 +1092,29 @@ EAPI void
_elm_access_object_unregister(Evas_Object *obj, Evas_Object *hoverobj)
{
Elm_Access_Info *ac;
+ Evas_Object *ao;
evas_object_event_callback_del_full(hoverobj, EVAS_CALLBACK_MOUSE_IN,
- _access_obj_mouse_in_cb, obj);
+ _access_hover_mouse_in_cb, obj);
evas_object_event_callback_del_full(hoverobj, EVAS_CALLBACK_MOUSE_OUT,
- _access_obj_mouse_out_cb, obj);
+ _access_hover_mouse_out_cb, obj);
evas_object_event_callback_del_full(hoverobj, EVAS_CALLBACK_DEL,
- _access_obj_del_cb, obj);
+ _access_hover_del_cb, obj);
+
+ /* _access_obj_del_cb and _access_hover_del_cb calls this function,
+ both do not need _part_access_obj data, so delete the data here. */
+ ao = evas_object_data_get(hoverobj, "_part_access_obj");
+ if (ao) evas_object_data_del(hoverobj, "_part_access_obj");
ac = evas_object_data_get(obj, "_elm_access");
evas_object_data_del(obj, "_elm_access");
if (ac)
{
+ /* widget could delete VIEW(it) only and register item again,
+ in this case _elm_access_widget_item_register could try to delete
+ access object again in _elm_access_widget_item_unregister */
+ if (ac->widget_item) ac->widget_item->access_obj = NULL;
+
_elm_access_clear(ac);
free(ac);
}
@@ -1103,22 +1166,17 @@ _elm_access_widget_item_register(Elm_Widget_Item *item)
EAPI void
_elm_access_widget_item_unregister(Elm_Widget_Item *item)
{
- Evas_Object *ho;
+ Evas_Object *ao;
ELM_WIDGET_ITEM_CHECK_OR_RETURN(item);
if (!item->access_obj) return;
- ho = item->view;
- evas_object_event_callback_del_full(ho, EVAS_CALLBACK_RESIZE,
- _content_resize, item->access_obj);
- evas_object_event_callback_del_full(ho, EVAS_CALLBACK_MOVE,
- _content_move, item->access_obj);
-
- _elm_access_object_unregister(item->access_obj, ho);
-
- evas_object_del(item->access_obj);
+ /* delete callbacks and unregister access object in _access_obj_del_cb*/
+ ao = item->access_obj;
item->access_obj = NULL;
+
+ evas_object_del(ao);
}
EAPI Eina_Bool
--
|
|
From: Michael B. <mic...@gm...> - 2013-09-06 21:36:40
|
On Fri, 06 Sep 2013 13:42:28 -0700
José Roberto de Souza - Enlightenment Git <no-...@en...> wrote:
> zehortigoza pushed a commit to branch master.
>
> commit b140380776b758d3d8c1682896787e4b5291fd5a
> Author: José Roberto de Souza <jos...@in...>
> Date: Fri Sep 6 17:41:24 2013 -0300
>
> Avoid crash when socket address lenght is bigger than 126
>
> Here my socket address:
> :0.0.unix:abstract=/tmp/dbus-30Xo0YvOro,guid=c12ee38be195441e0b64c7ff5208e716.383c17da53f7fc81db94ac5f5171b40b-1376315157.910552-1882544957.=unknown=.@unknown@.!unknown!
> ---
> src/bin/ipc.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/src/bin/ipc.c b/src/bin/ipc.c
> index 75719ab..8a4f12d 100644
> --- a/src/bin/ipc.c
> +++ b/src/bin/ipc.c
> @@ -38,7 +38,8 @@ _ipc_hash_get(void)
> {
> char buf[1024], hash[64];
> const char *disp, *session, *xdg_session, *xdg_id, *xdg_seat, *xdg_vt;
> - char *s, i;
> + char *s;
> + unsigned int i;
> unsigned char c1, c2;
>
> /* dumb stoopid hash - i'm feeling lazy */
>
imo put your socket on the same diet that antognolli is on...
|
|
From: José R. de S. - E. G. <no-...@en...> - 2013-09-06 20:42:35
|
zehortigoza pushed a commit to branch master.
commit b140380776b758d3d8c1682896787e4b5291fd5a
Author: José Roberto de Souza <jos...@in...>
Date: Fri Sep 6 17:41:24 2013 -0300
Avoid crash when socket address lenght is bigger than 126
Here my socket address:
:0.0.unix:abstract=/tmp/dbus-30Xo0YvOro,guid=c12ee38be195441e0b64c7ff5208e716.383c17da53f7fc81db94ac5f5171b40b-1376315157.910552-1882544957.=unknown=.@unknown@.!unknown!
---
src/bin/ipc.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/bin/ipc.c b/src/bin/ipc.c
index 75719ab..8a4f12d 100644
--- a/src/bin/ipc.c
+++ b/src/bin/ipc.c
@@ -38,7 +38,8 @@ _ipc_hash_get(void)
{
char buf[1024], hash[64];
const char *disp, *session, *xdg_session, *xdg_id, *xdg_seat, *xdg_vt;
- char *s, i;
+ char *s;
+ unsigned int i;
unsigned char c1, c2;
/* dumb stoopid hash - i'm feeling lazy */
--
|
|
From: José R. de S. - E. G. <no-...@en...> - 2013-09-06 18:54:26
|
zehortigoza pushed a commit to branch master.
commit 3b085cd7e33bc64db47a14f0c0016165f235a14e
Author: José Roberto de Souza <jos...@in...>
Date: Fri Aug 16 18:17:17 2013 -0300
Add ecore system hooks
---
src/lib/elm_main.c | 40 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)
diff --git a/src/lib/elm_main.c b/src/lib/elm_main.c
index 9f138b2..6c8aba8 100644
--- a/src/lib/elm_main.c
+++ b/src/lib/elm_main.c
@@ -134,6 +134,8 @@ static const char *app_locale_dir = NULL;
static Eina_Prefix *app_pfx = NULL;
+static Ecore_Event_Handler *system_handlers[2] = { NULL, NULL };
+
static void
_prefix_check(void)
{
@@ -278,6 +280,35 @@ _elm_clouseau_reload()
return EINA_TRUE;
}
+Eina_Bool _sys_memory_changed(void *data EINA_UNUSED, int type EINA_UNUSED, void *event EINA_UNUSED)
+{
+ Ecore_Memory_State state = ecore_memory_state_get();
+
+ if (state != ECORE_MEMORY_STATE_LOW)
+ return ECORE_CALLBACK_PASS_ON;
+
+ elm_cache_all_flush();
+ return ECORE_CALLBACK_PASS_ON;
+}
+
+Eina_Bool _sys_lang_changed(void *data EINA_UNUSED, int type EINA_UNUSED, void *event EINA_UNUSED)
+{
+ char *lang;
+
+ lang = getenv("LANG");
+ if (!lang)
+ lang = getenv("LC_MESSAGES");
+ if (!lang)
+ lang = getenv("LC_ALL");
+
+ if (lang)
+ elm_language_set(lang);
+ else
+ ERR("Language not set in environment");
+
+ return ECORE_CALLBACK_PASS_ON;
+}
+
EAPI int
elm_init(int argc,
char **argv)
@@ -288,6 +319,9 @@ elm_init(int argc,
elm_quicklaunch_sub_init(argc, argv);
_prefix_shutdown();
+ system_handlers[0] = ecore_event_handler_add(ECORE_EVENT_MEMORY_STATE, _sys_memory_changed, NULL);
+ system_handlers[1] = ecore_event_handler_add(ECORE_EVENT_LOCALE_CHANGED, _sys_lang_changed, NULL);
+
return _elm_init_count;
}
@@ -301,6 +335,12 @@ elm_shutdown(void)
}
_elm_init_count--;
if (_elm_init_count > 0) return _elm_init_count;
+
+ if (system_handlers[0])
+ ecore_event_handler_del(system_handlers[0]);
+ if (system_handlers[1])
+ ecore_event_handler_del(system_handlers[1]);
+
_elm_win_shutdown();
while (_elm_win_deferred_free) ecore_main_loop_iterate();
--
|
|
From: Tom H. - E. G. <no-...@en...> - 2013-09-06 16:21:40
|
tasn pushed a commit to branch master.
commit c598997299a77c7a788ac66f55e556abd010dc42
Author: Tom Hacohen <to...@st...>
Date: Fri Sep 6 17:19:57 2013 +0100
Evas object clouseau: Added object name to the property list.
---
src/lib/evas/canvas/evas_object_main.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index 4dfb638..0af611c 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -1818,6 +1818,7 @@ _dbg_info_get(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list)
eo_do_super(eo_obj, MY_CLASS, eo_dbg_info_get(root));
Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME);
Eo_Dbg_Info *node;
+ const char *name;
double dblw, dblh;
double dblx, dbly;
double scale;
@@ -1839,6 +1840,7 @@ _dbg_info_get(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list)
eo_do(eo_obj,
evas_obj_visibility_get(&visible),
evas_obj_layer_get(&layer),
+ evas_obj_name_get(&name),
evas_obj_position_get(&x, &y),
evas_obj_size_get(&w, &h),
evas_obj_scale_get(&scale),
@@ -1856,6 +1858,10 @@ _dbg_info_get(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list)
evas_obj_clipees_has(&clipees_has));
EO_DBG_INFO_APPEND(group, "Visibility", EINA_VALUE_TYPE_CHAR, visible);
+
+ if (name)
+ EO_DBG_INFO_APPEND(group, "Name", EINA_VALUE_TYPE_STRING, name);
+
EO_DBG_INFO_APPEND(group, "Layer", EINA_VALUE_TYPE_INT, layer);
node = EO_DBG_INFO_LIST_APPEND(group, "Position");
--
|
|
From: Tom H. - E. G. <no-...@en...> - 2013-09-06 16:21:39
|
tasn pushed a commit to branch master.
commit f30be9b8ad54e87b3cab2500745f747cc176ef5d
Author: Tom Hacohen <to...@st...>
Date: Fri Sep 6 17:19:07 2013 +0100
Evas object clouseau: cleaned up the code a bit.
---
src/lib/evas/canvas/evas_object_main.c | 33 +++++++++++++++++++--------------
1 file changed, 19 insertions(+), 14 deletions(-)
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index d7f3ae6..4dfb638 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -1818,7 +1818,6 @@ _dbg_info_get(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list)
eo_do_super(eo_obj, MY_CLASS, eo_dbg_info_get(root));
Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME);
Eo_Dbg_Info *node;
- const char *text = NULL;
double dblw, dblh;
double dblx, dbly;
double scale;
@@ -1897,21 +1896,27 @@ _dbg_info_get(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list)
EO_DBG_INFO_APPEND(group, "Has focus", EINA_VALUE_TYPE_CHAR, focus);
- switch (m)
{
- case EVAS_OBJECT_POINTER_MODE_AUTOGRAB:
- text = "EVAS_OBJECT_POINTER_MODE_AUTOGRAB";
- break;
- case EVAS_OBJECT_POINTER_MODE_NOGRAB:
- text = "EVAS_OBJECT_POINTER_MODE_NOGRAB";
- break;
- case EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN:
- text = "EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN";
- break;
- }
+ const char *text = NULL;
+ switch (m)
+ {
+ case EVAS_OBJECT_POINTER_MODE_AUTOGRAB:
+ text = "EVAS_OBJECT_POINTER_MODE_AUTOGRAB";
+ break;
+ case EVAS_OBJECT_POINTER_MODE_NOGRAB:
+ text = "EVAS_OBJECT_POINTER_MODE_NOGRAB";
+ break;
+ case EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN:
+ text = "EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN";
+ break;
+ default:
+ text = NULL;
+ break;
+ }
- if (text)
- EO_DBG_INFO_APPEND(group, "Pointer Mode", EINA_VALUE_TYPE_STRING, text);
+ if (text)
+ EO_DBG_INFO_APPEND(group, "Pointer Mode", EINA_VALUE_TYPE_STRING, text);
+ }
EO_DBG_INFO_APPEND(group, "Pass Events", EINA_VALUE_TYPE_CHAR, pass_event);
EO_DBG_INFO_APPEND(group, "Repeat Events", EINA_VALUE_TYPE_CHAR, repeat_event);
--
|
|
From: Tom H. - E. G. <no-...@en...> - 2013-09-06 16:03:21
|
tasn pushed a commit to branch master.
commit dd93bda89d1630f78c74532361c030af8904f037
Author: Tom Hacohen <to...@st...>
Date: Fri Sep 6 17:02:11 2013 +0100
Always put the hilight object at the highest layer.
---
src/lib/clouseau_app.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/lib/clouseau_app.c b/src/lib/clouseau_app.c
index 83c948e..1a399fe 100644
--- a/src/lib/clouseau_app.c
+++ b/src/lib/clouseau_app.c
@@ -265,6 +265,8 @@ clouseau_data_object_highlight(Evas_Object *obj, Clouseau_Evas_Props *props, bmp
/* Continue and do the Highlight */
r = evas_object_rectangle_add(e);
+ /* Put the object as high as possible. */
+ evas_object_layer_set(r, EVAS_LAYER_MAX);
evas_object_move(r, x - PADDING, y - PADDING);
evas_object_resize(r, wd + (2 * PADDING), ht + (2 * PADDING));
evas_object_color_set(r,
--
|
|
From: discomfitor - E. G. <no-...@en...> - 2013-09-06 14:58:09
|
discomfitor pushed a commit to branch master.
commit 2f2df6346ceeaf7f0028d7e4b55e4a6895de3341
Author: discomfitor <mic...@gm...>
Date: Fri Sep 6 15:57:28 2013 +0100
fix harmless cast warning
---
src/modules/pager/e_mod_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/modules/pager/e_mod_main.c b/src/modules/pager/e_mod_main.c
index a776317..196f10e 100644
--- a/src/modules/pager/e_mod_main.c
+++ b/src/modules/pager/e_mod_main.c
@@ -811,7 +811,7 @@ _pager_popup_new(E_Zone *zone, int keyaction)
zy -= zone->y;
e_popup_move_resize(pp->popup,
zx + ((zw - w) / 2), zy + ((zh - h) / 2), w, h);
- e_object_free_attach_func_set(pp->popup, _pager_popup_cb_del);
+ e_object_free_attach_func_set(E_OBJECT(pp->popup), _pager_popup_cb_del);
e_object_data_set(E_OBJECT(pp->popup), pp);
e_popup_show(pp->popup);
--
|
|
From: discomfitor - E. G. <no-...@en...> - 2013-09-06 14:56:42
|
discomfitor pushed a commit to branch master.
commit c27a0594c017682635487824794ce47aaf520690
Author: discomfitor <mic...@gm...>
Date: Fri Sep 6 15:55:58 2013 +0100
delete pager popup timer...always.
---
src/modules/pager/e_mod_main.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/modules/pager/e_mod_main.c b/src/modules/pager/e_mod_main.c
index 48b2682..a776317 100644
--- a/src/modules/pager/e_mod_main.c
+++ b/src/modules/pager/e_mod_main.c
@@ -749,6 +749,7 @@ static void
_pager_popup_cb_del(void *obj)
{
Pager_Popup *pp = e_object_data_get(obj);
+ E_FREE_FUNC(pp->timer, ecore_timer_del);
_pager_free(pp->pager);
free(pp);
}
--
|
|
From: Tom 'T. H. - E. G. <no-...@en...> - 2013-09-06 14:10:48
|
tasn pushed a commit to branch master.
commit 78d88626c8034ffc420164348333d69b132ea2ab
Author: Tom 'TAsn' Hacohen <to...@st...>
Date: Fri Aug 30 11:55:33 2013 +0100
Use elm guide in the 'Jump To' field and improve it a bit.
---
src/bin/clouseau_client.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/bin/clouseau_client.c b/src/bin/clouseau_client.c
index bf04cae..9692238 100644
--- a/src/bin/clouseau_client.c
+++ b/src/bin/clouseau_client.c
@@ -1845,10 +1845,9 @@ _control_buttons_create(Gui_Elements *g, Evas_Object *win)
_highlight_check_check_changed, g);
jump_to_entry = elm_entry_add(g->hbx);
- elm_entry_scrollable_set(jump_to_entry, EINA_FALSE);
+ elm_entry_scrollable_set(jump_to_entry, EINA_TRUE);
elm_entry_single_line_set(jump_to_entry, EINA_TRUE);
- /* FIXME: Hack because for some reason we don't have "hints" in entry */
- elm_object_text_set(jump_to_entry, "Jump To");
+ elm_object_part_text_set(jump_to_entry, "guide", "Jump To Pointer");
evas_object_size_hint_align_set(jump_to_entry,
EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_size_hint_weight_set(jump_to_entry,
--
|
|
From: Cedric B. - E. G. <no-...@en...> - 2013-09-06 07:48:49
|
cedric pushed a commit to branch master.
commit 797ad7528f1d3fb90e66c4e45f7cd349321da9f9
Author: Cedric Bail <ced...@sa...>
Date: Fri Sep 6 16:47:36 2013 +0900
edje: add border linked to Image sets.
It is quite common that in an image sets each image has different border size.
This patch permit to define the border value on a per image basis in the set.
---
ChangeLog | 4 +
NEWS | 1 +
src/bin/edje/edje_cc_handlers.c | 210 ++++++++++++++++++++++++++++++----------
src/lib/edje/edje_calc.c | 19 +++-
src/lib/edje/edje_data.c | 5 +
src/lib/edje/edje_private.h | 5 +
6 files changed, 190 insertions(+), 54 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f115014..048348a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-09-06 Cedric Bail
+
+ * Edje: Add border information to Image sets.
+
2013-09-05 Cedric Bail
* Evas: Add evas_object_smart_iterator_new().
diff --git a/NEWS b/NEWS
index 0794a9e..35a7f1d 100644
--- a/NEWS
+++ b/NEWS
@@ -131,6 +131,7 @@ Additions:
- Reduce load time of Edje_Object using Evas_Object_Textblock and many styles.
- Add edje_object_mmap_set.
- Fix play sample parameter checking.
+ - Add border information to Image sets.
* Eeze:
- Add a dummy libmount replacement for when libmount is not there.
* Ecore_Con:
diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c
index aa943cd..7548f15 100644
--- a/src/bin/edje/edje_cc_handlers.c
+++ b/src/bin/edje/edje_cc_handlers.c
@@ -161,6 +161,8 @@ static void st_images_set_name(void);
static void ob_images_set_image(void);
static void st_images_set_image_image(void);
static void st_images_set_image_size(void);
+static void st_images_set_image_border(void);
+static void st_images_set_image_border_scale_by(void);
static void st_fonts_font(void);
@@ -401,6 +403,8 @@ New_Statement_Handler statement_handlers[] =
{"images.set.name", st_images_set_name},
{"images.set.image.image", st_images_set_image_image},
{"images.set.image.size", st_images_set_image_size},
+ {"images.set.image.border", st_images_set_image_border},
+ {"images.set.image.scale_by", st_images_set_image_border_scale_by},
{"fonts.font", st_fonts_font},
{"data.item", st_data_item},
{"data.file", st_data_file},
@@ -416,10 +420,14 @@ New_Statement_Handler statement_handlers[] =
{"collections.set.name", st_images_set_name}, /* dup */
{"collections.set.image.image", st_images_set_image_image}, /* dup */
{"collections.set.image.size", st_images_set_image_size}, /* dup */
+ {"collections.set.image.border", st_images_set_image_border}, /* dup */
+ {"collections.set.image.scale_by", st_images_set_image_border_scale_by}, /* dup */
{"collections.images.image", st_images_image}, /* dup */
{"collections.images.set.name", st_images_set_name}, /* dup */
{"collections.images.set.image.image", st_images_set_image_image}, /* dup */
{"collections.images.set.image.size", st_images_set_image_size}, /* dup */
+ {"collections.images.set.image.border", st_images_set_image_border}, /* dup */
+ {"collections.images.set.image.scale_by", st_images_set_image_border_scale_by}, /* dup */
{"collections.font", st_fonts_font}, /* dup */
{"collections.fonts.font", st_fonts_font}, /* dup */
{"collections.styles.style.name", st_styles_style_name}, /* dup */
@@ -451,13 +459,17 @@ New_Statement_Handler statement_handlers[] =
{"collections.group.limits.vertical", st_collections_group_limits_vertical},
{"collections.group.externals.external", st_externals_external}, /* dup */
{"collections.group.image", st_images_image}, /* dup */
- {"collections.group.set.name", st_images_set_name},
- {"collections.group.set.image.image", st_images_set_image_image},
- {"collections.group.set.image.size", st_images_set_image_size},
+ {"collections.group.set.name", st_images_set_name}, /* dup */
+ {"collections.group.set.image.image", st_images_set_image_image}, /* dup */
+ {"collections.group.set.image.size", st_images_set_image_size}, /* dup */
+ {"collections.group.set.image.border", st_images_set_image_border}, /* dup */
+ {"collections.group.set.image.scale_by", st_images_set_image_border_scale_by}, /* dup */
{"collections.group.images.image", st_images_image}, /* dup */
- {"collections.group.images.set.name", st_images_set_name},
- {"collections.group.images.set.image.image", st_images_set_image_image},
- {"collections.group.images.set.image.size", st_images_set_image_size},
+ {"collections.group.images.set.name", st_images_set_name}, /* dup */
+ {"collections.group.images.set.image.image", st_images_set_image_image}, /* dup */
+ {"collections.group.images.set.image.size", st_images_set_image_size}, /* dup */
+ {"collections.group.images.set.image.border", st_images_set_image_border}, /* dup */
+ {"collections.group.images.set.image.scale_by", st_images_set_image_border_scale_by}, /* dup */
{"collections.group.font", st_fonts_font}, /* dup */
{"collections.group.fonts.font", st_fonts_font}, /* dup */
{"collections.group.styles.style.name", st_styles_style_name}, /* dup */
@@ -469,13 +481,17 @@ New_Statement_Handler statement_handlers[] =
{"collections.group.color_classes.color_class.color3", st_color_class_color3}, /* dup */
{"collections.group.parts.alias", st_collections_group_parts_alias },
{"collections.group.parts.image", st_images_image}, /* dup */
- {"collections.group.parts.set.name", st_images_set_name},
- {"collections.group.parts.set.image.image", st_images_set_image_image},
- {"collections.group.parts.set.image.size", st_images_set_image_size},
+ {"collections.group.parts.set.name", st_images_set_name}, /* dup */
+ {"collections.group.parts.set.image.image", st_images_set_image_image}, /* dup */
+ {"collections.group.parts.set.image.size", st_images_set_image_size}, /* dup */
+ {"collections.group.parts.set.image.border", st_images_set_image_border}, /* dup */
+ {"collections.group.parts.set.image.scale_by", st_images_set_image_border_scale_by}, /* dup */
{"collections.group.parts.images.image", st_images_image}, /* dup */
- {"collections.group.parts.images.set.name", st_images_set_name},
- {"collections.group.parts.images.set.image.image", st_images_set_image_image},
- {"collections.group.parts.images.set.image.size", st_images_set_image_size},
+ {"collections.group.parts.images.set.name", st_images_set_name}, /* dup */
+ {"collections.group.parts.images.set.image.image", st_images_set_image_image}, /* dup */
+ {"collections.group.parts.images.set.image.size", st_images_set_image_size}, /* dup */
+ {"collections.group.parts.images.set.image.border", st_images_set_image_border}, /* dup */
+ {"collections.group.parts.images.set.image.scale_by", st_images_set_image_border_scale_by}, /* dup */
{"collections.group.parts.font", st_fonts_font}, /* dup */
{"collections.group.parts.fonts.font", st_fonts_font}, /* dup */
{"collections.group.parts.styles.style.name", st_styles_style_name}, /* dup */
@@ -521,13 +537,17 @@ New_Statement_Handler statement_handlers[] =
{"collections.group.parts.part.multiline", st_collections_group_parts_part_multiline},
{"collections.group.parts.part.access", st_collections_group_parts_part_access},
{"collections.group.parts.part.image", st_images_image}, /* dup */
- {"collections.group.parts.part.set.name", st_images_set_name},
- {"collections.group.parts.part.set.image.image", st_images_set_image_image},
- {"collections.group.parts.part.set.image.size", st_images_set_image_size},
+ {"collections.group.parts.part.set.name", st_images_set_name}, /* dup */
+ {"collections.group.parts.part.set.image.image", st_images_set_image_image}, /* dup */
+ {"collections.group.parts.part.set.image.size", st_images_set_image_size}, /* dup */
+ {"collections.group.parts.part.set.image.border", st_images_set_image_border}, /* dup */
+ {"collections.group.parts.part.set.image.scale_by", st_images_set_image_border_scale_by}, /* dup */
{"collections.group.parts.part.images.image", st_images_image}, /* dup */
- {"collections.group.parts.part.images.set.name", st_images_set_name},
- {"collections.group.parts.part.images.set.image.image", st_images_set_image_image},
- {"collections.group.parts.part.images.set.image.size", st_images_set_image_size},
+ {"collections.group.parts.part.images.set.name", st_images_set_name}, /* dup */
+ {"collections.group.parts.part.images.set.image.image", st_images_set_image_image}, /* dup */
+ {"collections.group.parts.part.images.set.image.size", st_images_set_image_size}, /* dup */
+ {"collections.group.parts.part.images.set.image.border", st_images_set_image_border}, /* dup */
+ {"collections.group.parts.part.images.set.image.scale_by", st_images_set_image_border_scale_by}, /* dup */
{"collections.group.parts.part.font", st_fonts_font}, /* dup */
{"collections.group.parts.part.fonts.font", st_fonts_font}, /* dup */
{"collections.group.parts.part.styles.style.name", st_styles_style_name}, /* dup */
@@ -591,13 +611,17 @@ New_Statement_Handler statement_handlers[] =
{"collections.group.parts.part.description.image.normal", st_collections_group_parts_part_description_image_normal},
{"collections.group.parts.part.description.image.tween", st_collections_group_parts_part_description_image_tween},
{"collections.group.parts.part.description.image.image", st_images_image}, /* dup */
- {"collections.group.parts.part.description.image.set.name", st_images_set_name},
- {"collections.group.parts.part.description.image.set.image.image", st_images_set_image_image},
- {"collections.group.parts.part.description.image.set.image.size", st_images_set_image_size},
+ {"collections.group.parts.part.description.image.set.name", st_images_set_name}, /* dup */
+ {"collections.group.parts.part.description.image.set.image.image", st_images_set_image_image}, /* dup */
+ {"collections.group.parts.part.description.image.set.image.size", st_images_set_image_size}, /* dup */
+ {"collections.group.parts.part.description.images.set.image.border", st_images_set_image_border}, /* dup */
+ {"collections.group.parts.part.description.images.set.image.scale_by", st_images_set_image_border_scale_by}, /* dup */
{"collections.group.parts.part.description.image.images.image", st_images_image}, /* dup */
- {"collections.group.parts.part.description.image.images.set.name", st_images_set_name},
- {"collections.group.parts.part.description.image.images.set.image.image", st_images_set_image_image},
- {"collections.group.parts.part.description.image.images.set.image.size", st_images_set_image_size},
+ {"collections.group.parts.part.description.image.images.set.name", st_images_set_name}, /* dup */
+ {"collections.group.parts.part.description.image.images.set.image.image", st_images_set_image_image}, /* dup */
+ {"collections.group.parts.part.description.image.images.set.image.size", st_images_set_image_size}, /* dup */
+ {"collections.group.parts.part.description.image.images.set.image.border", st_images_set_image_border}, /* dup */
+ {"collections.group.parts.part.description.image.images.set.image.scale_by", st_images_set_image_border_scale_by}, /* dup */
{"collections.group.parts.part.description.image.border", st_collections_group_parts_part_description_image_border},
{"collections.group.parts.part.description.image.middle", st_collections_group_parts_part_description_image_middle},
{"collections.group.parts.part.description.image.border_scale", st_collections_group_parts_part_description_image_border_scale},
@@ -681,9 +705,11 @@ New_Statement_Handler statement_handlers[] =
{"collections.group.parts.part.description.params.bool", st_collections_group_parts_part_description_params_bool},
{"collections.group.parts.part.description.params.choice", st_collections_group_parts_part_description_params_choice},
{"collections.group.parts.part.description.images.image", st_images_image}, /* dup */
- {"collections.group.parts.part.description.images.set.name", st_images_set_name},
- {"collections.group.parts.part.description.images.set.image.image", st_images_set_image_image},
- {"collections.group.parts.part.description.images.set.image.size", st_images_set_image_size},
+ {"collections.group.parts.part.description.images.set.name", st_images_set_name}, /* dup */
+ {"collections.group.parts.part.description.images.set.image.image", st_images_set_image_image}, /* dup */
+ {"collections.group.parts.part.description.images.set.image.size", st_images_set_image_size}, /* dup */
+ {"collections.group.parts.part.description.images.set.image.border", st_images_set_image_border}, /* dup */
+ {"collections.group.parts.part.description.images.set.image.scale_by", st_images_set_image_border_scale_by}, /* dup */
{"collections.group.parts.part.description.font", st_fonts_font}, /* dup */
{"collections.group.parts.part.description.fonts.font", st_fonts_font}, /* dup */
{"collections.group.parts.part.description.styles.style.name", st_styles_style_name}, /* dup */
@@ -694,13 +720,17 @@ New_Statement_Handler statement_handlers[] =
{"collections.group.parts.part.description.color_classes.color_class.color2", st_color_class_color2}, /* dup */
{"collections.group.parts.part.description.color_classes.color_class.color3", st_color_class_color3}, /* dup */
{"collections.group.parts.part.description.programs.image", st_images_image}, /* dup */
- {"collections.group.parts.part.description.programs.set.name", st_images_set_name},
- {"collections.group.parts.part.description.programs.set.image.image", st_images_set_image_image},
- {"collections.group.parts.part.description.programs.set.image.size", st_images_set_image_size},
+ {"collections.group.parts.part.description.programs.set.name", st_images_set_name}, /* dup */
+ {"collections.group.parts.part.description.programs.set.image.image", st_images_set_image_image}, /* dup */
+ {"collections.group.parts.part.description.programs.set.image.size", st_images_set_image_size}, /* dup */
+ {"collections.group.parts.part.description.programs.set.image.border", st_images_set_image_border}, /* dup */
+ {"collections.group.parts.part.description.programs.set.image.scale_by", st_images_set_image_border_scale_by}, /* dup */
{"collections.group.parts.part.description.programs.images.image", st_images_image}, /* dup */
- {"collections.group.parts.part.description.programs.images.set.name", st_images_set_name},
- {"collections.group.parts.part.description.programs.images.set.image.image", st_images_set_image_image},
- {"collections.group.parts.part.description.programs.images.set.image.size", st_images_set_image_size},
+ {"collections.group.parts.part.description.programs.images.set.name", st_images_set_name}, /* dup */
+ {"collections.group.parts.part.description.programs.images.set.image.image", st_images_set_image_image}, /* dup */
+ {"collections.group.parts.part.description.programs.images.set.image.size", st_images_set_image_size}, /* dup */
+ {"collections.group.parts.part.description.programs.images.set.image.border", st_images_set_image_border}, /* dup */
+ {"collections.group.parts.part.description.programs.images.set.image.scale_by", st_images_set_image_border_scale_by}, /* dup */
{"collections.group.parts.part.description.programs.font", st_fonts_font}, /* dup */
{"collections.group.parts.part.description.programs.fonts.font", st_fonts_font}, /* dup */
{"collections.group.parts.part.description.programs.program.name", st_collections_group_programs_program_name}, /* dup */
@@ -722,13 +752,17 @@ New_Statement_Handler statement_handlers[] =
{"collections.group.parts.part.description.program.after", st_collections_group_programs_program_after}, /* dup */
{"collections.group.parts.part.description.program.api", st_collections_group_programs_program_api}, /* dup */
{"collections.group.parts.part.programs.image", st_images_image}, /* dup */
- {"collections.group.parts.part.programs.set.name", st_images_set_name},
- {"collections.group.parts.part.programs.set.image.image", st_images_set_image_image},
- {"collections.group.parts.part.programs.set.image.size", st_images_set_image_size},
+ {"collections.group.parts.part.programs.set.name", st_images_set_name}, /* dup */
+ {"collections.group.parts.part.programs.set.image.image", st_images_set_image_image}, /* dup */
+ {"collections.group.parts.part.programs.set.image.size", st_images_set_image_size}, /* dup */
+ {"collections.group.parts.part.programs.set.image.border", st_images_set_image_border}, /* dup */
+ {"collections.group.parts.part.programs.set.image.scale_by", st_images_set_image_border_scale_by}, /* dup */
{"collections.group.parts.part.programs.images.image", st_images_image}, /* dup */
- {"collections.group.parts.part.programs.images.set.name", st_images_set_name},
- {"collections.group.parts.part.programs.images.set.image.image", st_images_set_image_image},
- {"collections.group.parts.part.programs.images.set.image.size", st_images_set_image_size},
+ {"collections.group.parts.part.programs.images.set.name", st_images_set_name}, /* dup */
+ {"collections.group.parts.part.programs.images.set.image.image", st_images_set_image_image}, /* dup */
+ {"collections.group.parts.part.programs.images.set.image.size", st_images_set_image_size}, /* dup */
+ {"collections.group.parts.part.programs.images.set.image.border", st_images_set_image_border}, /* dup */
+ {"collections.group.parts.part.programs.images.set.image.scale_by", st_images_set_image_border_scale_by}, /* dup */
{"collections.group.parts.part.programs.font", st_fonts_font}, /* dup */
{"collections.group.parts.part.programs.fonts.font", st_fonts_font}, /* dup */
{"collections.group.parts.part.programs.program.name", st_collections_group_programs_program_name}, /* dup */
@@ -750,13 +784,17 @@ New_Statement_Handler statement_handlers[] =
{"collections.group.parts.part.program.after", st_collections_group_programs_program_after}, /* dup */
{"collections.group.parts.part.program.api", st_collections_group_programs_program_api}, /* dup */
{"collections.group.parts.programs.image", st_images_image}, /* dup */
- {"collections.group.parts.programs.set.name", st_images_set_name},
- {"collections.group.parts.programs.set.image.image", st_images_set_image_image},
- {"collections.group.parts.programs.set.image.size", st_images_set_image_size},
+ {"collections.group.parts.programs.set.name", st_images_set_name}, /* dup */
+ {"collections.group.parts.programs.set.image.image", st_images_set_image_image}, /* dup */
+ {"collections.group.parts.programs.set.image.size", st_images_set_image_size}, /* dup */
+ {"collections.group.parts.programs.set.image.border", st_images_set_image_border}, /* dup */
+ {"collections.group.parts.programs.set.image.scale_by", st_images_set_image_border_scale_by}, /* dup */
{"collections.group.parts.programs.images.image", st_images_image}, /* dup */
- {"collections.group.parts.programs.images.set.name", st_images_set_name},
- {"collections.group.parts.programs.images.set.image.image", st_images_set_image_image},
- {"collections.group.parts.programs.images.set.image.size", st_images_set_image_size},
+ {"collections.group.parts.programs.images.set.name", st_images_set_name}, /* dup */
+ {"collections.group.parts.programs.images.set.image.image", st_images_set_image_image}, /* dup */
+ {"collections.group.parts.programs.images.set.image.size", st_images_set_image_size}, /* dup */
+ {"collections.group.parts.programs.images.set.image.border", st_images_set_image_border}, /* dup */
+ {"collections.group.parts.programs.images.set.image.scale_by", st_images_set_image_border_scale_by}, /* dup */
{"collections.group.parts.programs.font", st_fonts_font}, /* dup */
{"collections.group.parts.programs.fonts.font", st_fonts_font}, /* dup */
{"collections.group.parts.programs.program.name", st_collections_group_programs_program_name}, /* dup */
@@ -806,13 +844,17 @@ New_Statement_Handler statement_handlers[] =
{"collections.group.programs.program.after", st_collections_group_programs_program_after},
{"collections.group.programs.program.api", st_collections_group_programs_program_api},
{"collections.group.programs.image", st_images_image}, /* dup */
- {"collections.group.programs.set.name", st_images_set_name},
- {"collections.group.programs.set.image.image", st_images_set_image_image},
- {"collections.group.programs.set.image.size", st_images_set_image_size},
+ {"collections.group.programs.set.name", st_images_set_name}, /* dup */
+ {"collections.group.programs.set.image.image", st_images_set_image_image}, /* dup */
+ {"collections.group.programs.set.image.size", st_images_set_image_size}, /* dup */
+ {"collections.group.programs.set.image.border", st_images_set_image_border}, /* dup */
+ {"collections.group.programs.set.image.scale_by", st_images_set_image_border_scale_by}, /* dup */
{"collections.group.programs.images.image", st_images_image}, /* dup */
- {"collections.group.programs.images.set.name", st_images_set_name},
- {"collections.group.programs.images.set.image.image", st_images_set_image_image},
- {"collections.group.programs.images.set.image.size", st_images_set_image_size},
+ {"collections.group.programs.images.set.name", st_images_set_name}, /* dup */
+ {"collections.group.programs.images.set.image.image", st_images_set_image_image}, /* dup */
+ {"collections.group.programs.images.set.image.size", st_images_set_image_size}, /* dup */
+ {"collections.group.programs.images.set.image.border", st_images_set_image_border}, /* dup */
+ {"collections.group.programs.images.set.image.scale_by", st_images_set_image_border_scale_by}, /* dup */
{"collections.group.programs.font", st_fonts_font}, /* dup */
{"collections.group.programs.fonts.font", st_fonts_font} /* dup */
};
@@ -1697,6 +1739,72 @@ st_images_set_image_size(void)
}
/**
+ @page edcref
+ @property
+ border
+ @parameters
+ [left] [right] [top] [bottom]
+ @since 1.8
+ @effect
+ If set, the area (in pixels) of each side of the image will be
+ displayed as a fixed size border, from the side -> inwards, preventing
+ the corners from being changed on a resize.
+ @endproperty
+*/
+static void
+st_images_set_image_border(void)
+{
+ Edje_Image_Directory_Set_Entry *entry;
+ Edje_Image_Directory_Set *set;
+
+ set = edje_file->image_dir->sets + edje_file->image_dir->sets_count - 1;
+ entry = eina_list_data_get(eina_list_last(set->entries));
+
+ entry->border.l = parse_int_range(0, 0, 0x7fffffff);
+ entry->border.r = parse_int_range(1, 0, 0x7fffffff);
+ entry->border.t = parse_int_range(2, 0, 0x7fffffff);
+ entry->border.b = parse_int_range(3, 0, 0x7fffffff);
+}
+
+
+/**
+ @page edcref
+ @property
+ border_scale_by
+ @parameters
+ 0.0 or bigger (0.0 or 1.0 to turn it off)
+ @since 1.8
+ @effect
+ If border scaling is enabled then normally the OUTPUT border sizes
+ (e.g. if 3 pixels on the left edge are set as a border, then normally
+ at scale 1.0, those 3 columns will always be the exact 3 columns of
+ output, or at scale 2.0 they will be 6 columns, or 0.33 they will merge
+ into a single column). This property multiplies the input scale
+ factor by this multiplier, allowing the creation of "supersampled"
+ borders to make much higher resolution outputs possible by always using
+ the highest resolution artwork and then runtime scaling it down.
+ @endproperty
+*/
+static void
+st_images_set_image_border_scale_by(void)
+{
+ Edje_Part_Description_Image *ed;
+
+ check_arg_count(1);
+
+ if (current_part->type != EDJE_PART_TYPE_IMAGE)
+ {
+ ERR("parse error %s:%i. image attributes in non-IMAGE part.",
+ file_in, line - 1);
+ exit(-1);
+ }
+
+ ed = (Edje_Part_Description_Image*) current_desc;
+
+ ed->image.border.scale_by = FROM_DOUBLE(parse_float_range(0, 0.0, 999999999.0));
+}
+
+/**
@edcsubsection{toplevel_fonts,Fonts}
*/
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index 0967a37..4ef7f48 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -9,7 +9,7 @@ static void _edje_part_recalc_single(Edje *ed, Edje_Real_Part *ep,
Edje_Real_Part *rel1_to_x, Edje_Real_Part *rel1_to_y,
Edje_Real_Part *rel2_to_x, Edje_Real_Part *rel2_to_y,
Edje_Real_Part *confine_to, Edje_Real_Part *threshold,
- Edje_Calc_Params *params,
+ Edje_Calc_Params *params, Edje_Real_Part_Set *set,
Evas_Coord mmw, Evas_Coord mmh,
FLOAT_T pos);
@@ -2239,6 +2239,7 @@ _edje_part_recalc_single(Edje *ed,
Edje_Real_Part *confine_to,
Edje_Real_Part *threshold,
Edje_Calc_Params *params,
+ Edje_Real_Part_Set *set,
Evas_Coord mmw, Evas_Coord mmh,
FLOAT_T pos)
{
@@ -2445,6 +2446,18 @@ _edje_part_recalc_single(Edje *ed,
params->type.common.spec.image.b = img_desc->image.border.b;
params->type.common.spec.image.border_scale_by = img_desc->image.border.scale_by;
+
+ if (set && set->set)
+ {
+#define SET_BORDER_DEFINED(Result, Value) Result = Value ? Value : Result;
+ SET_BORDER_DEFINED(params->type.common.spec.image.l, set->entry->border.l);
+ SET_BORDER_DEFINED(params->type.common.spec.image.r, set->entry->border.r);
+ SET_BORDER_DEFINED(params->type.common.spec.image.t, set->entry->border.t);
+ SET_BORDER_DEFINED(params->type.common.spec.image.b, set->entry->border.b);
+
+ SET_BORDER_DEFINED(params->type.common.spec.image.border_scale_by, set->entry->border.scale_by);
+ }
+
break;
}
case EDJE_PART_TYPE_TEXT:
@@ -3356,7 +3369,7 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
_edje_part_recalc_single(ed, ep, ep->param1.description, chosen_desc, center[0], light[0], persp[0],
rp1[Rel1X], rp1[Rel1Y], rp1[Rel2X], rp1[Rel2Y],
confine_to, threshold,
- p1, mmw, mmh, pos);
+ p1, ep->param1.set, mmw, mmh, pos);
#ifdef EDJE_CALC_CACHE
if (flags == FLAG_XY)
ep->param1.state = ed->state;
@@ -3426,7 +3439,7 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
rp2[Rel2X],
rp2[Rel2Y],
confine_to, threshold,
- p2, mmw, mmh, pos);
+ p2, ep->param2->set, mmw, mmh, pos);
#ifdef EDJE_CALC_CACHE
if (flags == FLAG_XY)
ep->param2->state = ed->state;
diff --git a/src/lib/edje/edje_data.c b/src/lib/edje/edje_data.c
index 20725a0..f9e48ee 100644
--- a/src/lib/edje/edje_data.c
+++ b/src/lib/edje/edje_data.c
@@ -311,6 +311,11 @@ _edje_edd_init(void)
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_image_directory_set_entry, Edje_Image_Directory_Set_Entry, "min.h", size.min.h, EET_T_INT);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_image_directory_set_entry, Edje_Image_Directory_Set_Entry, "max.w", size.max.w, EET_T_INT);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_image_directory_set_entry, Edje_Image_Directory_Set_Entry, "max.h", size.max.h, EET_T_INT);
+ EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_image_directory_set_entry, Edje_Image_Directory_Set_Entry, "border.l", border.l, EET_T_INT);
+ EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_image_directory_set_entry, Edje_Image_Directory_Set_Entry, "border.r", border.r, EET_T_INT);
+ EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_image_directory_set_entry, Edje_Image_Directory_Set_Entry, "border.t", border.t, EET_T_INT);
+ EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_image_directory_set_entry, Edje_Image_Directory_Set_Entry, "border.b", border.b, EET_T_INT);
+ EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_image_directory_set_entry, Edje_Image_Directory_Set_Entry, "border.scale_by", border.scale_by, EDJE_T_FLOAT);
EET_EINA_FILE_DATA_DESCRIPTOR_CLASS_SET(&eddc, Edje_Image_Directory_Set);
_edje_edd_edje_image_directory_set =
diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h
index b850992..b1c199f 100644
--- a/src/lib/edje/edje_private.h
+++ b/src/lib/edje/edje_private.h
@@ -580,6 +580,11 @@ struct _Edje_Image_Directory_Set_Entry
int h;
} min, max;
} size;
+
+ struct {
+ int l, r, t, b;
+ FLOAT_T scale_by;
+ } border;
};
struct _Edje_Sound_Sample /*Sound Sample*/
--
|
|
From: Daniel J. S. - E. G. <no-...@en...> - 2013-09-06 07:33:43
|
seoz pushed a commit to branch master.
commit 5712a49f7cd2b36f792e78ed7fd9172f78ae20cf
Author: Daniel Juyung Seo <seo...@gm...>
Date: Fri Sep 6 13:00:42 2013 +0900
elm_genlist.c: use more ELM_SAFE_FREE.
---
src/lib/elm_genlist.c | 88 ++++++++++++++-------------------------------------
1 file changed, 24 insertions(+), 64 deletions(-)
diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index 94d7109..269c8af 100644
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -1281,11 +1281,8 @@ _item_cache_add(Elm_Gen_Item *it)
{
evas_object_del(VIEW(it));
VIEW(it) = NULL;
- if (it->spacer)
- {
- evas_object_del(it->spacer);
- it->spacer = NULL;
- }
+ ELM_SAFE_FREE(it->spacer, evas_object_del);
+
evas_event_thaw(evas_object_evas_get(obj));
evas_event_thaw_eval(evas_object_evas_get(obj));
@@ -3006,14 +3003,11 @@ _decorate_all_item_unrealize(Elm_Gen_Item *it)
(it->deco_all_view, "elm,state,reorder,mode_unset", "elm");
}
- evas_object_del(it->deco_all_view);
- it->deco_all_view = NULL;
- elm_widget_stringlist_free(it->item->deco_all_texts);
- it->item->deco_all_texts = NULL;
- elm_widget_stringlist_free(it->item->deco_all_contents);
- it->item->deco_all_contents = NULL;
- elm_widget_stringlist_free(it->item->deco_all_states);
- it->item->deco_all_states = NULL;
+ ELM_SAFE_FREE(it->deco_all_view, evas_object_del);
+ ELM_SAFE_FREE(it->item->deco_all_texts, elm_widget_stringlist_free);
+ ELM_SAFE_FREE(it->item->deco_all_contents, elm_widget_stringlist_free);
+ ELM_SAFE_FREE(it->item->deco_all_states, elm_widget_stringlist_free);
+
EINA_LIST_FREE(it->item->deco_all_content_objs, icon)
evas_object_del(icon);
edje_object_message_signal_process(it->deco_all_view);
@@ -3057,11 +3051,7 @@ _elm_genlist_item_del_serious(Elm_Gen_Item *it)
if (it->group)
sd->group_items = eina_list_remove(sd->group_items, it);
- if (sd->state)
- {
- eina_inlist_sorted_state_free(sd->state);
- sd->state = NULL;
- }
+ ELM_SAFE_FREE(sd->state, eina_inlist_sorted_state_free);
if (sd->calc_job) ecore_job_del(sd->calc_job);
sd->calc_job = ecore_job_add(_calc_job, sd->obj);
@@ -3877,8 +3867,7 @@ _item_process_post(Elm_Genlist_Smart_Data *sd,
it->item->block->changed = 0;
if (sd->pan_changed)
{
- if (sd->calc_job) ecore_job_del(sd->calc_job);
- sd->calc_job = NULL;
+ ELM_SAFE_FREE(sd->calc_job, ecore_job_del);
_calc_job(sd->obj);
sd->pan_changed = EINA_FALSE;
}
@@ -3986,21 +3975,13 @@ _item_queue(Elm_Genlist_Smart_Data *sd,
// evas_event_freeze(evas_object_evas_get(sd->obj));
while ((sd->queue) && ((!sd->blocks) || (!sd->blocks->next)))
{
- if (sd->queue_idle_enterer)
- {
- ecore_idle_enterer_del(sd->queue_idle_enterer);
- sd->queue_idle_enterer = NULL;
- }
+ ELM_SAFE_FREE(sd->queue_idle_enterer, ecore_idle_enterer_del);
_queue_process(sd);
}
while ((sd->queue) && (sd->blocks) &&
(sd->homogeneous) && (sd->mode == ELM_LIST_COMPRESS))
{
- if (sd->queue_idle_enterer)
- {
- ecore_idle_enterer_del(sd->queue_idle_enterer);
- sd->queue_idle_enterer = NULL;
- }
+ ELM_SAFE_FREE(sd->queue_idle_enterer, ecore_idle_enterer_del);
_queue_process(sd);
}
@@ -4291,19 +4272,16 @@ _decorate_item_unrealize(Elm_Gen_Item *it)
if (!it->item->deco_it_view) return;
evas_event_freeze(evas_object_evas_get(obj));
- elm_widget_stringlist_free(it->item->deco_it_texts);
- it->item->deco_it_texts = NULL;
- elm_widget_stringlist_free(it->item->deco_it_contents);
- it->item->deco_it_contents = NULL;
- elm_widget_stringlist_free(it->item->deco_it_states);
+ ELM_SAFE_FREE(it->item->deco_it_texts, elm_widget_stringlist_free);
+ ELM_SAFE_FREE(it->item->deco_it_contents, elm_widget_stringlist_free);
+ ELM_SAFE_FREE(it->item->deco_it_states, elm_widget_stringlist_free);
EINA_LIST_FREE(it->item->deco_it_content_objs, content)
evas_object_del(content);
edje_object_part_unswallow(it->item->deco_it_view, VIEW(it));
evas_object_smart_member_add(VIEW(it), sd->pan_obj);
- evas_object_del(it->item->deco_it_view);
- it->item->deco_it_view = NULL;
+ ELM_SAFE_FREE(it->item->deco_it_view, evas_object_del);
if (sd->mode_item == it)
sd->mode_item = NULL;
@@ -4429,11 +4407,7 @@ _item_unrealize_cb(Elm_Gen_Item *it)
{
evas_object_del(VIEW(it));
VIEW(it) = NULL;
- if (it->spacer)
- {
- evas_object_del(it->spacer);
- it->spacer = NULL;
- }
+ ELM_SAFE_FREE(it->spacer, evas_object_del);
}
else
{
@@ -4912,8 +4886,7 @@ _elm_genlist_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
sd->stack[i] = NULL;
}
eo_unref(sd->pan_obj);
- evas_object_del(sd->pan_obj);
- sd->pan_obj = NULL;
+ ELM_SAFE_FREE(sd->pan_obj, evas_object_del);
_item_cache_zero(sd);
if (sd->calc_job) ecore_job_del(sd->calc_job);
@@ -5041,11 +5014,7 @@ _elm_genlist_clear(Evas_Object *obj,
if (!standby) sd->generation++;
- if (sd->state)
- {
- eina_inlist_sorted_state_free(sd->state);
- sd->state = NULL;
- }
+ ELM_SAFE_FREE(sd->state, eina_inlist_sorted_state_free);
if (sd->walking > 0)
{
@@ -5075,11 +5044,7 @@ _elm_genlist_clear(Evas_Object *obj,
sd->pan_changed = EINA_TRUE;
if (!sd->queue)
{
- if (sd->calc_job)
- {
- ecore_job_del(sd->calc_job);
- sd->calc_job = NULL;
- }
+ ELM_SAFE_FREE(sd->calc_job, ecore_job_del);
_clear(sd);
}
sd->pan_x = 0;
@@ -5087,8 +5052,7 @@ _elm_genlist_clear(Evas_Object *obj,
sd->minw = 0;
sd->minh = 0;
- if (sd->alpha_bg) evas_object_del(sd->alpha_bg);
- sd->alpha_bg = NULL;
+ ELM_SAFE_FREE(sd->alpha_bg, evas_object_del);
if (sd->pan_obj)
{
@@ -6443,12 +6407,9 @@ elm_genlist_item_item_class_update(Elm_Object_Item *item,
it->itc = itc;
it->item->nocache_once = EINA_TRUE;
- elm_widget_stringlist_free(it->texts);
- it->texts = NULL;
- elm_widget_stringlist_free(it->contents);
- it->contents = NULL;
- elm_widget_stringlist_free(it->states);
- it->states = NULL;
+ ELM_SAFE_FREE(it->texts, elm_widget_stringlist_free);
+ ELM_SAFE_FREE(it->contents, elm_widget_stringlist_free);
+ ELM_SAFE_FREE(it->states, elm_widget_stringlist_free);
if (it->flipped)
{
@@ -6641,8 +6602,7 @@ elm_genlist_item_cursor_unset(Elm_Object_Item *item)
if (VIEW(it)) elm_widget_item_cursor_unset(it);
- eina_stringshare_del(it->mouse_cursor);
- it->mouse_cursor = NULL;
+ ELM_SAFE_FREE(it->mouse_cursor, eina_stringshare_del);
}
EAPI void
--
|
|
From: Daniel J. S. - E. G. <no-...@en...> - 2013-09-06 07:33:43
|
seoz pushed a commit to branch master.
commit d4ad5fba326c8aebd0fa0663c3e3937da3c8af2a
Author: Daniel Juyung Seo <seo...@gm...>
Date: Fri Sep 6 13:08:21 2013 +0900
genlist/gengrid: use spacer when item edc supports elm.swallow.pad part.
---
src/lib/elm_gengrid.c | 15 +++++++++------
src/lib/elm_genlist.c | 27 +++++++++++++++++----------
2 files changed, 26 insertions(+), 16 deletions(-)
diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c
index c902e9a..7b256f9 100644
--- a/src/lib/elm_gengrid.c
+++ b/src/lib/elm_gengrid.c
@@ -757,12 +757,15 @@ _item_realize(Elm_Gen_Item *it)
elm_widget_style_get(WIDGET(it)));
evas_object_stack_below(VIEW(it), sd->stack);
- it->spacer =
- evas_object_rectangle_add(evas_object_evas_get(WIDGET(it)));
- evas_object_color_set(it->spacer, 0, 0, 0, 0);
- elm_widget_sub_object_add(WIDGET(it), it->spacer);
- evas_object_size_hint_min_set(it->spacer, 2 * elm_config_scale_get(), 1);
- edje_object_part_swallow(VIEW(it), "elm.swallow.pad", it->spacer);
+ if (edje_object_part_exists(VIEW(it), "elm.swallow.pad"))
+ {
+ it->spacer =
+ evas_object_rectangle_add(evas_object_evas_get(WIDGET(it)));
+ evas_object_color_set(it->spacer, 0, 0, 0, 0);
+ elm_widget_sub_object_add(WIDGET(it), it->spacer);
+ evas_object_size_hint_min_set(it->spacer, 2 * elm_config_scale_get(), 1);
+ edje_object_part_swallow(VIEW(it), "elm.swallow.pad", it->spacer);
+ }
/* access */
if (_elm_config->access_mode) _access_widget_item_register(it);
diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index 269c8af..d672d11 100644
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -1572,20 +1572,27 @@ _item_realize(Elm_Gen_Item *it,
}
treesize = edje_object_data_get(VIEW(it), "treesize");
if (treesize) tsize = atoi(treesize);
- if (!it->spacer && treesize)
- {
- it->spacer =
- evas_object_rectangle_add(evas_object_evas_get(WIDGET(it)));
- evas_object_color_set(it->spacer, 0, 0, 0, 0);
- elm_widget_sub_object_add(WIDGET(it), it->spacer);
- }
- if (it->spacer)
+
+ if (edje_object_part_exists(VIEW(it), "elm.swallow.pad"))
{
+ if (!it->spacer && treesize)
+ {
+ it->spacer =
+ evas_object_rectangle_add(evas_object_evas_get(WIDGET(it)));
+ evas_object_color_set(it->spacer, 0, 0, 0, 0);
+ elm_widget_sub_object_add(WIDGET(it), it->spacer);
+ }
+
evas_object_size_hint_min_set
- (it->spacer, (it->item->expanded_depth * tsize) *
- elm_config_scale_get(), 1);
+ (it->spacer, (it->item->expanded_depth * tsize) *
+ elm_config_scale_get(), 1);
edje_object_part_swallow(VIEW(it), "elm.swallow.pad", it->spacer);
}
+ else
+ {
+ ELM_SAFE_FREE(it->spacer, evas_object_del);
+ }
+
if (!calc)
{
edje_object_signal_callback_add
--
|
|
From: Michael B. - E. G. <no-...@en...> - 2013-09-05 21:37:42
|
yoz pushed a commit to branch edje-1.7.
commit a67e5b0f6008c5d3d32553ecec554ad233f66299
Author: Michael Bouchaud <yo...@ef...>
Date: Thu Sep 5 23:37:07 2013 +0200
edje: fix recursive scale_set on edje_object
---
src/lib/edje_util.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lib/edje_util.c b/src/lib/edje_util.c
index 551be5d..35591ce 100644
--- a/src/lib/edje_util.c
+++ b/src/lib/edje_util.c
@@ -355,8 +355,8 @@ edje_object_scale_set(Evas_Object *obj, double scale)
if (!ed) return EINA_FALSE;
if (ed->scale == scale) return EINA_TRUE;
ed->scale = FROM_DOUBLE(scale);
- EINA_LIST_FOREACH(ed->subobjs, l, o)
- edje_object_scale_set(o, scale);
+ EINA_LIST_FOREACH(ed->groups, l, ged)
+ edje_object_scale_set(ged->obj, scale);
for (i = 0; i < ed->table_parts_size; ++i)
{
Edje_Real_Part *ep;
--
|
|
From: Michael B. - E. G. <no-...@en...> - 2013-09-05 21:37:27
|
yoz pushed a commit to branch master.
commit 19fa6862c5a90d80ec983ae6044b1f01f8f7d5a8
Author: Michael Bouchaud <yo...@ef...>
Date: Thu Sep 5 23:32:23 2013 +0200
edje: fix recursive scale_set on edje_object
---
src/lib/edje/edje_util.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index bbf3df3..9bffaea 100644
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -363,19 +363,16 @@ _scale_set(Eo *obj, void *_pd, va_list *list)
double scale = va_arg(*list, double);
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
if (ret) *ret = EINA_TRUE;
- Edje *ed;
+ Edje *ed, *ged;
Evas_Object *o;
Eina_List *l;
unsigned int i;
-
+
ed = _pd;
if (ed->scale == scale) return;
ed->scale = FROM_DOUBLE(scale);
- EINA_LIST_FOREACH(ed->subobjs, l, o)
- {
- const char *s = evas_object_type_get(o);
- if ((s) && (!strcmp(s, "edje"))) edje_object_scale_set(o, scale);
- }
+ EINA_LIST_FOREACH(ed->groups, l, ged)
+ edje_object_scale_set(ged->obj, scale);
for (i = 0; i < ed->table_parts_size; i++)
{
Edje_Real_Part *ep;
--
|
|
From: Rafael A. - E. G. <no-...@en...> - 2013-09-05 21:28:11
|
antognolli pushed a commit to branch ecore-1.7.
commit 8c060968e7640d6b82f08db22c51be7ebc686e5e
Author: Rafael Antognolli <raf...@in...>
Date: Fri Sep 6 18:25:23 2013 -0300
ecore/wayland: Fix screen size get when screen is rotated.
---
src/lib/ecore_wayland/ecore_wl.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/src/lib/ecore_wayland/ecore_wl.c b/src/lib/ecore_wayland/ecore_wl.c
index fb4e6be..04510de 100644
--- a/src/lib/ecore_wayland/ecore_wl.c
+++ b/src/lib/ecore_wayland/ecore_wl.c
@@ -346,10 +346,6 @@ ecore_wl_screen_size_get(int *w, int *h)
if (w) *w = _ecore_wl_disp->output->allocation.w;
if (h) *h = _ecore_wl_disp->output->allocation.h;
}
-
-
- if (w) *w = _ecore_wl_disp->output->allocation.w;
- if (h) *h = _ecore_wl_disp->output->allocation.h;
}
/* @since 1.2 */
--
|
2 messages has been excluded from this view by a project administrator.
