Enlightenment CVS committal
Author : lok
Project : e_modules
Module : notification
Dir : e_modules/notification/src
Modified Files:
e_mod_box.c e_mod_macro.h e_mod_main.c e_mod_popup.c
Log Message:
Use the current theme for the module logo.
===================================================================
RCS file: /cvs/e/e_modules/notification/src/e_mod_box.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_mod_box.c 2 Mar 2008 01:33:28 -0000 1.1
+++ e_mod_box.c 7 Mar 2008 18:02:59 -0000 1.2
@@ -523,7 +523,9 @@
snprintf(buf, sizeof(buf), "%s/e-module-notification.edj",
notification_mod->dir);
dummy = edje_object_add(evas_object_evas_get(ic->n_box->o_box));
- edje_object_file_set(dummy, buf, "modules/notification/logo");
+ if (!e_theme_edje_object_set(dummy, "base/theme/modules/notification",
+ "modules/notification/logo"))
+ edje_object_file_set(dummy, buf, "modules/notification/logo");
evas_object_resize(dummy, 80, 80);
app_icon = edje_object_part_object_get(dummy, "image");
}
===================================================================
RCS file: /cvs/e/e_modules/notification/src/e_mod_macro.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_mod_macro.h 2 Mar 2008 01:33:28 -0000 1.1
+++ e_mod_macro.h 7 Mar 2008 18:02:59 -0000 1.2
@@ -14,5 +14,8 @@
#undef MIN_LEN
#define MIN_LEN(str1, str2) strlen(str1) < strlen(str2) ? strlen(str1) :
strlen(str2)
+#undef MAX
+#define MAX(x, y) (((x) > (y)) ? (x) : (y))
+
#endif
===================================================================
RCS file: /cvs/e/e_modules/notification/src/e_mod_main.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- e_mod_main.c 4 Mar 2008 16:49:07 -0000 1.8
+++ e_mod_main.c 7 Mar 2008 18:02:59 -0000 1.9
@@ -62,6 +62,7 @@
evas_object_event_callback_add(b->o_box, EVAS_CALLBACK_RESIZE,
notification_box_cb_obj_moveresize, inst);
notification_cfg->instances = evas_list_append(notification_cfg->instances,
inst);
+ _gc_orient(gcc);
return gcc;
}
@@ -93,7 +94,7 @@
case E_GADCON_ORIENT_CORNER_BL:
case E_GADCON_ORIENT_CORNER_BR:
notification_box_orient_set(inst->n_box, 1);
- e_gadcon_client_aspect_set(gcc, evas_list_count(inst->n_box->icons) *
16, 16);
+ e_gadcon_client_aspect_set(gcc,
MAX(evas_list_count(inst->n_box->icons), 1) * 16, 16);
break;
case E_GADCON_ORIENT_VERT:
case E_GADCON_ORIENT_LEFT:
@@ -103,7 +104,7 @@
case E_GADCON_ORIENT_CORNER_LB:
case E_GADCON_ORIENT_CORNER_RB:
notification_box_orient_set(inst->n_box, 0);
- e_gadcon_client_aspect_set(gcc, 16, evas_list_count(inst->n_box->icons)
* 16);
+ e_gadcon_client_aspect_set(gcc, 16,
MAX(evas_list_count(inst->n_box->icons), 1) * 16);
break;
default:
break;
===================================================================
RCS file: /cvs/e/e_modules/notification/src/e_mod_popup.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_mod_popup.c 2 Mar 2008 01:33:28 -0000 1.1
+++ e_mod_popup.c 7 Mar 2008 18:02:59 -0000 1.2
@@ -248,7 +248,9 @@
snprintf(buf, sizeof(buf), "%s/e-module-notification.edj",
notification_mod->dir);
popup->app_icon = edje_object_add(popup->e);
- edje_object_file_set(popup->app_icon, buf, "modules/notification/logo");
+ if (!e_theme_edje_object_set(popup->app_icon,
"base/theme/modules/notification",
+ "modules/notification/logo"))
+ edje_object_file_set(popup->app_icon, buf,
"modules/notification/logo");
evas_object_resize(popup->app_icon, 80, 80);
edje_extern_object_min_size_set(popup->app_icon, 80, 80);
edje_extern_object_max_size_set(popup->app_icon, 80, 80);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
