Enlightenment CVS committal
Author : urandom
Project : e_modules
Module : taskbar
Dir : e_modules/taskbar
Modified Files:
config.h.in e_mod_main.c
Log Message:
don't know if this is the absolute correct way of doing it, but at least the
buttons fill out the entire area now.
===================================================================
RCS file: /cvs/e/e_modules/taskbar/config.h.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- config.h.in 9 Aug 2006 07:39:16 -0000 1.6
+++ config.h.in 4 Sep 2006 19:09:22 -0000 1.7
@@ -7,6 +7,14 @@
/* "Have a BSD distribution" */
#undef HAVE_BSD
+/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
+ CoreFoundation framework. */
+#undef HAVE_CFLOCALECOPYCURRENT
+
+/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in
+ the CoreFoundation framework. */
+#undef HAVE_CFPREFERENCESCOPYAPPVALUE
+
/* Define if the GNU dcgettext() function is already present or preinstalled.
*/
#undef HAVE_DCGETTEXT
===================================================================
RCS file: /cvs/e/e_modules/taskbar/e_mod_main.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- e_mod_main.c 4 Sep 2006 14:39:12 -0000 1.18
+++ e_mod_main.c 4 Sep 2006 19:09:22 -0000 1.19
@@ -472,8 +472,9 @@
Taskbar_Icon *ic;
Evas_Coord w, h, wmin, hmin;
int wnum, wnum2, hnum;
+ int bwmin, bhmin;
- evas_object_geometry_get(b->o_box, NULL, NULL, &w, &h);
+ evas_object_geometry_get(b->inst->gcc->o_frame, NULL, NULL, &w, &h);
if (!b->icons)
return;
ic = b->icons->data;
@@ -483,8 +484,8 @@
if (wmin < 1)
wmin = 1;
// calc possible items across in width
- wnum2 = w / wmin;
#if 0
+ wnum2 = w / wmin;
if (wnum < wnum2)
wnum2 = wnum;
if (wnum2 < 1)
@@ -502,10 +503,15 @@
#else
// todo xmax - presently unused
- b->bwidth = wmin * wnum;
+ if (wnum > 0)
+ bwmin = w/wnum < wmin ? wmin : w/wnum;
+ else
+ bwmin = 0;
+ bhmin = hmin;
+ b->bwidth = w;
b->bheight = h;
- b->bwmin = wmin;
- b->bhmin = hmin;
+ b->bwmin = bwmin;
+ b->bhmin = bhmin;
#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
