Enlightenment CVS committal
Author : cobra
Project : e_modules
Module : taskbar
Dir : e_modules/taskbar
Modified Files:
e_mod_main.c
Log Message:
Improve layout for different size shelves, expand the buttons so we have
some room for text.
Revert some interim changes from urandom (please discuss with iamsthitha
or I before changing while we are working on this!)
Kevin Brosius <[EMAIL PROTECTED]>
===================================================================
RCS file: /cvs/e/e_modules/taskbar/e_mod_main.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- e_mod_main.c 4 Sep 2006 19:09:22 -0000 1.19
+++ e_mod_main.c 5 Sep 2006 02:31:08 -0000 1.20
@@ -243,7 +243,7 @@
evas_object_geometry_get(b->o_box, NULL, NULL, &w, &h);
- e_table_homogenous_set(b->o_box, 0);
+ e_table_homogenous_set(b->o_box, 1);
e_table_align_set(b->o_box, 0.5, 0.5);
b->zone = zone;
return b;
@@ -356,10 +356,13 @@
);
#else
e_table_pack_options_set(ic->o_holder, 1, 1,
/* fill */
- 0, 0,
/* expand */
+ 1, 1,
/* expand */
0.5, 0.5,
/* align */
- b->bwmin, b->bhmin, /*
min */
- b->bwidth, b->bheight
/* max */
+ //b->bwmin, b->bhmin, /* min */
+ 0,0,
+ //b->bwidth, b->bheight /* max */
+ -1, -1
+
);
#endif
@@ -417,10 +420,12 @@
);
#else
e_table_pack_options_set(ic->o_holder, 1, 1, /*
fill */
- 0, 0, /*
expand */
+ 1, 1, /*
expand */
0.5, 0.5, /*
align */
- b->bwmin, b->bhmin, /* min */
- b->bwidth, b->bheight /* max
*/
+ //b->bwmin, b->bhmin, /* min */
+ 0,0,
+ //b->bwidth, b->bheight /* max */
+ -1,-1
);
#endif
@@ -472,9 +477,8 @@
Taskbar_Icon *ic;
Evas_Coord w, h, wmin, hmin;
int wnum, wnum2, hnum;
- int bwmin, bhmin;
- evas_object_geometry_get(b->inst->gcc->o_frame, NULL, NULL, &w, &h);
+ evas_object_geometry_get(b->o_box, NULL, NULL, &w, &h);
if (!b->icons)
return;
ic = b->icons->data;
@@ -484,8 +488,8 @@
if (wmin < 1)
wmin = 1;
// calc possible items across in width
-#if 0
wnum2 = w / wmin;
+#if 0
if (wnum < wnum2)
wnum2 = wnum;
if (wnum2 < 1)
@@ -503,15 +507,10 @@
#else
// todo xmax - presently unused
- if (wnum > 0)
- bwmin = w/wnum < wmin ? wmin : w/wnum;
- else
- bwmin = 0;
- bhmin = hmin;
- b->bwidth = w;
+ b->bwidth = wmin * wnum;
b->bheight = h;
- b->bwmin = bwmin;
- b->bhmin = bhmin;
+ b->bwmin = wmin;
+ b->bhmin = hmin;
#endif
_taskbar_repack(b);
-------------------------------------------------------------------------
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
