Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/enhance/src/lib
Modified Files:
enhance_widget.c
Log Message:
* Fix enhance
===================================================================
RCS file: /cvs/e/e17/proto/enhance/src/lib/enhance_widget.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- enhance_widget.c 14 Aug 2006 19:50:38 -0000 1.15
+++ enhance_widget.c 15 Aug 2006 17:13:28 -0000 1.16
@@ -962,19 +962,23 @@
else if(!strcmp(parent_class, "GtkVBox") || !strcmp(parent_class,
"GtkHBox") ||
!strcmp(parent_class, "GtkVButtonBox") || !strcmp(parent_class,
"GtkHButtonBox"))
{
- Etk_Bool expand = ETK_TRUE;
- Etk_Bool fill = ETK_TRUE;
- int padding = 0;
+ Etk_Box_Fill_Policy fill_policy;
+ int padding;
if(child->packing)
{
- expand = child->packing->expand;
- fill = child->packing->fill;
+ fill_policy = child->packing->expand ? ETK_BOX_EXPAND :
ETK_BOX_NONE;
+ fill_policy |= child->packing->fill ? ETK_BOX_FILL : ETK_BOX_NONE;
padding = child->packing->padding;
}
+ else
+ {
+ fill_policy = ETK_BOX_EXPAND_FILL;
+ padding = 0;
+ }
- etk_box_pack_start(ETK_BOX(parent->wid), child->wid,
- expand, fill, padding);
+ etk_box_append(ETK_BOX(parent->wid), child->wid, ETK_BOX_START,
+ fill_policy, padding);
}
else if(!strcmp(parent_class, "GtkTable"))
@@ -986,7 +990,7 @@
int x_padding = 0;
int y_padding = 0;
int flags_set = 0;
- Etk_Fill_Policy_Flags fill_policy = ETK_FILL_POLICY_NONE;
+ Etk_Table_Fill_Policy fill_policy = ETK_TABLE_NONE;
if(child->packing)
{
@@ -1006,38 +1010,37 @@
{
if(strstr(child->packing->x_options, "fill"))
{
- fill_policy = ETK_FILL_POLICY_HFILL;
+ fill_policy = ETK_TABLE_HFILL;
flags_set = 1;
}
else if(strstr(child->packing->x_options, "expand"))
{
if(flags_set)
- fill_policy |= ETK_FILL_POLICY_HEXPAND;
+ fill_policy |= ETK_TABLE_HEXPAND;
else
- fill_policy = ETK_FILL_POLICY_HEXPAND;
+ fill_policy = ETK_TABLE_HEXPAND;
flags_set = 1;
}
else if(strstr(child->packing->y_options, "fill"))
{
if(flags_set)
- fill_policy |= ETK_FILL_POLICY_VFILL;
+ fill_policy |= ETK_TABLE_VFILL;
else
- fill_policy = ETK_FILL_POLICY_VFILL;
+ fill_policy = ETK_TABLE_VFILL;
flags_set = 1;
}
else if(strstr(child->packing->y_options, "expand"))
{
if(flags_set)
- fill_policy |= ETK_FILL_POLICY_VEXPAND;
+ fill_policy |= ETK_TABLE_VEXPAND;
else
- fill_policy = ETK_FILL_POLICY_VEXPAND;
+ fill_policy = ETK_TABLE_VEXPAND;
flags_set = 1;
}
}
if(!flags_set)
- fill_policy = ETK_FILL_POLICY_VFILL|ETK_FILL_POLICY_HFILL|
- ETK_FILL_POLICY_VEXPAND|ETK_FILL_POLICY_HEXPAND;
+ fill_policy = ETK_TABLE_EXPAND_FILL;
}
/* NOTE: we have a problem here:
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
