Enlightenment CVS committal
Author : pfritz
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_base.h ewl_embed.c ewl_embed.h ewl_overlay.c ewl_popup.c
ewl_scrollpane.c
Log Message:
the embed now inherits from the cell and not from the overlay
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_base.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ewl_base.h 16 Nov 2007 18:50:57 -0000 1.3
+++ ewl_base.h 5 Dec 2007 16:44:53 -0000 1.4
@@ -26,7 +26,7 @@
#include <ewl_misc.h>
#include <ewl_config.h>
#include <ewl_theme.h>
-#include <ewl_overlay.h>
+#include <ewl_cell.h>
#include <ewl_embed.h>
#include <ewl_window.h>
#include <ewl_engines.h>
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_embed.c,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -3 -r1.131 -r1.132
--- ewl_embed.c 12 Nov 2007 22:42:22 -0000 1.131
+++ ewl_embed.c 5 Dec 2007 16:44:53 -0000 1.132
@@ -88,7 +88,7 @@
/*
* Initialize the fields of the inherited container class
*/
- if (!ewl_overlay_init(EWL_OVERLAY(w)))
+ if (!ewl_cell_init(EWL_CELL(w)))
DRETURN_INT(FALSE, DLEVEL_STABLE);
ewl_widget_appearance_set(EWL_WIDGET(w), EWL_EMBED_TYPE);
@@ -111,8 +111,6 @@
ewl_embed_cb_configure, NULL);
ewl_callback_prepend(EWL_WIDGET(w), EWL_CALLBACK_FOCUS_OUT,
ewl_embed_cb_focus_out, NULL);
- ewl_callback_del(EWL_WIDGET(w), EWL_CALLBACK_CONFIGURE,
- ewl_overlay_cb_configure);
ecore_list_append(ewl_embed_list, w);
@@ -1918,7 +1916,6 @@
void *user_data __UNUSED__)
{
Ewl_Embed *emb;
- Ewl_Object *child;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR(w);
@@ -1930,25 +1927,6 @@
(Evas_Coord)(CURRENT_Y(w)));
evas_object_resize(emb->ev_clip, (Evas_Coord)(CURRENT_W(w)),
(Evas_Coord)(CURRENT_H(w)));
- }
-
- /*
- * Configure each of the child widgets.
- */
- ecore_dlist_first_goto(EWL_CONTAINER(w)->children);
- while ((child = ecore_dlist_next(EWL_CONTAINER(w)->children))) {
- int size;
-
- size = ewl_object_preferred_w_get(EWL_OBJECT(child));
- if (size > PREFERRED_W(w))
- ewl_object_preferred_inner_w_set(EWL_OBJECT(w), size);
-
- size = ewl_object_preferred_h_get(EWL_OBJECT(child));
- if (size > PREFERRED_H(w))
- ewl_object_preferred_inner_h_set(EWL_OBJECT(w), size);
-
- ewl_object_place(child, CURRENT_X(w), CURRENT_Y(w),
- CURRENT_W(w), CURRENT_H(w));
}
DLEAVE_FUNCTION(DLEVEL_STABLE);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_embed.h,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -3 -r1.47 -r1.48
--- ewl_embed.h 11 Nov 2007 06:07:46 -0000 1.47
+++ ewl_embed.h 5 Dec 2007 16:44:53 -0000 1.48
@@ -61,7 +61,7 @@
*/
struct Ewl_Embed
{
- Ewl_Overlay overlay; /**< Inherits from the Ewl_Overlay class */
+ Ewl_Cell cell; /**< Inherits from the Ewl_Overlay class */
const char *engine_name; /**< Name of current engine used */
void *engine; /**< The display engine */
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_overlay.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- ewl_overlay.c 12 Nov 2007 22:42:22 -0000 1.23
+++ ewl_overlay.c 5 Dec 2007 16:44:53 -0000 1.24
@@ -1,5 +1,6 @@
/* vim: set sw=8 ts=8 sts=8 noexpandtab: */
#include "ewl_base.h"
+#include "ewl_overlay.h"
#include "ewl_macros.h"
#include "ewl_private.h"
#include "ewl_debug.h"
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_popup.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- ewl_popup.c 12 Nov 2007 22:42:22 -0000 1.19
+++ ewl_popup.c 5 Dec 2007 16:44:53 -0000 1.20
@@ -565,7 +565,7 @@
DCHECK_PARAM_PTR(c);
DCHECK_TYPE(c, EWL_CONTAINER_TYPE);
- ewl_overlay_cb_child_show(c, w);
+ ewl_cell_cb_child_show(c, w);
ewl_popup_position_check(EWL_POPUP(c));
DLEAVE_FUNCTION(DLEVEL_STABLE);
@@ -587,7 +587,7 @@
DCHECK_PARAM_PTR(c);
DCHECK_TYPE(c, EWL_POPUP_TYPE);
- ewl_overlay_cb_child_resize(c, w, size, o);
+ ewl_cell_cb_child_resize(c, w, size, o);
ewl_popup_position_check(EWL_POPUP(c));
DLEAVE_FUNCTION(DLEVEL_STABLE);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_scrollpane.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- ewl_scrollpane.c 13 Nov 2007 06:03:16 -0000 1.28
+++ ewl_scrollpane.c 5 Dec 2007 16:44:53 -0000 1.29
@@ -1,5 +1,6 @@
/* vim: set sw=8 ts=8 sts=8 noexpandtab: */
#include "ewl_base.h"
+#include "ewl_overlay.h"
#include "ewl_scrollpane.h"
#include "ewl_box.h"
#include "ewl_scrollbar.h"
-------------------------------------------------------------------------
SF.Net email is sponsored by: The Future of Linux Business White Paper
from Novell. From the desktop to the data center, Linux is going
mainstream. Let it simplify your IT future.
http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
