[EGIT] [editors/geany-configs] master 01/01: Small improvements for the geany edc mode
davemds pushed a commit to branch master.
http://git.enlightenment.org/editors/geany-configs.git/commit/?id=e2cb31ce1010aa3ed7cbc193a6b98dd69cbd93d6
commit e2cb31ce1010aa3ed7cbc193a6b98dd69cbd93d6
Author: Dave Andreoli d...@gurumeditation.it
Date: Sat May 9 14:29:47 2015 +0200
Small improvements for the geany edc mode
---
filedefs/filetypes.Edje.conf | 4 ++--
snippets.conf| 8
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/filedefs/filetypes.Edje.conf b/filedefs/filetypes.Edje.conf
index d0dc742..88d0f5c 100644
--- a/filedefs/filetypes.Edje.conf
+++ b/filedefs/filetypes.Edje.conf
@@ -18,11 +18,11 @@
[keywords]
# primary will draw in BLU (with default colors) and have precedence on
secondary
# used for edc properties, like name: or state:
-primary=item file font tag image base_scale tone inherit_only broadcast_signal
target_groups script_only script_recursion base external name type state min
max normal color color2 color3 clip_to signal source action transition target
scale align relative offset inherit to border aspect aspect_preference align
effect size mouse_events repeat_events ellipsis fixed layout padding visible
to_x to_y middle smooth x y confine alias color_class border_scale_by
border_scale after entry_mode sele [...]
+primary=item file font tag image base_scale tone inherit_only broadcast_signal
target_groups script_only script_recursion base external name type state min
max normal color color2 color3 clip_to signal source action transition target
targets scale align relative offset inherit to border aspect aspect_preference
align effect size mouse_events repeat_events ellipsis fixed layout padding
visible to_x to_y middle smooth x y confine alias color_class border_scale_by
border_scale after entry_m [...]
# secondary will draw in RED (with default colors)
# used for edc blocks, like parts{} or part{}
-secondary=data images set fonts styles style sounds sample vibrations
externals collections group script parts part description programs program rel1
rel2 box text fill dragable limits items table physics movement_freedom faces
face map rotation params link world
+secondary=RECT TEXT IMAGE SWALLOW TEXTBLOCK GROUP BOX TABLE EXTERNAL PROXY
SPACER data images set fonts styles style sounds sample vibrations externals
collections group script parts part description programs program rel1 rel2 box
text fill dragable limits items table physics movement_freedom faces face map
rotation params link world sequence
[lexer_properties]
diff --git a/snippets.conf b/snippets.conf
index f85689a..aa02108 100644
--- a/snippets.conf
+++ b/snippets.conf
@@ -26,9 +26,9 @@ text=text {\n\ttext: ;\n\tfont: %cursor%;\n\tsize:
12;\n\ttext_class: ;\n\
script=script {\n\t%cursor%\n}
# parts
-part=part { name: %cursor%;\n\ttype: RECT;\n\tdescription { state: default
0.0;\n\t\t\n\t}\n}
-RECT=part { name: %cursor%;\n\ttype: RECT;\n\tdescription { state: default
0.0;\n\t}\n}
-IMAGE=part { name: %cursor%;\n\tdescription { state: default
0.0;\n\t\timage {\n\t\t\tnormal: ;\n\t\t\tborder: left right top
bottom;\n\t\t}\n\t}\n}
+part=part { name: %cursor%; type: RECT;\n\tdescription { state: default
0.0;\n\t\t\n\t}\n}
+RECT=part { name: %cursor%; type: RECT;\n\tdescription { state: default
0.0;\n\t}\n}
+IMAGE=part { name: %cursor%; type: IMAGE;\n\tdescription { state: default
0.0;\n\t\timage {\n\t\t\tnormal: ;\n\t\t\tborder: left right top
bottom;\n\t\t}\n\t}\n}
# colors
color_class=color_class {\n\tname: %cursor%;\n\tcolor: 200 200 200
255;\n\tcolor2: 200 200 200 255;\n\tcolor3: 200 200 200 255; \n}
@@ -94,7 +94,7 @@ physics_body=%cursor%RIGID_BOX;
insert_before=insert_before: %cursor%;
insert_after=insert_after: %cursor%;
mouse_events=mouse_events: 0;\n
-repeat_events=repeat_events: 0;\n
+repeat_events=repeat_events: 1;\n
scale=scale: 1;\n
ignore_flags=ignore_flags: ON_HOLD;\n
pointer_mode=pointer_mode: NOGRAB;\n
--
[EGIT] [core/efl] master 01/02: evas/canvas : Call correct engine function for setting clip color
hermet pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=d82c0ae1bfb4a0e15858dc5f2b52d4b103a0d32b commit d82c0ae1bfb4a0e15858dc5f2b52d4b103a0d32b Author: Subhransu Mohanty sub.moha...@samsung.com Date: Sat May 9 18:44:31 2015 +0900 evas/canvas : Call correct engine function for setting clip color --- src/lib/evas/canvas/evas_object_vg.c | 16 ++-- 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/lib/evas/canvas/evas_object_vg.c b/src/lib/evas/canvas/evas_object_vg.c index cca772a..731eec6 100644 --- a/src/lib/evas/canvas/evas_object_vg.c +++ b/src/lib/evas/canvas/evas_object_vg.c @@ -165,14 +165,18 @@ evas_object_vg_render(Evas_Object *eo_obj EINA_UNUSED, /* render object to surface with context, and offxet by x,y */ obj-layer-evas-engine.func-context_color_set(output, context, -obj-cur-cache.clip.r, -obj-cur-cache.clip.g, -obj-cur-cache.clip.b, -obj-cur-cache.clip.a); +255, +255, +255, +255); + obj-layer-evas-engine.func-context_multiplier_set(output, + context, + obj-cur-cache.clip.r, + obj-cur-cache.clip.g, + obj-cur-cache.clip.b, + obj-cur-cache.clip.a); obj-layer-evas-engine.func-context_anti_alias_set(output, context, obj-cur-anti_alias); - obj-layer-evas-engine.func-context_multiplier_unset(output, - context); obj-layer-evas-engine.func-context_render_op_set(output, context, obj-cur-render_op); obj-layer-evas-engine.func-ector_begin(output, context, surface, --
[EGIT] [core/efl] master 02/02: evas/engine: Fix the ector drawing for gl backend
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=1ce417eb8b928053cd21b0fe829923745821aff8
commit 1ce417eb8b928053cd21b0fe829923745821aff8
Author: Subhransu Mohanty sub.moha...@samsung.com
Date: Sat May 9 18:46:42 2015 +0900
evas/engine: Fix the ector drawing for gl backend
---
src/modules/evas/engines/gl_generic/evas_engine.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/modules/evas/engines/gl_generic/evas_engine.c
b/src/modules/evas/engines/gl_generic/evas_engine.c
index cd08995..04f26a1 100644
--- a/src/modules/evas/engines/gl_generic/evas_engine.c
+++ b/src/modules/evas/engines/gl_generic/evas_engine.c
@@ -2388,6 +2388,7 @@ eng_ector_begin(void *data EINA_UNUSED, void *context
EINA_UNUSED, void *surface
w = gl_context-w; h = gl_context-h;
software_buffer = realloc(software_buffer, sizeof (unsigned int) * w * h);
+ memset(software_buffer, 0, sizeof (unsigned int) * w * h);
if (use_cairo)
{
eo_do(_software_ector,
--
[EGIT] [bindings/python/python-efl] master 01/01: Elm: Replace FIXME in init about argc/v with description
kuuko pushed a commit to branch master. http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=3dd36bd7706090c148729531332a3441e4a8b0cd commit 3dd36bd7706090c148729531332a3441e4a8b0cd Author: Kai Huuhko kai.huu...@gmail.com Date: Sat May 9 20:54:44 2015 +0300 Elm: Replace FIXME in init about argc/v with description --- efl/elementary/__init__.pyx | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/efl/elementary/__init__.pyx b/efl/elementary/__init__.pyx index 9a2a602..2c0ca00 100644 --- a/efl/elementary/__init__.pyx +++ b/efl/elementary/__init__.pyx @@ -110,7 +110,10 @@ def init(): EINA_LOG_DOM_INFO(PY_EFL_ELM_LOG_DOMAIN, Initializing efl.elementary, NULL) -# FIXME: Why are we passing the cl args to elm_init here? +# argc and argv are currently used by EFL to support app restart +# and binary relocation. These are probably not useful to us but we +# pass the information here regardless because useful functionality +# may be added in the future. cdef: int argc = 0, i, arg_len --
