Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/engines/evas
Modified Files:
ewl_engine_evas.c
Log Message:
- tabs are a tricky beast. looks like I missed some.
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/engines/evas/ewl_engine_evas.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- ewl_engine_evas.c 6 May 2008 20:20:36 -0000 1.22
+++ ewl_engine_evas.c 7 May 2008 13:38:21 -0000 1.23
@@ -14,7 +14,7 @@
static void ee_shutdown(Ewl_Engine *engine);
static void ee_canvas_output_set(Ewl_Embed *embed, int x, int y, int width,
- int height);
+ int height);
static void ee_canvas_render(Ewl_Embed *embed);
static void ee_canvas_freeze(Ewl_Embed *embed);
static void ee_canvas_thaw(Ewl_Embed *embed);
@@ -29,41 +29,41 @@
static void *canvas_funcs[EWL_ENGINE_CANVAS_MAX] =
{
- NULL,
- ee_canvas_output_set,
- ee_canvas_render,
- ee_canvas_freeze,
- ee_canvas_thaw,
- ee_canvas_damage_add
+ NULL,
+ ee_canvas_output_set,
+ ee_canvas_render,
+ ee_canvas_freeze,
+ ee_canvas_thaw,
+ ee_canvas_damage_add
};
static void *theme_funcs[EWL_ENGINE_THEME_MAX] =
{
- /* FIXME: disable these calls for now. They stop ejde reloading
- * the theme object correctly after it was obscured, in some
- * cases. If these problems are solved, please activate them
- * again. For more information see bug #3, #116 and #456*/
- NULL, //edje_freeze,
- NULL, //edje_thaw,
- edje_file_data_get,
- ee_canvas_smart_new,
- NULL,
- evas_object_del,
- evas_object_move,
- evas_object_resize,
- evas_object_show,
- evas_object_hide,
- evas_object_clip_set,
- evas_object_clip_unset,
- NULL, NULL,
- NULL, NULL,
- NULL, NULL, NULL,
- ee_canvas_clip_add,
- evas_object_del,
- evas_object_clipees_get,
- evas_object_color_set,
- ee_canvas_stack_add,
- ee_canvas_layer_update,
+ /* FIXME: disable these calls for now. They stop ejde reloading
+ * the theme object correctly after it was obscured, in some
+ * cases. If these problems are solved, please activate them
+ * again. For more information see bug #3, #116 and #456*/
+ NULL, //edje_freeze,
+ NULL, //edje_thaw,
+ edje_file_data_get,
+ ee_canvas_smart_new,
+ NULL,
+ evas_object_del,
+ evas_object_move,
+ evas_object_resize,
+ evas_object_show,
+ evas_object_hide,
+ evas_object_clip_set,
+ evas_object_clip_unset,
+ NULL, NULL,
+ NULL, NULL,
+ NULL, NULL, NULL,
+ ee_canvas_clip_add,
+ evas_object_del,
+ evas_object_clipees_get,
+ evas_object_color_set,
+ ee_canvas_stack_add,
+ ee_canvas_layer_update,
};
Ecore_DList *
@@ -83,12 +83,12 @@
engine = NEW(Ewl_Engine_Evas, 1);
if (!engine)
- DRETURN_PTR(NULL, DLEVEL_STABLE);
+ DRETURN_PTR(NULL, DLEVEL_STABLE);
if (!ee_init(EWL_ENGINE(engine)))
{
- FREE(engine);
- DRETURN_PTR(NULL, DLEVEL_STABLE);
+ FREE(engine);
+ DRETURN_PTR(NULL, DLEVEL_STABLE);
}
DRETURN_PTR(EWL_ENGINE(engine), DLEVEL_STABLE);
@@ -137,7 +137,7 @@
DCHECK_PARAM_PTR(embed);
if (embed->canvas)
- evas_render(embed->canvas);
+ evas_render(embed->canvas);
DRETURN(DLEVEL_STABLE);
}
@@ -149,7 +149,7 @@
DCHECK_PARAM_PTR(embed);
if (embed->canvas && evas_event_freeze_get(embed->canvas) < 1) {
- evas_event_freeze(embed->canvas);
+ evas_event_freeze(embed->canvas);
}
DRETURN(DLEVEL_STABLE);
@@ -162,7 +162,7 @@
DCHECK_PARAM_PTR(embed);
if (embed->canvas && evas_event_freeze_get(embed->canvas) > 0)
- evas_event_thaw(embed->canvas);
+ evas_event_thaw(embed->canvas);
DRETURN(DLEVEL_STABLE);
}
@@ -174,7 +174,7 @@
DCHECK_PARAM_PTR(embed);
if (embed->canvas)
- evas_damage_rectangle_add(embed->canvas, x, y, w, h);
+ evas_damage_rectangle_add(embed->canvas, x, y, w, h);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -188,11 +188,11 @@
DCHECK_PARAM_PTR_RET(embed, NULL);
if (!widget_smart) {
- widget_smart = evas_smart_new("Ewl Widget Smart Object",
- NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL,
- NULL, NULL, NULL);
+ widget_smart = evas_smart_new("Ewl Widget Smart Object",
+ NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL);
}
smart_object = evas_object_smart_add(embed->canvas, widget_smart);
@@ -209,7 +209,7 @@
obj = evas_object_rectangle_add(embed->canvas);
if (obj)
- evas_object_pass_events_set(obj, TRUE);
+ evas_object_pass_events_set(obj, TRUE);
DRETURN_PTR(obj, DLEVEL_STABLE);
}
@@ -224,28 +224,28 @@
DCHECK_TYPE(w, EWL_WIDGET_TYPE);
if (w->parent && !REVEALED(w->parent))
- DRETURN(DLEVEL_STABLE);
+ DRETURN(DLEVEL_STABLE);
if (w->parent && !w->toplayered)
- smart_parent = w->parent->smart_object;
+ smart_parent = w->parent->smart_object;
else {
- Ewl_Embed *emb;
+ Ewl_Embed *emb;
- emb = ewl_embed_widget_find(w);
- smart_parent = emb->smart;
+ emb = ewl_embed_widget_find(w);
+ smart_parent = emb->smart;
}
evas_object_smart_member_add(w->smart_object, smart_parent);
if (w->theme_object)
- evas_object_smart_member_add(w->theme_object, w->smart_object);
+ evas_object_smart_member_add(w->theme_object, w->smart_object);
if (w->fx_clip_box)
- evas_object_smart_member_add(w->fx_clip_box, w->smart_object);
+ evas_object_smart_member_add(w->fx_clip_box, w->smart_object);
if (w->theme_object && w->fx_clip_box)
- evas_object_stack_below(w->theme_object, w->fx_clip_box);
+ evas_object_stack_below(w->theme_object, w->fx_clip_box);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -261,33 +261,33 @@
DCHECK_TYPE(w, EWL_WIDGET_TYPE);
if (!(p = w->parent))
- DRETURN(DLEVEL_STABLE);
+ DRETURN(DLEVEL_STABLE);
/* check first if the widget should be on the top */
if (w->toplayered)
{
- evas_object_raise(w->smart_object);
- DRETURN(DLEVEL_STABLE);
+ evas_object_raise(w->smart_object);
+ DRETURN(DLEVEL_STABLE);
}
layer = ewl_widget_layer_priority_get(w);
if (layer == 0)
- evas_object_stack_above(w->smart_object, p->fx_clip_box);
+ evas_object_stack_above(w->smart_object, p->fx_clip_box);
else if (layer > 0) {
- Evas_Object *above;
+ Evas_Object *above;
- if (!(above = ewl_widget_layer_neighbor_find_above(w)))
- DWARNING("No object above.");
+ if (!(above = ewl_widget_layer_neighbor_find_above(w)))
+ DWARNING("No object above.");
- evas_object_stack_above(w->smart_object, above);
+ evas_object_stack_above(w->smart_object, above);
}
else {
- Evas_Object *below;
+ Evas_Object *below;
- if (!(below = ewl_widget_layer_neighbor_find_below(w)))
- DWARNING("No object below.");
+ if (!(below = ewl_widget_layer_neighbor_find_below(w)))
+ DWARNING("No object below.");
- evas_object_stack_below(w->smart_object, below);
+ evas_object_stack_below(w->smart_object, below);
}
DLEAVE_FUNCTION(DLEVEL_STABLE);
@@ -303,27 +303,27 @@
DCHECK_TYPE_RET(w, EWL_WIDGET_TYPE, NULL);
if (!w->parent)
- DRETURN_PTR(NULL, DLEVEL_STABLE);
+ DRETURN_PTR(NULL, DLEVEL_STABLE);
o = ol = w->parent->fx_clip_box;
while ((o = evas_object_above_get(o)))
{
- Ewl_Widget *found;
+ Ewl_Widget *found;
- found = evas_object_data_get(o, "EWL");
- /*
- * Perhaps it is a cached object so no reason to stop iterating
- */
- if (found) {
- /* ignore the widget itself */
- if (w == found)
- continue;
- if (ewl_widget_layer_priority_get(w) <=
- ewl_widget_layer_priority_get(found))
- break;
- ol = o;
- }
+ found = evas_object_data_get(o, "EWL");
+ /*
+ * Perhaps it is a cached object so no reason to stop iterating
+ */
+ if (found) {
+ /* ignore the widget itself */
+ if (w == found)
+ continue;
+ if (ewl_widget_layer_priority_get(w) <=
+ ewl_widget_layer_priority_get(found))
+ break;
+ ol = o;
+ }
}
DRETURN_PTR(ol, DLEVEL_STABLE);
@@ -339,27 +339,27 @@
DCHECK_TYPE_RET(w, EWL_WIDGET_TYPE, NULL);
if (!w->parent)
- DRETURN_PTR(NULL, DLEVEL_STABLE);
+ DRETURN_PTR(NULL, DLEVEL_STABLE);
o = ol = w->parent->fx_clip_box;
while ((o = evas_object_below_get(o)))
{
- Ewl_Widget *found;
+ Ewl_Widget *found;
- found = evas_object_data_get(o, "EWL");
- /*
- * Perhaps it is a cached object so no reason to stop iterating
- */
- if (found) {
- /* ignore the widget itself */
- if (w == found)
- continue;
- if (ewl_widget_layer_priority_get(w) >=
- ewl_widget_layer_priority_get(found))
- break;
- ol = o;
- }
+ found = evas_object_data_get(o, "EWL");
+ /*
+ * Perhaps it is a cached object so no reason to stop iterating
+ */
+ if (found) {
+ /* ignore the widget itself */
+ if (w == found)
+ continue;
+ if (ewl_widget_layer_priority_get(w) >=
+ ewl_widget_layer_priority_get(found))
+ break;
+ ol = o;
+ }
}
DRETURN_PTR(ol, DLEVEL_STABLE);
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
