Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/clock
Modified Files:
e_mod_main.c e_mod_main.h
Log Message:
Fix clock padding. The clock needs a part called "main" if the complete
clock isn't rectangular.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/clock/e_mod_main.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -3 -r1.37 -r1.38
--- e_mod_main.c 23 Sep 2005 17:13:47 -0000 1.37
+++ e_mod_main.c 24 Sep 2005 01:15:23 -0000 1.38
@@ -213,6 +213,7 @@
{
Clock_Face *face;
Evas_Object *o;
+ Evas_Coord x, y, w, h;
face = E_NEW(Clock_Face, 1);
if (!face) return NULL;
@@ -236,6 +237,14 @@
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
_clock_face_cb_mouse_down, face);
evas_object_show(o);
+ evas_object_resize(face->clock_object, 200, 200);
+ edje_object_calc_force(face->clock_object);
+ edje_object_part_geometry_get(face->clock_object, "main", &x, &y, &w, &h);
+ face->inset.l = x;
+ face->inset.r = 200 - (x + w);
+ face->inset.t = y;
+ face->inset.b = 200 - (y + h);
+
face->gmc = e_gadman_client_new(con->gadman);
e_gadman_client_domain_set(face->gmc, "module.clock", _clock_count++);
e_gadman_client_policy_set(face->gmc,
@@ -246,10 +255,17 @@
E_GADMAN_POLICY_VSIZE);
e_gadman_client_min_size_set(face->gmc, 4, 4);
e_gadman_client_max_size_set(face->gmc, 512, 512);
- e_gadman_client_auto_size_set(face->gmc, 40, 40);
+ e_gadman_client_auto_size_set(face->gmc,
+ 40 + (face->inset.l + face->inset.r),
+ 40 + (face->inset.t + face->inset.b));
e_gadman_client_align_set(face->gmc, 1.0, 1.0);
e_gadman_client_aspect_set(face->gmc, 1.0, 1.0);
- e_gadman_client_resize(face->gmc, 40, 40);
+ 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,
+ 40 + (face->inset.l + face->inset.r),
+ 40 + (face->inset.t + face->inset.b));
e_gadman_client_change_func_set(face->gmc, _clock_face_cb_gmc_change, face);
e_gadman_client_load(face->gmc);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/clock/e_mod_main.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- e_mod_main.h 23 Sep 2005 17:13:47 -0000 1.10
+++ e_mod_main.h 24 Sep 2005 01:15:23 -0000 1.11
@@ -37,6 +37,10 @@
E_Menu *digital_menu;
Config_Face *conf;
+ struct {
+ Evas_Coord l, r, t, b;
+ } inset;
+
Evas_Object *clock_object;
Evas_Object *event_object;
-------------------------------------------------------
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
