Enlightenment CVS committal
Author : lok
Project : e17
Module : proto
Dir : e17/proto/enhance/src/lib
Modified Files:
enhance.c enhance_widget.c
Log Message:
Enhance almost compatible with glade-3.
===================================================================
RCS file: /cvs/e/e17/proto/enhance/src/lib/enhance.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- enhance.c 15 Aug 2006 17:30:05 -0000 1.22
+++ enhance.c 16 Aug 2006 13:35:33 -0000 1.23
@@ -782,7 +782,7 @@
packing->y_padding = 0;
packing->x_options = NULL;
packing->y_options = NULL;
- packing->shrink = ETK_FALSE;
+ packing->shrink = ETK_TRUE;
#define IF_TRUE_FALSE_ASSIGN(value, variable) \
do \
@@ -817,7 +817,7 @@
IF_TRUE_FALSE_ASSIGN(node->value, packing->expand);
else if(!strcmp("fill", str))
IF_TRUE_FALSE_ASSIGN(node->value, packing->fill);
- else if(!strcmp("pack_type", str))
+ else if(!strcmp("pack_type", str))
IF_PACK_TYPE_ASSIGN(node->value, packing->box_group);
else if(!strcmp("left_attach", str))
packing->left_attach = atoi(node->value);
===================================================================
RCS file: /cvs/e/e17/proto/enhance/src/lib/enhance_widget.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- enhance_widget.c 15 Aug 2006 17:30:05 -0000 1.17
+++ enhance_widget.c 16 Aug 2006 13:35:33 -0000 1.18
@@ -143,7 +143,7 @@
id = ecore_hash_get(node->attributes, "id");
if(!id) return NULL;
- vbox = _e_widget_new(en, node, etk_vbox_new(ETK_TRUE, 0), id);
+ vbox = _e_widget_new(en, node, etk_vbox_new(ETK_FALSE, 0), id);
return vbox;
}
@@ -157,7 +157,7 @@
id = ecore_hash_get(node->attributes, "id");
if(!id) return NULL;
- hbox = _e_widget_new(en, node, etk_hbox_new(ETK_TRUE, 0), id);
+ hbox = _e_widget_new(en, node, etk_hbox_new(ETK_FALSE, 0), id);
return hbox;
}
@@ -963,6 +963,7 @@
!strcmp(parent_class, "GtkVButtonBox") || !strcmp(parent_class,
"GtkHButtonBox"))
{
Etk_Box_Fill_Policy fill_policy;
+ Etk_Box_Group box_group = ETK_BOX_START;
int padding;
if(child->packing)
@@ -970,6 +971,8 @@
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;
+ if (child->packing->box_group)
+ box_group = child->packing->box_group;
}
else
{
@@ -977,8 +980,7 @@
padding = 0;
}
- etk_box_append(ETK_BOX(parent->wid), child->wid,
child->packing->box_group,
- fill_policy, padding);
+ etk_box_append(ETK_BOX(parent->wid), child->wid, box_group,
fill_policy, padding);
}
else if(!strcmp(parent_class, "GtkTable"))
@@ -1008,12 +1010,14 @@
y_padding = child->packing->y_padding;
if(child->packing->x_options)
{
- if(strstr(child->packing->x_options, "fill"))
+ if(child->packing->x_options
+ && strstr(child->packing->x_options, "fill"))
{
fill_policy = ETK_TABLE_HFILL;
flags_set = 1;
}
- else if(strstr(child->packing->x_options, "expand"))
+ else if(child->packing->y_options
+ && strstr(child->packing->x_options, "expand"))
{
if(flags_set)
fill_policy |= ETK_TABLE_HEXPAND;
@@ -1021,7 +1025,8 @@
fill_policy = ETK_TABLE_HEXPAND;
flags_set = 1;
}
- else if(strstr(child->packing->y_options, "fill"))
+ else if(child->packing->y_options
+ && strstr(child->packing->y_options, "fill"))
{
if(flags_set)
fill_policy |= ETK_TABLE_VFILL;
@@ -1029,7 +1034,8 @@
fill_policy = ETK_TABLE_VFILL;
flags_set = 1;
}
- else if(strstr(child->packing->y_options, "expand"))
+ else if(child->packing->y_options
+ && strstr(child->packing->y_options, "expand"))
{
if(flags_set)
fill_policy |= ETK_TABLE_VEXPAND;
-------------------------------------------------------------------------
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
