Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/pager
Modified Files:
e_mod_main.c e_mod_main.h
Log Message:
gadman padding.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/pager/e_mod_main.c,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -3 -r1.134 -r1.135
--- e_mod_main.c 23 Sep 2005 17:13:47 -0000 1.134
+++ e_mod_main.c 23 Sep 2005 23:40:45 -0000 1.135
@@ -8,6 +8,7 @@
* which options should be in main menu, and which in face menu?
* check if a new desk is in the current zone
* check if padding changes on resize
+ * include deskname in padding
*/
/* module private routines */
@@ -505,6 +506,7 @@
Pager_Face *face;
Evas_Object *o;
Evas_Coord x, y, w, h;
+ double aspect;
face = E_NEW(Pager_Face, 1);
if (!face) return NULL;
@@ -535,11 +537,6 @@
face->inset.t = y;
face->inset.b = 1000 - (y + h);
- face->desk_inset.l = -1;
- face->desk_inset.r = -1;
- face->desk_inset.t = -1;
- face->desk_inset.b = -1;
-
face->drop_handler = e_drop_handler_add(face,
_pager_face_cb_enter,
_pager_face_cb_move,
_pager_face_cb_leave,
_pager_face_cb_drop,
@@ -566,9 +563,18 @@
E_GADMAN_POLICY_VSIZE);
e_gadman_client_min_size_set(face->gmc, 8, 8);
e_gadman_client_max_size_set(face->gmc, 600, 600);
- e_gadman_client_auto_size_set(face->gmc, 186, 40);
+ e_gadman_client_auto_size_set(face->gmc,
+ (face->xnum * 40) + (face->inset.l +
face->inset.r),
+ (face->ynum * 30) + (face->inset.t +
face->inset.b));
e_gadman_client_align_set(face->gmc, 0.0, 1.0);
- e_gadman_client_resize(face->gmc, 186, 40);
+ aspect = (double)(face->xnum * face->zone->w) / (double)(face->ynum *
face->zone->h);
+ e_gadman_client_aspect_set(face->gmc, aspect, aspect);
+ e_gadman_client_padding_set(face->gmc,
+ face->inset.l, face->inset.r,
+ face->inset.t, face->inset.b);
+ e_gadman_client_resize(face->gmc,
+ (face->xnum * 40) + (face->inset.l + face->inset.r),
+ (face->ynum * 30) + (face->inset.t + face->inset.b));
e_gadman_client_change_func_set(face->gmc, _pager_face_cb_gmc_change, face);
e_gadman_client_load(face->gmc);
@@ -727,7 +733,6 @@
Evas_Object *o;
E_Border_List *bl;
E_Border *bd;
- Evas_Coord x, y, w, h;
pd = E_NEW(Pager_Desk, 1);
if (!pd) return NULL;
@@ -747,21 +752,6 @@
e_table_pack_options_set(o, 1, 1, 1, 1, 0.5, 0.5, 0, 0, -1, -1);
evas_object_show(o);
- if ((face->desk_inset.l == -1) &&
- (face->desk_inset.r == -1) &&
- (face->desk_inset.t == -1) &&
- (face->desk_inset.b == -1))
- {
- evas_object_resize(pd->desk_object, 1000, 1000);
- edje_object_calc_force(pd->desk_object);
- edje_object_part_geometry_get(pd->desk_object, "items", &x, &y, &w, &h);
-
- face->desk_inset.l = x;
- face->desk_inset.r = 1000 - (x + w);
- face->desk_inset.t = y;
- face->desk_inset.b = 1000 - (y + h);
- }
-
o = evas_object_rectangle_add(face->evas);
pd->event_object = o;
evas_object_layer_set(o, 2);
@@ -2422,11 +2412,9 @@
face = l->data;
- h = ((face->fh - (face->inset.t + face->inset.b)) / face->ynum) -
- (face->desk_inset.t + face->desk_inset.b);
+ h = ((face->fh - (face->inset.t + face->inset.b)) / face->ynum);
w = h * face->zone->w / (double)face->zone->h;
- w += (face->desk_inset.l + face->desk_inset.r);
w *= face->xnum;
w += (face->inset.l + face->inset.r);
@@ -2449,11 +2437,9 @@
face = l->data;
- w = ((face->fw - (face->inset.l + face->inset.r)) / face->xnum) -
- (face->desk_inset.l + face->desk_inset.r);
+ w = ((face->fw - (face->inset.l + face->inset.r)) / face->xnum);
h = w * face->zone->h / (double)face->zone->w;
- h += (face->desk_inset.t + face->desk_inset.b);
h *= face->ynum;
h += (face->inset.t + face->inset.b);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/pager/e_mod_main.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- e_mod_main.h 23 Sep 2005 17:13:47 -0000 1.34
+++ e_mod_main.h 23 Sep 2005 23:40:45 -0000 1.35
@@ -88,9 +88,6 @@
struct {
Evas_Coord l, r, t, b;
} inset;
- struct {
- Evas_Coord l, r, t, b;
- } desk_inset;
/* Current nr. of desktops */
int xnum, ynum;
-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42" plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
