Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_container.c ewl_widget.c ewl_widget.h
Log Message:
- remove the macro and use the proper functions to get/set layer information
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_container.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -3 -r1.56 -r1.57
--- ewl_container.c 12 Feb 2007 13:16:05 -0000 1.56
+++ ewl_container.c 3 Mar 2007 00:22:54 -0000 1.57
@@ -713,7 +713,8 @@
found = child;
break;
}
- if ((!found || LAYER(found) <= LAYER(child)))
+ if ((!found || ewl_widget_layer_priority_get(found) <=
+
ewl_widget_layer_priority_get(child)))
found = child;
}
}
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_widget.c,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -3 -r1.126 -r1.127
--- ewl_widget.c 12 Feb 2007 13:16:05 -0000 1.126
+++ ewl_widget.c 3 Mar 2007 00:22:54 -0000 1.127
@@ -1175,7 +1175,7 @@
DCHECK_PARAM_PTR("w", w);
DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
- LAYER(w) = layer;
+ w->layer = layer;
if (REALIZED(w))
ewl_widget_layer_update(w);
@@ -1195,7 +1195,7 @@
DCHECK_PARAM_PTR_RET("w", w, 0);
DCHECK_TYPE_RET("w", w, EWL_WIDGET_TYPE, 0);
- DRETURN_INT(LAYER(w), DLEVEL_STABLE);
+ DRETURN_INT(w->layer, DLEVEL_STABLE);
}
/**
@@ -2064,6 +2064,7 @@
ewl_widget_layer_update(Ewl_Widget *w)
{
Ewl_Widget *p;
+ int layer;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
@@ -2078,10 +2079,11 @@
evas_object_raise(w->smart_object);
DRETURN(DLEVEL_STABLE);
}
-
- if (LAYER(w) == 0)
+
+ layer = ewl_widget_layer_priority_get(w);
+ if (layer == 0)
evas_object_stack_above(w->smart_object, p->fx_clip_box);
- else if (LAYER(w) > 0) {
+ else if (layer > 0) {
Evas_Object *above;
if (!(above = ewl_widget_layer_neighbor_find_above(w)))
@@ -2125,7 +2127,8 @@
/* ignore the widget itself */
if (w == found)
continue;
- if (LAYER(w) <= LAYER(found))
+ if (ewl_widget_layer_priority_get(w) <=
+ ewl_widget_layer_priority_get(found))
break;
ol = o;
}
@@ -2160,7 +2163,8 @@
/* ignore the widget itself */
if (w == found)
continue;
- if (LAYER(w) >= LAYER(found))
+ if (ewl_widget_layer_priority_get(w) >=
+ ewl_widget_layer_priority_get(found))
break;
ol = o;
}
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_widget.h,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -3 -r1.57 -r1.58
--- ewl_widget.h 2 Mar 2007 04:39:47 -0000 1.57
+++ ewl_widget.h 3 Mar 2007 00:22:54 -0000 1.58
@@ -247,12 +247,6 @@
Ewl_Widget *ewl_widget_drag_candidate_get(void);
void ewl_widget_dnd_reset(void);
-/**
- * @def LAYER(w)
- * Used to retrieve the layer of a widget.
- */
-#define LAYER(w) (EWL_WIDGET(w)->layer)
-
/*
* Internally used callbacks, override at your own risk.
*/
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
