Enlightenment CVS committal
Author : lok
Project : e17
Module : proto
Dir : e17/proto/enhance/src/lib
Modified Files:
enhance_widget.c
Log Message:
Little clean-up of the previous code.
===================================================================
RCS file: /cvs/e/e17/proto/enhance/src/lib/enhance_widget.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- enhance_widget.c 8 Sep 2006 23:06:35 -0000 1.23
+++ enhance_widget.c 8 Sep 2006 23:22:26 -0000 1.24
@@ -1061,14 +1061,12 @@
if(child->packing->x_options)
{
/* Glade 2 compatibility */
- if(child->packing->x_options
- && strstr(child->packing->x_options, "fill"))
+ if(strstr(child->packing->x_options, "fill"))
{
fill_policy = ETK_TABLE_HFILL;
flags_set = 1;
}
- else if(child->packing->x_options
- && strstr(child->packing->x_options, "expand"))
+ else if(strstr(child->packing->x_options, "expand"))
{
if(flags_set)
fill_policy |= ETK_TABLE_HEXPAND;
@@ -1076,57 +1074,54 @@
fill_policy = ETK_TABLE_HEXPAND;
flags_set = 1;
}
- else if(child->packing->y_options
- && strstr(child->packing->y_options, "fill"))
+ /* Glade 3 compatibility */
+ else if(strstr(child->packing->x_options, "GTK_EXPAND"))
{
- if(flags_set)
- fill_policy |= ETK_TABLE_VFILL;
- else
- fill_policy = ETK_TABLE_VFILL;
+ fill_policy = (fill_policy ^ ETK_TABLE_HFILL) &
fill_policy;
flags_set = 1;
}
- else if(child->packing->y_options
- && strstr(child->packing->y_options, "expand"))
+ else if(strstr(child->packing->x_options, "GTK_FILL"))
{
- if(flags_set)
- fill_policy |= ETK_TABLE_VEXPAND;
- else
- fill_policy = ETK_TABLE_VEXPAND;
+ fill_policy = (fill_policy ^ ETK_TABLE_HEXPAND) &
fill_policy;
flags_set = 1;
}
- /* Glade 3 compatibility */
- else if(child->packing->x_options
- && strstr(child->packing->x_options, "GTK_EXPAND"))
+ else if(strstr(child->packing->x_options, ""))
{
- fill_policy = (fill_policy ^ ETK_TABLE_HFILL) &
fill_policy;
+ fill_policy = (fill_policy ^ (ETK_TABLE_HEXPAND |
ETK_TABLE_HFILL)) & fill_policy;
flags_set = 1;
}
- else if(child->packing->x_options
- && strstr(child->packing->x_options, "GTK_FILL"))
+ }
+ if(child->packing->y_options)
+ {
+ /* Glade 2 compatibility */
+ if(strstr(child->packing->y_options, "fill"))
{
- fill_policy = (fill_policy ^ ETK_TABLE_HEXPAND) &
fill_policy;
+ if(flags_set)
+ fill_policy |= ETK_TABLE_VFILL;
+ else
+ fill_policy = ETK_TABLE_VFILL;
flags_set = 1;
}
- else if(child->packing->x_options
- && strstr(child->packing->x_options, ""))
+ else if(strstr(child->packing->y_options, "expand"))
{
- fill_policy = (fill_policy ^ (ETK_TABLE_HEXPAND |
ETK_TABLE_HFILL)) & fill_policy;
+ if(flags_set)
+ fill_policy |= ETK_TABLE_VEXPAND;
+ else
+ fill_policy = ETK_TABLE_VEXPAND;
flags_set = 1;
}
- else if(child->packing->y_options
- && strstr(child->packing->y_options, "GTK_EXPAND"))
+ /* Glade 3 compatibility */
+ else if(strstr(child->packing->y_options, "GTK_EXPAND"))
{
fill_policy = (fill_policy ^ ETK_TABLE_VFILL) &
fill_policy;
flags_set = 1;
}
- else if(child->packing->y_options
- && strstr(child->packing->y_options, "GTK_FILL"))
+ else if(strstr(child->packing->y_options, "GTK_FILL"))
{
fill_policy = (fill_policy ^ ETK_TABLE_VEXPAND) &
fill_policy;
flags_set = 1;
}
- else if(child->packing->y_options
- && strstr(child->packing->y_options, ""))
+ else if(strstr(child->packing->y_options, ""))
{
fill_policy = (fill_policy ^ (ETK_TABLE_VEXPAND |
ETK_TABLE_VFILL)) & fill_policy;
flags_set = 1;
-------------------------------------------------------------------------
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
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
