Enlightenment CVS committal
Author : atmosphere
Project : misc
Module : engage
Dir : misc/engage/src
Modified Files:
config.c icon.c window.c
Log Message:
cleanup old icons when switching themes, free old theme name before fetching new one
from ecore_config, indent, if you've been having icon->icon failed assertions update
your etox,ewl,and examine from cvs and all should be ok
===================================================================
RCS file: /cvsroot/enlightenment/misc/engage/src/config.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- config.c 25 May 2004 15:01:43 -0000 1.24
+++ config.c 29 May 2004 17:53:23 -0000 1.25
@@ -25,20 +25,23 @@
}
theme_listener(const char *key, const Ecore_Config_Type type, const int tag,
- void *data)
-{
+ void *data)
+{
char *path;
Evas_List *icons;
+
+ if (options.theme)
+ free(options.theme);
options.theme = ecore_config_theme_get(key);
path = ecore_config_theme_with_path_get(key);
-
+
icons = dock.icons;
while (icons) {
- od_icon_reload((OD_Icon *)icons->data);
+ od_icon_reload((OD_Icon *) icons->data);
icons = evas_list_next(icons);
}
-}
+}
int
od_config_init(void)
@@ -72,7 +75,7 @@
ecore_config_int_create("engage.options.spacing", 4, 'S', "spacing",
"Space in pixels between each icon");
ecore_config_int_create_bound("engage.options.zoom", 1, 0, 1, 1, 'z', "zoom",
- "Should we zoom icons?");
+ "Should we zoom icons?");
ecore_config_float_create("engage.options.zoom_factor", 2.0, 'Z',
"zoom-factor",
"Zoom factor of the icons - 1.0 == 100% == nozoom");
@@ -139,7 +142,8 @@
void
od_config_menu_out_cb(Ewl_Widget * w, void *ev_data, void *user_data)
{
- int x,y;
+ int x, y;
+
evas_pointer_output_xy_get(evas, &x, &y);
if (x < menu_x || x > (menu_x + menu_width) ||
y < menu_y || y > (menu_y + menu_height))
===================================================================
RCS file: /cvsroot/enlightenment/misc/engage/src/icon.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- icon.c 25 May 2004 15:01:44 -0000 1.29
+++ icon.c 29 May 2004 17:53:23 -0000 1.30
@@ -200,7 +200,15 @@
icon_file = in->icon_file;
pic = in->pic;
- path = ecore_config_theme_with_path_from_name_get(options.theme);
+ if (!(path = ecore_config_theme_with_path_from_name_get(options.theme))) {
+ path = ecore_config_theme_with_path_from_name_get("gentoo");
+ }
+ assert(path);
+ if (pic) {
+ evas_object_del(pic);
+ pic = NULL;
+ }
+
if (edje_object_file_set(icon, path, "Main") > 0) {
#if 0
fprintf(stderr, "Trying to find part for %s\n", winclass);
===================================================================
RCS file: /cvsroot/enlightenment/misc/engage/src/window.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- window.c 19 May 2004 04:48:03 -0000 1.18
+++ window.c 29 May 2004 17:53:23 -0000 1.19
@@ -156,12 +156,10 @@
ecore_evas_title_set(ee, "Engage");
ecore_evas_name_class_set(ee, "engage", "engage");
ecore_evas_borderless_set(ee, 1);
- if (options.mode == OM_ONTOP)
- {
- ecore_evas_avoid_damage_set(ee, 1);
- ecore_evas_shaped_set(ee, 1);
- }
- else
+ if (options.mode == OM_ONTOP) {
+ ecore_evas_avoid_damage_set(ee, 1);
+ ecore_evas_shaped_set(ee, 1);
+ } else
ecore_evas_shaped_set(ee, 0);
ecore_evas_callback_post_render_set(ee, handle_post_render_cb);
ecore_evas_callback_pre_render_set(ee, handle_pre_render_cb);
-------------------------------------------------------
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g.
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149&alloc_id=8166&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
