Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
Makefile.am e_box.c e_includes.h e_table.c e_table.h
Added Files:
e_layout.c e_layout.h
Log Message:
layout smart object - shoudl work like the table one... but i haven't tested
yet.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/Makefile.am,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- Makefile.am 13 Mar 2005 04:01:00 -0000 1.16
+++ Makefile.am 13 Mar 2005 08:21:01 -0000 1.17
@@ -42,7 +42,8 @@
e_gadman.h \
e_signals.h \
e_xinerama.h \
-e_table.h
+e_table.h \
+e_layout.h
enlightenment_SOURCES = \
@@ -79,6 +80,7 @@
e_signals.c \
e_xinerama.c \
e_table.c \
+e_layout.c \
$(ENLIGHTENMENTHEADERS)
enlightenment_LDFLAGS = -export-dynamic @e_libs@ @dlopen_libs@
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_box.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_box.c 13 Mar 2005 04:01:00 -0000 1.5
+++ e_box.c 13 Mar 2005 08:21:01 -0000 1.6
@@ -337,6 +337,7 @@
evas_object_data_set(obj, "e_box_data", bi);
evas_object_event_callback_add(obj, EVAS_CALLBACK_FREE,
_e_box_smart_item_del_hook, NULL);
+ evas_object_stack_below(obj, sd->obj);
if (!evas_object_visible_get(sd->clip))
evas_object_show(sd->clip);
return bi;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_includes.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_includes.h 13 Mar 2005 04:01:00 -0000 1.7
+++ e_includes.h 13 Mar 2005 08:21:01 -0000 1.8
@@ -33,3 +33,4 @@
#include "e_signals.h"
#include "e_xinerama.h"
#include "e_table.h"
+#include "e_layout.h"
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_table.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_table.c 13 Mar 2005 04:01:00 -0000 1.1
+++ e_table.c 13 Mar 2005 08:21:01 -0000 1.2
@@ -4,7 +4,7 @@
#include "e.h"
typedef struct _E_Smart_Data E_Smart_Data;
-typedef struct _E_Table_Item E_Table_Item;
+typedef struct _E_Table_Item E_Table_Item;
struct _E_Smart_Data
{
@@ -110,7 +110,7 @@
if (sd->frozen <= 0) _e_table_smart_reconfigure(sd);
}
-int
+void
e_table_pack(Evas_Object *obj, Evas_Object *child, int col, int row, int
colspan, int rowspan)
{
E_Smart_Data *sd;
@@ -131,7 +131,6 @@
}
sd->changed = 1;
if (sd->frozen <= 0) _e_table_smart_reconfigure(sd);
- return 0;
}
void
@@ -257,6 +256,7 @@
evas_object_data_set(obj, "e_table_data", ti);
evas_object_event_callback_add(obj, EVAS_CALLBACK_FREE,
_e_table_smart_item_del_hook, NULL);
+ evas_object_stack_below(obj, sd->obj);
if (!evas_object_visible_get(sd->clip))
evas_object_show(sd->clip);
return ti;
@@ -420,7 +420,7 @@
_e_table_smart_init(void)
{
if (_e_smart) return;
- _e_smart = evas_smart_new("e_box",
+ _e_smart = evas_smart_new("e_table",
_e_table_smart_add,
_e_table_smart_del,
_e_table_smart_layer_set,
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_table.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_table.h 13 Mar 2005 04:01:00 -0000 1.1
+++ e_table.h 13 Mar 2005 08:21:01 -0000 1.2
@@ -10,7 +10,7 @@
EAPI int e_table_freeze (Evas_Object *obj);
EAPI int e_table_thaw (Evas_Object *obj);
EAPI void e_table_homogenous_set (Evas_Object *obj, int homogenous);
-EAPI int e_table_pack (Evas_Object *obj, Evas_Object
*child, int col, int row, int colspan, int rowspan);
+EAPI void e_table_pack (Evas_Object *obj, Evas_Object
*child, int col, int row, int colspan, int rowspan);
EAPI void e_table_pack_options_set (Evas_Object *obj, int fill_w, int
fill_h, int expand_w, int expand_h, double align_x, double align_y, Evas_Coord
min_w, Evas_Coord min_h, Evas_Coord max_w, Evas_Coord max_h);
EAPI void e_table_unpack (Evas_Object *obj);
EAPI void e_table_col_row_size_get (Evas_Object *obj, int *cols, int
*rows);
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
