Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : cpu
Dir : e_modules/cpu
Modified Files:
cpu.png module_icon.png e_mod_main.h e_mod_main.c
Log Message:
Fix graph drawing over text. Thanks to kingrayray for his graphical
assistance again :). Text in the center of the image has been removed.
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/cpu/cpu.png,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
Binary files /tmp/cvsmOd5Lq and /tmp/cvsKivCH7 differ
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/cpu/module_icon.png,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
Binary files /tmp/cvsY61xHx and /tmp/cvs7HEUUe differ
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/cpu/e_mod_main.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_mod_main.h 27 Feb 2006 20:04:57 -0000 1.4
+++ e_mod_main.h 27 Feb 2006 21:42:31 -0000 1.5
@@ -42,6 +42,7 @@
Evas_Object *cpu_obj;
Evas_Object *event_obj;
Evas_Object *chart_obj;
+ Evas_Object *txt_obj;
Ecore_Timer *monitor;
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/cpu/e_mod_main.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- e_mod_main.c 27 Feb 2006 20:07:54 -0000 1.9
+++ e_mod_main.c 27 Feb 2006 21:42:31 -0000 1.10
@@ -233,6 +233,7 @@
snprintf(buf, sizeof(buf), PACKAGE_DATA_DIR"/cpu.edj");
edje_object_file_set(o, buf, "modules/cpu/main");
}
+ evas_object_pass_events_set(o, 1);
evas_object_show(o);
o = edje_object_add(cf->evas);
@@ -242,10 +243,23 @@
evas_object_pass_events_set(o, 1);
evas_object_color_set(o, 255, 255, 255, 255);
evas_object_show(o);
+
+ o = edje_object_add(cf->evas);
+ cf->txt_obj = o;
+ if (!e_theme_edje_object_set(o, "base/theme/modules/cpu",
"modules/cpu/text"))
+ {
+ snprintf(buf, sizeof(buf), PACKAGE_DATA_DIR"/cpu.edj");
+ edje_object_file_set(o, buf, "modules/cpu/text");
+ }
+ evas_object_layer_set(o, 2);
+ evas_object_repeat_events_set(o, 0);
+ evas_object_pass_events_set(o, 1);
+ evas_object_color_set(o, 255, 255, 255, 255);
+ evas_object_show(o);
o = evas_object_rectangle_add(cf->evas);
cf->event_obj = o;
- evas_object_layer_set(o, 2);
+ evas_object_layer_set(o, 3);
evas_object_repeat_events_set(o, 1);
evas_object_color_set(o, 0, 0, 0, 0);
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
_cpu_face_cb_mouse_down, cf);
@@ -262,6 +276,7 @@
e_gadman_client_min_size_set(cf->gmc, 45, 50);
e_gadman_client_max_size_set(cf->gmc, 128, 128);
e_gadman_client_auto_size_set(cf->gmc, 45, 50);
+ e_gadman_client_aspect_set(cf->gmc, 1.0, 1.0);
e_gadman_client_align_set(cf->gmc, 1.0, 1.0);
e_gadman_client_resize(cf->gmc, 45, 50);
e_gadman_client_change_func_set(cf->gmc, _cpu_face_cb_gmc_change, cf);
@@ -301,6 +316,7 @@
evas_object_show(cf->cpu_obj);
evas_object_show(cf->chart_obj);
evas_object_show(cf->event_obj);
+ evas_object_show(cf->txt_obj);
}
static void
@@ -311,6 +327,7 @@
evas_object_hide(cf->event_obj);
evas_object_hide(cf->chart_obj);
evas_object_hide(cf->cpu_obj);
+ evas_object_hide(cf->txt_obj);
}
static void
@@ -328,6 +345,8 @@
_cpu_face_graph_clear(cf);
if (cf->chart_obj)
evas_object_del(cf->chart_obj);
+ if (cf->txt_obj)
+ evas_object_del(cf->txt_obj);
if (cf->gmc)
{
@@ -354,20 +373,18 @@
evas_object_move(cf->chart_obj, x, y);
evas_object_move(cf->event_obj, x, y);
evas_object_move(cf->cpu_obj, x, y);
+ evas_object_move(cf->txt_obj, x, y);
evas_object_resize(cf->chart_obj, w, h);
evas_object_resize(cf->event_obj, w, h);
evas_object_resize(cf->cpu_obj, w, h);
+ evas_object_resize(cf->txt_obj, w, h);
_cpu_face_graph_clear(cf);
- /*
- if (cf->monitor)
- ecore_timer_del(cf->monitor);
- cf->monitor = ecore_timer_add((double)cf->cpu->conf->check_interval,
_cpu_face_update_values, cf);
- */
break;
case E_GADMAN_CHANGE_RAISE:
evas_object_raise(cf->cpu_obj);
evas_object_raise(cf->chart_obj);
evas_object_raise(cf->event_obj);
+ evas_object_raise(cf->txt_obj);
break;
default:
break;
@@ -424,11 +441,11 @@
if (cf->cpu->conf->show_text)
{
- snprintf(str, sizeof(str), "%d %%", val);
- edje_object_part_text_set(cf->cpu_obj, "in-text", str);
+ snprintf(str, sizeof(str), "%d%%", val);
+ edje_object_part_text_set(cf->txt_obj, "in-text", str);
}
else
- edje_object_part_text_set(cf->cpu_obj, "in-text", "");
+ edje_object_part_text_set(cf->txt_obj, "in-text", "");
if (cf->cpu->conf->show_graph)
_cpu_face_graph_values(cf, val);
@@ -537,7 +554,7 @@
else
{
evas_object_line_xy_set(o, (x + w), (y + h), (x + w), ((y + h) - v));
- evas_object_color_set(o, 255, 0, 0, 150);
+ evas_object_color_set(o, 255, 0, 0, 100);
evas_object_pass_events_set(o, 1);
evas_object_show(o);
}
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
