[EGIT] [core/efl] master 01/01: Revert edje: refactor styles_del() logic like styles_add()
tasn pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=c9232109f04efa5b38853950dc9c7cc67882b211
commit c9232109f04efa5b38853950dc9c7cc67882b211
Author: Tom Hacohen t...@stosb.com
Date: Fri Apr 17 09:26:48 2015 +0100
Revert edje: refactor styles_del() logic like styles_add()
We are in a feature freeze. No room for refactoring/new features, only
surgical (or if you must, non-surgical) fixes!
This reverts commit fa0384ed2c0f784d26f0bfbd4ff40940921768c4.
---
src/lib/edje/edje_textblock_styles.c | 63
1 file changed, 43 insertions(+), 20 deletions(-)
diff --git a/src/lib/edje/edje_textblock_styles.c
b/src/lib/edje/edje_textblock_styles.c
index b294731..c496ce2 100644
--- a/src/lib/edje/edje_textblock_styles.c
+++ b/src/lib/edje/edje_textblock_styles.c
@@ -291,7 +291,7 @@ _edje_textblock_style_member_add(Edje *ed, Edje_Style *stl)
Edje_Style_Tag *tag;
Eina_List *l;
- if (!stl) return;
+ if (!stl) return ;
EINA_LIST_FOREACH(stl-tags, l, tag)
{
@@ -300,21 +300,6 @@ _edje_textblock_style_member_add(Edje *ed, Edje_Style *stl)
}
}
-static inline void
-_edje_textblock_style_member_del(Edje *ed, Edje_Style *stl)
-{
- Edje_Style_Tag *tag;
- Eina_List *l;
-
- if (!stl) return;
-
- EINA_LIST_FOREACH(stl-tags, l, tag)
- {
-if (tag-text_class)
- _edje_text_class_member_del(ed, tag-text_class);
- }
-}
-
void
_edje_textblock_styles_add(Edje *ed, Edje_Real_Part *ep)
{
@@ -355,15 +340,53 @@ _edje_textblock_styles_del(Edje *ed, Edje_Part *pt)
desc = (Edje_Part_Description_Text *)pt-default_desc;
style = edje_string_get(desc-text.style);
- stl = _edje_textblock_style_search(ed, style);
- _edje_textblock_style_member_del(ed, stl);
+ if (style)
+ {
+Eina_List *l;
+
+EINA_LIST_FOREACH(ed-file-styles, l, stl)
+ {
+ if ((stl-name) (!strcmp(stl-name, style))) break;
+ stl = NULL;
+ }
+ }
+ if (stl)
+ {
+Edje_Style_Tag *tag;
+Eina_List *l;
+
+EINA_LIST_FOREACH(stl-tags, l, tag)
+ {
+ if (tag-text_class)
+ _edje_text_class_member_del(ed, tag-text_class);
+ }
+ }
for (i = 0; i pt-other.desc_count; ++i)
{
desc = (Edje_Part_Description_Text *)pt-other.desc[i];
style = edje_string_get(desc-text.style);
-stl = _edje_textblock_style_search(ed, style);
-_edje_textblock_style_member_del(ed, stl);
+if (style)
+ {
+ Eina_List *l;
+
+ EINA_LIST_FOREACH(ed-file-styles, l, stl)
+ {
+ if ((stl-name) (!strcmp(stl-name, style))) break;
+ stl = NULL;
+ }
+ }
+if (stl)
+ {
+ Edje_Style_Tag *tag;
+ Eina_List *l;
+
+ EINA_LIST_FOREACH(stl-tags, l, tag)
+ {
+ if (tag-text_class)
+_edje_text_class_member_del(ed, tag-text_class);
+ }
+ }
}
}
--
[EGIT] [core/elementary] master 01/01: multibuttonentry: changed longpress callback name.
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=a44926a5d3e86d3e19a51af4185826d933bdaadc
commit a44926a5d3e86d3e19a51af4185826d933bdaadc
Author: ChunEon Park her...@hermet.pe.kr
Date: Fri Apr 17 16:32:04 2015 +0900
multibuttonentry: changed longpress callback name.
contextually, the longpress triggered by item.
so the name should be item,longpressed
thank Davide Andreoli for reporting.
---
src/lib/elc_multibuttonentry.c | 6 +++---
src/lib/elc_multibuttonentry.h | 2 +-
src/lib/elm_multibuttonentry.eo | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/lib/elc_multibuttonentry.c b/src/lib/elc_multibuttonentry.c
index 2ad0e83..7e4ec4b 100644
--- a/src/lib/elc_multibuttonentry.c
+++ b/src/lib/elc_multibuttonentry.c
@@ -22,25 +22,25 @@ static const char SIG_ITEM_SELECTED[] = item,selected;
static const char SIG_ITEM_ADDED[] = item,added;
static const char SIG_ITEM_DELETED[] = item,deleted;
static const char SIG_ITEM_CLICKED[] = item,clicked;
+static const char SIG_ITEM_LONGPRESSED[] = item,longpressed;
static const char SIG_CLICKED[] = clicked;
static const char SIG_FOCUSED[] = focused;
static const char SIG_UNFOCUSED[] = unfocused;
static const char SIG_EXPANDED[] = expanded;
static const char SIG_CONTRACTED[] = contracted;
static const char SIG_EXPAND_STATE_CHANGED[] = expand,state,changed;
-static const char SIG_LONGPRESSED[] = longpressed;
static const Evas_Smart_Cb_Description _smart_callbacks[] = {
{SIG_ITEM_SELECTED, },
{SIG_ITEM_ADDED, },
{SIG_ITEM_DELETED, },
{SIG_ITEM_CLICKED, },
+ {SIG_ITEM_LONGPRESSED, },
{SIG_CLICKED, },
{SIG_FOCUSED, },
{SIG_UNFOCUSED, },
{SIG_EXPANDED, },
{SIG_CONTRACTED, },
{SIG_EXPAND_STATE_CHANGED, },
- {SIG_LONGPRESSED, },
{NULL, NULL}
};
@@ -522,7 +522,7 @@ _long_press_cb(void *data)
sd-longpress_timer = NULL;
- evas_object_smart_callback_call(WIDGET(it), SIG_LONGPRESSED, EO_OBJ(it));
+ evas_object_smart_callback_call(WIDGET(it), SIG_ITEM_LONGPRESSED,
EO_OBJ(it));
return ECORE_CALLBACK_CANCEL;
}
diff --git a/src/lib/elc_multibuttonentry.h b/src/lib/elc_multibuttonentry.h
index d0862fc..75fe7a1 100644
--- a/src/lib/elc_multibuttonentry.h
+++ b/src/lib/elc_multibuttonentry.h
@@ -30,6 +30,7 @@
* - @c item,deleted - when a multi-button entry item is deleted.
* - @c item,clicked - this is called when an item is clicked by user
* interaction. Both item,selected and item,clicked are needed.
+ * - @c item,longpressed - when multi-button entry item is pressed for a
long time.
* - @c clicked - when multi-button entry is clicked.
* - @c focused - when multi-button entry is focused.
* - @c unfocused - when multi-button entry is unfocused.
@@ -37,7 +38,6 @@
* - @c contracted - when multi-button entry is contracted.
* - @c expand,state,changed - when shrink mode state of
* multi-button entry is changed.
- * - @c longpressed - when multi-button entry is pressed for a long time.
*
* Default text parts of the multi-button entry widget that you can use are:
* @li default - A label of the multi-button entry
diff --git a/src/lib/elm_multibuttonentry.eo b/src/lib/elm_multibuttonentry.eo
index 6149ab6..18727b4 100644
--- a/src/lib/elm_multibuttonentry.eo
+++ b/src/lib/elm_multibuttonentry.eo
@@ -274,13 +274,13 @@ class Elm_Multibuttonentry (Elm_Layout)
item,added;
item,deleted;
item,clicked;
+ item,longpressed;
clicked;
focused;
unfocused;
expanded;
contracted;
expand,state,changed;
- longpressed;
}
}
--
[EGIT] [core/efl] master 01/01: evas: restore the value of do_region in jpeg loader as EINA_TRUE
eunue pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=a09fccd88b117f0172fd8940aec27ed9f8fa92da commit a09fccd88b117f0172fd8940aec27ed9f8fa92da Author: Jaeun Choi jaeun12.c...@samsung.com Date: Fri Apr 17 17:09:51 2015 +0900 evas: restore the value of do_region in jpeg loader as EINA_TRUE this was an unwanted change from 1ab8cc75c4b85d3421ebfd34d04f2f4c01e99468 @fix --- src/modules/evas/image_loaders/jpeg/evas_image_load_jpeg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/evas/image_loaders/jpeg/evas_image_load_jpeg.c b/src/modules/evas/image_loaders/jpeg/evas_image_load_jpeg.c index 98d5b67..e8374bc 100644 --- a/src/modules/evas/image_loaders/jpeg/evas_image_load_jpeg.c +++ b/src/modules/evas/image_loaders/jpeg/evas_image_load_jpeg.c @@ -110,7 +110,7 @@ Evas_Image_Load_Func evas_image_load_jpeg_func = evas_image_load_file_data_jpeg, NULL, EINA_TRUE, - EINA_FALSE + EINA_TRUE }; static int --
[EGIT] [core/efl] master 01/01: evas: more fix for include order in an attempt to fix Windows build.
cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=c006f64f791ee59ab8f41343029b6b830e6458d1 commit c006f64f791ee59ab8f41343029b6b830e6458d1 Author: Cedric BAIL ced...@osg.samsung.com Date: Fri Apr 17 11:54:11 2015 +0200 evas: more fix for include order in an attempt to fix Windows build. --- src/modules/evas/engines/gl_generic/evas_engine.c | 8 src/modules/evas/engines/software_generic/evas_engine.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/modules/evas/engines/gl_generic/evas_engine.c b/src/modules/evas/engines/gl_generic/evas_engine.c index ac3fd80..b926d2b 100644 --- a/src/modules/evas/engines/gl_generic/evas_engine.c +++ b/src/modules/evas/engines/gl_generic/evas_engine.c @@ -7,6 +7,10 @@ # include unistd.h #endif +#include software/Ector_Software.h + +#include ector_cairo_software_surface.eo.h + #ifdef HAVE_DLSYM # include dlfcn.h /* dlopen,dlclose,etc */ #else @@ -21,10 +25,6 @@ #include evas_cs2_private.h #endif -#include software/Ector_Software.h - -#include ector_cairo_software_surface.eo.h - #define EVAS_GL_NO_GL_H_CHECK 1 #include Evas_GL.h diff --git a/src/modules/evas/engines/software_generic/evas_engine.c b/src/modules/evas/engines/software_generic/evas_engine.c index af26cb6..fa41a5a 100644 --- a/src/modules/evas/engines/software_generic/evas_engine.c +++ b/src/modules/evas/engines/software_generic/evas_engine.c @@ -7,6 +7,8 @@ #include software/Ector_Software.h +#include ector_cairo_software_surface.eo.h + #ifdef HAVE_DLSYM # include dlfcn.h /* dlopen,dlclose,etc */ @@ -20,8 +22,6 @@ #include Evas_Engine_Software_Generic.h -#include ector_cairo_software_surface.eo.h - #ifdef EVAS_GL //--// // OSMesa... --
[EGIT] [core/elementary] master 01/01: elm_slider: fix theme apply
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=f80ed2f5ecadc6293150922d086aab0fcaa7da64
commit f80ed2f5ecadc6293150922d086aab0fcaa7da64
Author: Andrii Kroitor an.kroi...@samsung.com
Date: Fri Apr 17 16:52:03 2015 +0900
elm_slider: fix theme apply
Summary:
using theme of the object instead of default for subparts.
@fix
Reviewers: cedric, seoz, Hermet, raster, reutskiy.v.v
Differential Revision: https://phab.enlightenment.org/D2370
---
src/lib/elm_slider.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lib/elm_slider.c b/src/lib/elm_slider.c
index d01ea49..79a063e 100644
--- a/src/lib/elm_slider.c
+++ b/src/lib/elm_slider.c
@@ -540,7 +540,7 @@ _elm_slider_elm_widget_theme_apply(Eo *obj, Elm_Slider_Data
*sd)
{
eina_stringshare_replace(ld-group, horizontal);
if (sd-popup)
- _elm_theme_set(NULL, sd-popup,
+ _elm_theme_set(elm_object_theme_get(obj), sd-popup,
slider, horizontal/popup,
elm_widget_style_get(obj));
}
@@ -548,7 +548,7 @@ _elm_slider_elm_widget_theme_apply(Eo *obj, Elm_Slider_Data
*sd)
{
eina_stringshare_replace(ld-group, vertical);
if (sd-popup)
- _elm_theme_set(NULL, sd-popup,
+ _elm_theme_set(elm_object_theme_get(obj), sd-popup,
slider, vertical/popup,
elm_widget_style_get(obj));
}
--
[EGIT] [core/efl] master 01/03: eina: updated matrix_translate, matrix_scale and matrix_rotate implementation to do compose of the matrix in not identity matrix.
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=ee99232b36118eb4c132667f9dd8277681fa4e49
commit ee99232b36118eb4c132667f9dd8277681fa4e49
Author: Subhransu Mohanty sub.moha...@samsung.com
Date: Fri Apr 17 11:19:59 2015 +0900
eina: updated matrix_translate, matrix_scale and matrix_rotate
implementation to do compose of the matrix in not identity matrix.
This is a late change that has been discussing on the ML as we don't want
to release an API, we can't make faster.
Signed-off-by: Cedric BAIL ced...@osg.samsung.com
---
src/lib/eina/eina_matrix.c | 60 +-
1 file changed, 33 insertions(+), 27 deletions(-)
diff --git a/src/lib/eina/eina_matrix.c b/src/lib/eina/eina_matrix.c
index dc2e65c..61ee824 100644
--- a/src/lib/eina/eina_matrix.c
+++ b/src/lib/eina/eina_matrix.c
@@ -419,29 +419,33 @@ eina_matrix3_f16p16_compose(const Eina_Matrix3_F16p16 *m1,
EAPI void
eina_matrix3_translate(Eina_Matrix3 *m, double tx, double ty)
{
- MATRIX_XX(m) = 1;
- MATRIX_XY(m) = 0;
- MATRIX_XZ(m) = tx;
- MATRIX_YX(m) = 0;
- MATRIX_YY(m) = 1;
- MATRIX_YZ(m) = ty;
- MATRIX_ZX(m) = 0;
- MATRIX_ZY(m) = 0;
- MATRIX_ZZ(m) = 1;
+ Eina_Matrix3 tmp;
+ MATRIX_XX(tmp) = 1;
+ MATRIX_XY(tmp) = 0;
+ MATRIX_XZ(tmp) = tx;
+ MATRIX_YX(tmp) = 0;
+ MATRIX_YY(tmp) = 1;
+ MATRIX_YZ(tmp) = ty;
+ MATRIX_ZX(tmp) = 0;
+ MATRIX_ZY(tmp) = 0;
+ MATRIX_ZZ(tmp) = 1;
+ eina_matrix3_compose(m, tmp, m);
}
EAPI void
eina_matrix3_scale(Eina_Matrix3 *m, double sx, double sy)
{
- MATRIX_XX(m) = sx;
- MATRIX_XY(m) = 0;
- MATRIX_XZ(m) = 0;
- MATRIX_YX(m) = 0;
- MATRIX_YY(m) = sy;
- MATRIX_YZ(m) = 0;
- MATRIX_ZX(m) = 0;
- MATRIX_ZY(m) = 0;
- MATRIX_ZZ(m) = 1;
+ Eina_Matrix3 tmp;
+ MATRIX_XX(tmp) = sx;
+ MATRIX_XY(tmp) = 0;
+ MATRIX_XZ(tmp) = 0;
+ MATRIX_YX(tmp) = 0;
+ MATRIX_YY(tmp) = sy;
+ MATRIX_YZ(tmp) = 0;
+ MATRIX_ZX(tmp) = 0;
+ MATRIX_ZY(tmp) = 0;
+ MATRIX_ZZ(tmp) = 1;
+ eina_matrix3_compose(m, tmp, m);
}
EAPI void
@@ -458,15 +462,17 @@ eina_matrix3_rotate(Eina_Matrix3 *m, double rad)
s = _sin(rad);
#endif
- MATRIX_XX(m) = c;
- MATRIX_XY(m) = -s;
- MATRIX_XZ(m) = 0;
- MATRIX_YX(m) = s;
- MATRIX_YY(m) = c;
- MATRIX_YZ(m) = 0;
- MATRIX_ZX(m) = 0;
- MATRIX_ZY(m) = 0;
- MATRIX_ZZ(m) = 1;
+ Eina_Matrix3 tmp;
+ MATRIX_XX(tmp) = c;
+ MATRIX_XY(tmp) = -s;
+ MATRIX_XZ(tmp) = 0;
+ MATRIX_YX(tmp) = s;
+ MATRIX_YY(tmp) = c;
+ MATRIX_YZ(tmp) = 0;
+ MATRIX_ZX(tmp) = 0;
+ MATRIX_ZY(tmp) = 0;
+ MATRIX_ZZ(tmp) = 1;
+ eina_matrix3_compose(m, tmp, m);
}
EAPI void
--
[EGIT] [core/efl] master 03/03: evas: update Evas_Object_VG examples to use eina_matrix api correctly after change.
cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=40bdc50a12975f927fc9490d9b81f5f597c56b33 commit 40bdc50a12975f927fc9490d9b81f5f597c56b33 Author: Subhransu Mohanty sub.moha...@samsung.com Date: Fri Apr 17 11:24:47 2015 +0900 evas: update Evas_Object_VG examples to use eina_matrix api correctly after change. Signed-off-by: Cedric BAIL ced...@osg.samsung.com --- src/examples/evas/evas-vg-batman.c | 1 + src/examples/evas/evas-vg-simple.c | 1 + 2 files changed, 2 insertions(+) diff --git a/src/examples/evas/evas-vg-batman.c b/src/examples/evas/evas-vg-batman.c index 116150a..f17636d 100644 --- a/src/examples/evas/evas-vg-batman.c +++ b/src/examples/evas/evas-vg-batman.c @@ -148,6 +148,7 @@ main(void) root = evas_object_vg_root_node_get(vg); Eina_Matrix3 matrix; + eina_matrix3_identity(matrix); eina_matrix3_scale(matrix, 1.1, 1.1); evas_vg_node_transformation_set(root, matrix); diff --git a/src/examples/evas/evas-vg-simple.c b/src/examples/evas/evas-vg-simple.c index b125e3f..61fc704 100644 --- a/src/examples/evas/evas-vg-simple.c +++ b/src/examples/evas/evas-vg-simple.c @@ -437,6 +437,7 @@ vector_set(int x, int y, int w, int h) // apply some transformation double radian = 30.0 * 2 * 3.141 / 360.0; Eina_Matrix3 matrix; + eina_matrix3_identity(matrix); eina_matrix3_rotate(matrix, radian); Efl_VG *root = evas_object_vg_root_node_get(d.vg); --
[EGIT] [core/efl] master 02/03: evas: update matrix calulation as the behaviour of eina_matrix api changed.
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=451a15802add5ff08e763c04674018ae80dec466
commit 451a15802add5ff08e763c04674018ae80dec466
Author: Subhransu Mohanty sub.moha...@samsung.com
Date: Fri Apr 17 11:22:48 2015 +0900
evas: update matrix calulation as the behaviour of eina_matrix api changed.
Signed-off-by: Cedric BAIL ced...@osg.samsung.com
---
src/lib/evas/canvas/evas_vg_private.h | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/lib/evas/canvas/evas_vg_private.h
b/src/lib/evas/canvas/evas_vg_private.h
index 8f5bf4f..af4912a 100644
--- a/src/lib/evas/canvas/evas_vg_private.h
+++ b/src/lib/evas/canvas/evas_vg_private.h
@@ -59,7 +59,7 @@ _efl_vg_base_changed(Eo *obj)
#define EFL_VG_COMPUTE_MATRIX(Current, Parent, Nd) \
Eina_Matrix3 *Current = Nd-m;\
- Eina_Matrix3 _matrix_tmp, translate; \
+ Eina_Matrix3 _matrix_tmp; \
\
if (Parent) \
{ \
@@ -70,10 +70,10 @@ _efl_vg_base_changed(Eo *obj)
} \
else \
{ \
-eina_matrix3_translate(translate, -(Nd-x), -(Nd-y)); \
-eina_matrix3_compose(Parent, translate, _matrix_tmp); \
-eina_matrix3_translate(translate, (Nd-x), (Nd-y)); \
-eina_matrix3_compose(_matrix_tmp, translate, _matrix_tmp); \
+eina_matrix3_identity(_matrix_tmp);\
+eina_matrix3_translate(_matrix_tmp, -(Nd-x), -(Nd-y)); \
+eina_matrix3_compose(Parent, _matrix_tmp, _matrix_tmp); \
+eina_matrix3_translate(_matrix_tmp, (Nd-x), (Nd-y)); \
Current = _matrix_tmp; \
} \
}
--
[EGIT] [core/efl] master 01/01: edje: refactor styles_del() logic like styles_add()
sohyun pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=fa0384ed2c0f784d26f0bfbd4ff40940921768c4
commit fa0384ed2c0f784d26f0bfbd4ff40940921768c4
Author: Sohyun Kim anna1014@samsung.com
Date: Fri Apr 17 17:22:31 2015 +0900
edje: refactor styles_del() logic like styles_add()
---
src/lib/edje/edje_textblock_styles.c | 63
1 file changed, 20 insertions(+), 43 deletions(-)
diff --git a/src/lib/edje/edje_textblock_styles.c
b/src/lib/edje/edje_textblock_styles.c
index c496ce2..b294731 100644
--- a/src/lib/edje/edje_textblock_styles.c
+++ b/src/lib/edje/edje_textblock_styles.c
@@ -291,7 +291,7 @@ _edje_textblock_style_member_add(Edje *ed, Edje_Style *stl)
Edje_Style_Tag *tag;
Eina_List *l;
- if (!stl) return ;
+ if (!stl) return;
EINA_LIST_FOREACH(stl-tags, l, tag)
{
@@ -300,6 +300,21 @@ _edje_textblock_style_member_add(Edje *ed, Edje_Style *stl)
}
}
+static inline void
+_edje_textblock_style_member_del(Edje *ed, Edje_Style *stl)
+{
+ Edje_Style_Tag *tag;
+ Eina_List *l;
+
+ if (!stl) return;
+
+ EINA_LIST_FOREACH(stl-tags, l, tag)
+ {
+if (tag-text_class)
+ _edje_text_class_member_del(ed, tag-text_class);
+ }
+}
+
void
_edje_textblock_styles_add(Edje *ed, Edje_Real_Part *ep)
{
@@ -340,53 +355,15 @@ _edje_textblock_styles_del(Edje *ed, Edje_Part *pt)
desc = (Edje_Part_Description_Text *)pt-default_desc;
style = edje_string_get(desc-text.style);
- if (style)
- {
-Eina_List *l;
-
-EINA_LIST_FOREACH(ed-file-styles, l, stl)
- {
- if ((stl-name) (!strcmp(stl-name, style))) break;
- stl = NULL;
- }
- }
- if (stl)
- {
-Edje_Style_Tag *tag;
-Eina_List *l;
-
-EINA_LIST_FOREACH(stl-tags, l, tag)
- {
- if (tag-text_class)
- _edje_text_class_member_del(ed, tag-text_class);
- }
- }
+ stl = _edje_textblock_style_search(ed, style);
+ _edje_textblock_style_member_del(ed, stl);
for (i = 0; i pt-other.desc_count; ++i)
{
desc = (Edje_Part_Description_Text *)pt-other.desc[i];
style = edje_string_get(desc-text.style);
-if (style)
- {
- Eina_List *l;
-
- EINA_LIST_FOREACH(ed-file-styles, l, stl)
- {
- if ((stl-name) (!strcmp(stl-name, style))) break;
- stl = NULL;
- }
- }
-if (stl)
- {
- Edje_Style_Tag *tag;
- Eina_List *l;
-
- EINA_LIST_FOREACH(stl-tags, l, tag)
- {
- if (tag-text_class)
-_edje_text_class_member_del(ed, tag-text_class);
- }
- }
+stl = _edje_textblock_style_search(ed, style);
+_edje_textblock_style_member_del(ed, stl);
}
}
--
[EGIT] [core/elementary] elementary-1.13 01/01: elm_slider: fix theme apply
hermet pushed a commit to branch elementary-1.13.
http://git.enlightenment.org/core/elementary.git/commit/?id=1cd8898fe15eeba22233fc062b3d5f6f24d52c75
commit 1cd8898fe15eeba22233fc062b3d5f6f24d52c75
Author: Andrii Kroitor an.kroi...@samsung.com
Date: Fri Apr 17 16:52:03 2015 +0900
elm_slider: fix theme apply
Summary:
using theme of the object instead of default for subparts.
@fix
Reviewers: cedric, seoz, Hermet, raster, reutskiy.v.v
Differential Revision: https://phab.enlightenment.org/D2370
---
src/lib/elm_slider.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lib/elm_slider.c b/src/lib/elm_slider.c
index 533503a..665ca78 100644
--- a/src/lib/elm_slider.c
+++ b/src/lib/elm_slider.c
@@ -540,7 +540,7 @@ _elm_slider_elm_widget_theme_apply(Eo *obj, Elm_Slider_Data
*sd)
{
eina_stringshare_replace(ld-group, horizontal);
if (sd-popup)
- _elm_theme_set(NULL, sd-popup,
+ _elm_theme_set(elm_object_theme_get(obj), sd-popup,
slider, horizontal/popup,
elm_widget_style_get(obj));
}
@@ -548,7 +548,7 @@ _elm_slider_elm_widget_theme_apply(Eo *obj, Elm_Slider_Data
*sd)
{
eina_stringshare_replace(ld-group, vertical);
if (sd-popup)
- _elm_theme_set(NULL, sd-popup,
+ _elm_theme_set(elm_object_theme_get(obj), sd-popup,
slider, vertical/popup,
elm_widget_style_get(obj));
}
--
[EGIT] [core/efl] efl-1.13 01/01: Evas textblock: remove freed item from the line list
tasn pushed a commit to branch efl-1.13.
http://git.enlightenment.org/core/efl.git/commit/?id=20edf125951a1d41b86b0da4c51eaaf09257ab80
commit 20edf125951a1d41b86b0da4c51eaaf09257ab80
Author: Sohyun Kim anna1014@samsung.com
Date: Fri Apr 17 16:10:20 2015 +0900
Evas textblock: remove freed item from the line list
@fix
---
src/lib/evas/canvas/evas_object_textblock.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/evas/canvas/evas_object_textblock.c
b/src/lib/evas/canvas/evas_object_textblock.c
index e9db7bb..46c53db 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -842,7 +842,7 @@ _item_free(const Evas_Object *eo_obj,
Evas_Object_Textblock_Line *ln, Evas_Objec
if (ln)
{
ln-items = (Evas_Object_Textblock_Item *) eina_inlist_remove(
- EINA_INLIST_GET(ln-items), EINA_INLIST_GET(ln-items));
+ EINA_INLIST_GET(ln-items), EINA_INLIST_GET(it));
}
free(it);
}
--
[EGIT] [bindings/python/python-efl] master 01/02: Elm.Entry: Fix compile warning and doc issues
kuuko pushed a commit to branch master. http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=9ffa09d72948cb86140b250afd66404305317dda commit 9ffa09d72948cb86140b250afd66404305317dda Author: Kai Huuhko kai.huu...@gmail.com Date: Fri Apr 17 10:34:00 2015 +0300 Elm.Entry: Fix compile warning and doc issues --- efl/elementary/entry.pyx | 118 +-- 1 file changed, 94 insertions(+), 24 deletions(-) diff --git a/efl/elementary/entry.pyx b/efl/elementary/entry.pyx index cda125d..5d49562 100644 --- a/efl/elementary/entry.pyx +++ b/efl/elementary/entry.pyx @@ -804,12 +804,41 @@ cdef class EntryAnchorInfo(object): The info sent in the callback for the ``anchor,clicked`` signals emitted by entries. -:var name: The name of the anchor, as stated in its href. -:var button: The mouse button used to click on it. -:var x: Anchor geometry, relative to canvas. -:var y: Anchor geometry, relative to canvas. -:var w: Anchor geometry, relative to canvas. -:var h: Anchor geometry, relative to canvas. +.. attribute:: name + +The name of the anchor, as stated in its href. + +:type: string + +.. attribute:: button + +The mouse button used to click on it. + +:type: :class:`~efl.elementary.button.Button` + +.. attribute:: x + +Anchor geometry, relative to canvas. + +:type: int + +.. attribute:: y + +Anchor geometry, relative to canvas. + +:type: int + +.. attribute:: w + +Anchor geometry, relative to canvas. + +:type: int + +.. attribute:: h + +Anchor geometry, relative to canvas. + +:type: int cdef: @@ -834,16 +863,50 @@ cdef object _entryanchor_conv(void *addr): cdef class EntryAnchorHoverInfo(object): EntryAnchorHoverInfo(...) -The info sent in the callback for ``anchor,clicked`` signals emitted by -the entries. +The info sent in the callback for ``anchor,hover,opened`` signals emitted +by the entries. + +.. attribute:: anchor_info + +The actual anchor info. + +:type: :class:`EntryAnchorInfo` -:var anchor_info: The actual anchor info. -:var hover: The hover object to use for the popup. -:var hover_parent: Geometry of the object used as parent by the hover. -:var hover_left: Hint indicating if there's space for content on the left side of the hover. -:var hover_right: Hint indicating content fits on the right side of the hover. -:var hover_top: Hint indicating content fits on top of the hover. -:var hover_bottom: Hint indicating content fits below the hover. +.. attribute:: hover + +The hover object to use for the popup. + +:type: :class:`~efl.elementary.hover.Hover` + +.. attribute:: hover_parent + +The object used as parent by the hover. + +:type: :class:`~efl.eo.Eo` + +.. attribute:: hover_left + +Hint indicating if there's space for content on the left side of the hover. + +:type: bool + +.. attribute:: hover_right + +Hint indicating content fits on the right side of the hover. + +:type: bool + +.. attribute:: hover_top + +Hint indicating content fits on top of the hover. + +:type: bool + +.. attribute:: hover_bottom + +Hint indicating content fits below the hover. + +:type: bool cdef: @@ -855,7 +918,7 @@ cdef class EntryAnchorHoverInfo(object): @staticmethod cdef EntryAnchorHoverInfo create(Elm_Entry_Anchor_Hover_Info *addr): cdef EntryAnchorHoverInfo self = EntryAnchorHoverInfo.__new__(EntryAnchorHoverInfo) -self.anchor_info = _entryanchor_conv(addr.anchor_info) +self.anchor_info = _entryanchor_conv(void *addr.anchor_info) self.hover = object_from_instance(addr.hover) self.hover_parent = (addr.hover_parent.x, addr.hover_parent.y, addr.hover_parent.w, addr.hover_parent.h) @@ -908,9 +971,13 @@ cdef class Entry(LayoutClass): If there is styles in the user style stack, the properties in the top style of user style stack will replace the properties in current -theme. The input style is specified in format -``tag='property=value'`` (i.e. ``DEFAULT='font=Sans -font_size=60'hilight=' + font_weight=Bold'``). +theme. The input style is specified in format:: + +tag='property=value' + +i.e.:: + +DEFAULT='font=Sans font_size=60' hilight=' + font_weight=Bold' :param string style: The style user to push @@ -1075,11 +1142,14 @@ cdef class Entry(LayoutClass): functions; The former will either not work at all, or break the correct functionality. -IMPORTANT: Many functions may change (i.e delete and create a new one) -the internal textblock object. Do NOT cache the returned object, and try -
[EGIT] [bindings/python/python-efl] master 01/01: Elm.Systray: Fix compile
kuuko pushed a commit to branch master. http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=b7040059817027a2b25a2541444fa35a2241a5d3 commit b7040059817027a2b25a2541444fa35a2241a5d3 Author: Kai Huuhko kai.huu...@gmail.com Date: Fri Apr 17 14:59:11 2015 +0300 Elm.Systray: Fix compile Here's a hint to any developer at home: CTRL-S *before* you commit. --- efl/elementary/systray.pxd | 3 +++ 1 file changed, 3 insertions(+) diff --git a/efl/elementary/systray.pxd b/efl/elementary/systray.pxd index 7b634a5..f5b9f83 100644 --- a/efl/elementary/systray.pxd +++ b/efl/elementary/systray.pxd @@ -6,6 +6,9 @@ cdef extern from Elementary.h: ctypedef Eo Elm_Systray +cpdef enum: +ELM_EVENT_SYSTRAY_READY + cpdef enum _Elm_Systray_Category: ELM_SYSTRAY_CATEGORY_APP_STATUS ELM_SYSTRAY_CATEGORY_COMMUNICATIONS --
[EGIT] [core/efl] master 01/02: ecore_file: fix crashing test of ecore_file
cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=1b8aaa9e4e597ec23b7da27773071956d44b83cf commit 1b8aaa9e4e597ec23b7da27773071956d44b83cf Author: kabeer khan kabeer.k...@samsung.com Date: Fri Apr 17 12:05:18 2015 +0200 ecore_file: fix crashing test of ecore_file Summary: Signed-off-by: kabeer khan kabeer.k...@samsung.com Reviewers: cedric Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D2372 Signed-off-by: Cedric BAIL ced...@osg.samsung.com --- src/tests/ecore/ecore_test_ecore_file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tests/ecore/ecore_test_ecore_file.c b/src/tests/ecore/ecore_test_ecore_file.c index 81e105a..c7acd9f 100644 --- a/src/tests/ecore/ecore_test_ecore_file.c +++ b/src/tests/ecore/ecore_test_ecore_file.c @@ -390,11 +390,11 @@ START_TEST(ecore_test_ecore_file_download) fail_if(res != EINA_TRUE); res = ecore_file_download(xxyyzz, dest_name, completion_cb, - progress_cb, job, NULL); + progress_cb, NULL, job); fail_if(res != EINA_FALSE); res = ecore_file_download(download_url, dest_name, err_completion_cb, - progress_cb, job, NULL); + progress_cb, NULL, job); fail_if(res != EINA_TRUE); fail_if(!job); ecore_file_download_abort(job); --
[EGIT] [core/efl] master 02/02: ecore_file: less confusing documentation of ecore_file_download API
cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=963fe509ca1acc5bef1585bb65e8264a5036697a commit 963fe509ca1acc5bef1585bb65e8264a5036697a Author: kabeer khan kabeer.k...@samsung.com Date: Fri Apr 17 12:06:43 2015 +0200 ecore_file: less confusing documentation of ecore_file_download API Summary: Signed-off-by: kabeer khan kabeer.k...@samsung.com Reviewers: cedric Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D2373 Signed-off-by: Cedric BAIL ced...@osg.samsung.com --- src/lib/ecore_file/ecore_file_download.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/ecore_file/ecore_file_download.c b/src/lib/ecore_file/ecore_file_download.c index dffef8f..83c5884 100644 --- a/src/lib/ecore_file/ecore_file_download.c +++ b/src/lib/ecore_file/ecore_file_download.c @@ -177,10 +177,10 @@ _ecore_file_download(const char *url, * percentage of the downloaded file. Return 0 from this callback, if provided, * to continue the operation or anything else to abort the download. The only * operations that can be aborted are those with protocol 'http' or 'ftp'. In - * that case @p job_ret can be filled. It can be used with - * ecore_file_download_abort() or ecore_file_download_abort_all() to - * respectively abort one or all download operations. This function returns - * @c EINA_TRUE if the download starts, @c EINA_FALSE otherwise. + * that case @p job_ret can be passed to ecore_file_download_abort() to abort + * that download job. Similarly ecore_file_download_abort_all() can be used to + * abort all download operations. This function returns @c EINA_TRUE if the + * download starts, @c EINA_FALSE otherwise. */ EAPI Eina_Bool ecore_file_download(const char *url, --
[EGIT] [core/enlightenment] master 01/01: remove support for wayland builds on 32bit
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=8f4a018e1801a1a4be124178db9cef5fd49c40d4
commit 8f4a018e1801a1a4be124178db9cef5fd49c40d4
Author: Mike Blumenkrantz zm...@osg.samsung.com
Date: Fri Apr 17 14:12:27 2015 -0400
remove support for wayland builds on 32bit
this doesn't work for some reason and there are no plans to fix it anytime
soon.
ref some infinite number of tickets
---
configure.ac | 5 +
1 file changed, 5 insertions(+)
diff --git a/configure.ac b/configure.ac
index c29d9ba..6cbbeea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -443,6 +443,7 @@ test -n $dbus_mount
AC_DEFINE_UNQUOTED([HAVE_UDISKS_MOUNT], [1], [enable Ud
AM_CONDITIONAL([HAVE_UDISKS_MOUNT], [test -n $dbus_mount])
AM_CONDITIONAL([HAVE_EEZE_MOUNT], [test -n $eeze_mount])
+AC_CHECK_SIZEOF([void*])
# verify wayland-only early to adapt dependencies
have_wayland_only=no
@@ -841,6 +842,10 @@ if test x${have_wayland} = xyes; then
fi
fi
+if test x${have_wayland} = xyes test $ac_cv_sizeof_voidp -ne 8 ; then
+ AC_MSG_ERROR([wayland support is only available for 64bit architectures])
+fi
+
AM_CONDITIONAL([HAVE_WAYLAND], [test x${have_wayland} = xyes])
AM_CONDITIONAL([HAVE_WAYLAND_ONLY], [test x${have_wayland_only} = xyes])
AM_CONDITIONAL([HAVE_WAYLAND_CLIENTS], [test x${have_wayland_clients} =
xyes])
--
