From 9c9c588d8e92c6c5dcf476463334eb002c07456b Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Mon, 27 Feb 2006 21:42:31 +0000 Subject: [PATCH] Fix graph drawing over text. Thanks to kingrayray for his graphical assistance again :). Text in the center of the image has been removed. SVN revision: 20843 --- cpu.png | Bin 8020 -> 7822 bytes e_mod_main.c | 37 +++++++++++++++++++++++++++---------- e_mod_main.h | 1 + module_icon.png | Bin 7210 -> 7822 bytes 4 files changed, 28 insertions(+), 10 deletions(-) diff --git a/cpu.png b/cpu.png index f1f37b4d1a8fc29b385071e90a4b6cee3bb53493..26ee659510cef0829603ff07f81f0f35c1b78a91 100644 GIT binary patch literal 7822 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 @@ -242,10 +243,23 @@ _cpu_face_init(Cpu_Face *cf) 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 @@ _cpu_face_init(Cpu_Face *cf) 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 @@ _cpu_face_enable(Cpu_Face *cf) 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 @@ _cpu_face_disable(Cpu_Face *cf) 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_free(Cpu_Face *cf) _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 @@ _cpu_face_cb_gmc_change(void *data, E_Gadman_Client *gmc, E_Gadman_Change change 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 @@ _cpu_face_update_values(void *data) 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 @@ _cpu_face_graph_values(Cpu_Face *cf, int val) 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); } diff --git a/e_mod_main.h b/e_mod_main.h index d063167..23c3eb0 100644 --- a/e_mod_main.h +++ b/e_mod_main.h @@ -42,6 +42,7 @@ struct _Cpu_Face Evas_Object *cpu_obj; Evas_Object *event_obj; Evas_Object *chart_obj; + Evas_Object *txt_obj; Ecore_Timer *monitor; diff --git a/module_icon.png b/module_icon.png index e725255866abcef69037e7fe21e9dbfcc6f7a9c5..26ee659510cef0829603ff07f81f0f35c1b78a91 100644 GIT binary patch literal 7822 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