Enlightenment CVS committal
Author : handyande
Project : misc
Module : engage
Dir : misc/engage/src/module
Modified Files:
e_mod_main.c
Log Message:
More theme code, this should position everything properly - untill you resize,
then things go a little wonkey :(
===================================================================
RCS file: /cvsroot/enlightenment/misc/engage/src/module/e_mod_main.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -3 -r1.71 -r1.72
--- e_mod_main.c 30 Nov 2005 12:55:55 -0000 1.71
+++ e_mod_main.c 30 Nov 2005 23:24:57 -0000 1.72
@@ -626,7 +626,6 @@
eb->align_req = 0.5;
eb->align = 0.5;
e_box_align_set(eb->box_object, 0.5, 0.5);
-
e_box_thaw(eb->box_object);
eb->gmc = e_gadman_client_new(eb->con->gadman);
@@ -915,7 +914,7 @@
{
Engage_Icon *ic;
Evas_Object *o;
- Evas_Coord bw, bh;
+ Evas_Coord size;
ic = E_NEW(Engage_Icon, 1);
if (!ic) return NULL;
@@ -940,8 +939,11 @@
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_WHEEL,
_engage_icon_cb_mouse_wheel, ic);
evas_object_show(o);
+ size = eb->engage->conf->iconsize;
o = edje_object_add(eb->evas);
ic->bg_object = o;
+ edje_extern_object_min_size_set(o, size, size);
+ edje_extern_object_max_size_set(o, size, size);
evas_object_intercept_move_callback_add(o, _engage_icon_cb_intercept_move,
ic);
evas_object_intercept_resize_callback_add(o,
_engage_icon_cb_intercept_resize, ic);
edje_object_file_set(o, PACKAGE_DATA_DIR "/themes/module.edj", "icon");
@@ -950,9 +952,7 @@
o = edje_object_add(eb->evas);
ic->icon_object = o;
edje_object_file_set(o, ic->app->path, "icon");
- edje_extern_object_min_size_set(o, eb->engage->conf->iconsize,
eb->engage->conf->iconsize);
edje_object_part_swallow(ic->bg_object, "item", o);
- edje_object_size_min_calc(ic->bg_object, &bw, &bh);
evas_object_pass_events_set(o, 1);
evas_object_show(o);
@@ -969,8 +969,8 @@
1, 1, /* fill */
0, 0, /* expand */
0.5, 0.5, /* align */
- bw, bh, /* min */
- bw, bh /* max */
+ size, size, /* min */
+ size, size /* max */
);
edje_object_signal_emit(ic->bg_object, "passive", "");
@@ -1485,14 +1485,18 @@
e_box_freeze(eb->box_object);
e_box_min_size_get(eb->box_object, &w, &h);
- e_gadman_client_geometry_get(eb->gmc, &x, &y, NULL, NULL);
+ evas_object_resize(eb->event_object, w, h);
+ edje_object_part_unswallow(eb->bar_object, eb->box_object);
+ edje_extern_object_min_size_set(eb->box_object, w, h);
+ edje_extern_object_max_size_set(eb->box_object, w, h);
+ edje_object_part_swallow(eb->bar_object, "items", eb->box_object);
+
+ edje_object_size_min_calc(eb->bar_object, &w, &h);
+ e_gadman_client_geometry_get(eb->gmc, &x, &y, NULL, NULL);
e_gadman_client_resize(eb->gmc, w, h);
- if (eb->tray)
- evas_object_resize(eb->event_object, w - eb->tray->w, h);
- else
- evas_object_resize(eb->event_object, w, h);
+ evas_object_resize(eb->event_object, w, h);
evas_object_move(eb->event_object, x, y);
e_box_thaw(eb->box_object);
evas_event_thaw(eb->evas);
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs