Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : mem
Dir : e_modules/mem
Modified Files:
mem.edc e_mod_main.c
Log Message:
More edje_object_part_text_set work
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/mem/mem.edc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- mem.edc 21 Feb 2006 13:16:59 -0000 1.3
+++ mem.edc 22 Feb 2006 10:43:37 -0000 1.4
@@ -12,21 +12,7 @@
{
group
{
- name: "modules/mem/main";
- script {
- public message(Msg_Type:type, id, ...) {
- if (type == MSG_STRING_SET) {
- new real_str[100];
- new swap_str[100];
-
- getsarg(2, real_str, sizeof(real_str));
- getsarg(3, swap_str, sizeof(swap_str));
- set_text(PART:"real-text", real_str);
- set_text(PART:"swap-text", swap_str);
- }
- }
- }
-
+ name: "modules/mem/main";
parts{
part {
name: "base";
@@ -38,18 +24,35 @@
}
}
part {
+ name: "mem_clip";
+ type: RECT;
+ clip_to: "base";
+ mouse_events: 0;
+ description {
+ state: "default" 0.0;
+ color: 255 255 255 255;
+ rel1 {
+ to_x: "base";
+ }
+ rel2 {
+ to: "base";
+ }
+ }
+ }
+
+ part {
name: "mem";
- clip_to: "base";
+ clip_to: "mem_clip";
mouse_events: 0;
description {
state: "default" 0.0;
color: 255 255 255 200;
aspect: 1.0 1.0;
- rel1 {
- offset: 0 6;
+ rel1 {
+ to: "base";
}
rel2 {
- offset: -1 -6;
+ to: "base";
}
image {
normal: "mem.png";
@@ -63,7 +66,7 @@
{
name: "real-text";
type: TEXT;
- clip_to: "base";
+ clip_to: "mem_clip";
effect: SOFT_SHADOW;
mouse_events: 0;
description {
@@ -72,7 +75,7 @@
rel1 {
relative: 1.0 0.0;
to_x: "mem";
- offset: -2 1;
+ offset: -2 10;
}
rel2 {
relative: 1.0 0.0;
@@ -93,7 +96,7 @@
{
name: "swap-text";
type: TEXT;
- clip_to: "base";
+ clip_to: "mem_clip";
effect: SOFT_SHADOW;
mouse_events: 0;
description {
@@ -101,7 +104,7 @@
align: 1.0 0.0;
rel1 {
relative: 1.0 1.0;
- to_x: "mem";
+ to_x: "mem";
offset: -2 -10;
}
rel2 {
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/mem/e_mod_main.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_mod_main.c 21 Feb 2006 12:36:08 -0000 1.3
+++ e_mod_main.c 22 Feb 2006 10:43:37 -0000 1.4
@@ -409,7 +409,6 @@
{
Mem_Face *cf;
int real, swap, total_real, total_swap;
- Edje_Message_String_Set *msg;
char real_str[100];
char swap_str[100];
@@ -421,13 +420,8 @@
snprintf(real_str, sizeof(real_str), "%d/%d MB", total_real, real);
snprintf(swap_str, sizeof(swap_str), "%d/%d MB", total_swap, swap);
-
- msg = malloc(sizeof(Edje_Message_String_Set) - sizeof(char *) + (1 +
sizeof(char *)));
- msg->count = 2;
- msg->str[0] = real_str;
- msg->str[1] = swap_str;
- edje_object_message_send(cf->mem_obj, EDJE_MESSAGE_STRING_SET, 1, msg);
- free(msg);
+ edje_object_part_text_set(cf->mem_obj, "real-text", real_str);
+ edje_object_part_text_set(cf->mem_obj, "swap-text", swap_str);
return 1;
}
-------------------------------------------------------
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://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
