Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
dialog.c
Log Message:
Fix bug in dialog layout (table positioning) causing trouble primarily in
combined settings dialog.
===================================================================
RCS file: /cvs/e/e16/e/src/dialog.c,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -3 -r1.172 -r1.173
--- dialog.c 6 Sep 2006 20:52:52 -0000 1.172
+++ dialog.c 14 Sep 2006 21:20:35 -0000 1.173
@@ -1528,46 +1528,59 @@
DItem *dii;
dii = di->item.table.items[i];
+
+ if (dii->type == DITEM_TABLE)
+ {
+ MoveTableBy(d, dii, dx, dy);
+ continue;
+ }
+
dii->x += dx;
dii->y += dy;
- if (dii->type == DITEM_TABLE)
- MoveTableBy(d, dii, dx, dy);
+
if (dii->win)
EMoveWindow(dii->win, dii->x, dii->y);
- if (dii->type == DITEM_CHECKBUTTON)
- EMoveWindow(dii->item.check_button.check_win, dii->x,
- dii->y +
- ((dii->h - dii->item.check_button.check_orig_h) / 2));
- if (dii->type == DITEM_RADIOBUTTON)
- EMoveWindow(dii->item.radio_button.radio_win, dii->x,
- dii->y +
- ((dii->h - dii->item.radio_button.radio_orig_h) / 2));
- if (dii->type == DITEM_SLIDER)
+
+ switch (dii->type)
{
- if (dii->item.slider.base_win)
- EMoveResizeWindow(dii->item.slider.base_win,
- dii->x + dii->item.slider.base_x,
- dii->y + dii->item.slider.base_y,
- dii->item.slider.base_w,
- dii->item.slider.base_h);
- if (dii->item.slider.knob_win)
- EMoveResizeWindow(dii->item.slider.knob_win,
- dii->x + dii->item.slider.knob_x,
- dii->y + dii->item.slider.knob_y,
- dii->item.slider.knob_w,
- dii->item.slider.knob_h);
- if (dii->item.slider.border_win)
- EMoveResizeWindow(dii->item.slider.border_win,
- dii->x + dii->item.slider.border_x,
- dii->y + dii->item.slider.border_y,
- dii->item.slider.border_w,
- dii->item.slider.border_h);
- if (dii->win)
- EMoveResizeWindow(dii->win,
- dii->x + dii->item.slider.numeric_x,
- dii->y + dii->item.slider.numeric_y,
- dii->item.slider.numeric_w,
- dii->item.slider.numeric_h);
+ case DITEM_CHECKBUTTON:
+ EMoveWindow(dii->item.check_button.check_win, dii->x,
+ dii->y +
+ ((dii->h - dii->item.check_button.check_orig_h) / 2));
+ break;
+ case DITEM_RADIOBUTTON:
+ EMoveWindow(dii->item.radio_button.radio_win, dii->x,
+ dii->y +
+ ((dii->h - dii->item.radio_button.radio_orig_h) / 2));
+ break;
+ case DITEM_SLIDER:
+ {
+ if (dii->item.slider.base_win)
+ EMoveResizeWindow(dii->item.slider.base_win,
+ dii->x + dii->item.slider.base_x,
+ dii->y + dii->item.slider.base_y,
+ dii->item.slider.base_w,
+ dii->item.slider.base_h);
+ if (dii->item.slider.knob_win)
+ EMoveResizeWindow(dii->item.slider.knob_win,
+ dii->x + dii->item.slider.knob_x,
+ dii->y + dii->item.slider.knob_y,
+ dii->item.slider.knob_w,
+ dii->item.slider.knob_h);
+ if (dii->item.slider.border_win)
+ EMoveResizeWindow(dii->item.slider.border_win,
+ dii->x + dii->item.slider.border_x,
+ dii->y + dii->item.slider.border_y,
+ dii->item.slider.border_w,
+ dii->item.slider.border_h);
+ if (dii->win)
+ EMoveResizeWindow(dii->win,
+ dii->x + dii->item.slider.numeric_x,
+ dii->y + dii->item.slider.numeric_y,
+ dii->item.slider.numeric_w,
+ dii->item.slider.numeric_h);
+ break;
+ }
}
}
}
-------------------------------------------------------------------------
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
