Enlightenment CVS committal
Author : handyande
Project : misc
Module : engage
Dir : misc/engage/src/module
Modified Files:
e_mod_main.c
Log Message:
make event layer only size of items swallow - no need to know if tray is loaded
any more
===================================================================
RCS file: /cvsroot/enlightenment/misc/engage/src/module/e_mod_main.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -3 -r1.72 -r1.73
--- e_mod_main.c 30 Nov 2005 23:24:57 -0000 1.72
+++ e_mod_main.c 1 Dec 2005 13:52:15 -0000 1.73
@@ -1957,10 +1957,7 @@
evas_object_resize(o, 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);
edje_extern_object_min_size_set(eb->box_object, w, h);
if (eb->gmc)
@@ -2169,32 +2166,20 @@
if (edge == E_GADMAN_EDGE_LEFT)
{
- if (eb->tray)
- evas_object_resize(eb->event_object, w * (multiplier + 1), h -
eb->tray->h);
- else
- evas_object_resize(eb->event_object, w * (multiplier + 1), h );
+ evas_object_resize(eb->event_object, w * (multiplier + 1), h );
}
else if (edge == E_GADMAN_EDGE_RIGHT)
{
- if (eb->tray)
- evas_object_resize(eb->event_object, w * (multiplier + 1), h -
eb->tray->h);
- else
- evas_object_resize(eb->event_object, w * (multiplier + 1), h );
+ evas_object_resize(eb->event_object, w * (multiplier + 1), h );
evas_object_move(eb->event_object, x - w * multiplier, y);
}
else if (edge == E_GADMAN_EDGE_TOP)
{
- if (eb->tray)
- evas_object_resize(eb->event_object, w - eb->tray->w, h * (multiplier
+ 1));
- else
- evas_object_resize(eb->event_object, w , h * (multiplier + 1));
+ evas_object_resize(eb->event_object, w , h * (multiplier + 1));
}
else
{
- if (eb->tray)
- evas_object_resize(eb->event_object, w - eb->tray->w, h * (multiplier
+ 1));
- else
- evas_object_resize(eb->event_object, w , h * (multiplier + 1));
+ evas_object_resize(eb->event_object, w , h * (multiplier + 1));
evas_object_move(eb->event_object, x, y - h * multiplier);
}
_engage_bar_motion_handle(eb, ev->canvas.x, ev->canvas.y);
@@ -2353,9 +2338,10 @@
_engage_bar_iconsize_change(Engage_Bar *eb)
{
Evas_List *l;
- Evas_Coord border;
+ Evas_Coord border, size;
e_box_freeze(eb->box_object);
+ size = eb->engage->conf->iconsize;
for (l = eb->icons; l; l = l->next)
{
Engage_Icon *ic;
@@ -2364,14 +2350,14 @@
ic = l->data;
o = ic->icon_object;
- edje_extern_object_min_size_set(o, eb->engage->conf->iconsize,
eb->engage->conf->iconsize);
- evas_object_resize(o, eb->engage->conf->iconsize,
eb->engage->conf->iconsize);
-
- edje_object_size_min_calc(ic->bg_object, &border, NULL);
+ edje_object_part_unswallow(ic->bg_object, o);
+ edje_extern_object_min_size_set(o, size, size);
+ edje_extern_object_min_size_set(o, size, size);
+ evas_object_resize(o, size, size);
edje_object_part_swallow(ic->bg_object, "item", o);
- edje_object_size_min_calc(ic->bg_object, &bw, &bh);
+ edje_object_size_min_calc(ic->bg_object, &bw, &bh);
e_box_pack_options_set(ic->bg_object,
1, 1, /* fill */
0, 0, /* expand */
@@ -2379,6 +2365,7 @@
bw, bh, /* min */
bw, bh /* max */
);
+ border = bw;
}
eb->engage->iconbordersize = border;
-------------------------------------------------------
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
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
