Enlightenment CVS committal
Author : rbdpngn
Project : misc
Module : erss
Dir : misc/erss/src
Modified Files:
erss.c tooltip.c
Log Message:
Remove the clock as it is rather redundant if you have multiple instances of
erss running, kept last update time. Changed the tooltips to use the new word
wrapping in etox, also resizes the ecore_evas to fit the etox contents better.
===================================================================
RCS file: /cvsroot/enlightenment/misc/erss/src/erss.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- erss.c 7 Feb 2004 03:00:38 -0000 1.33
+++ erss.c 17 Feb 2004 22:01:22 -0000 1.34
@@ -99,17 +99,15 @@
return str;
}
-int erss_set_time (void *data) {
+int erss_set_time (void *data)
+{
char *str;
char text[100];
str = erss_time_format ();
if (last_time)
- snprintf (text, sizeof (text), "Time now: %s Last update: %s",
- str, last_time);
- else
- snprintf (text, sizeof (text), "Time now: %s", str);
-
+ snprintf (text, sizeof (text), "Last update: %s", last_time);
+
edje_object_part_text_set (tid, "clock", text);
free (str);
@@ -556,7 +554,6 @@
ecore_evas_borderless_set (ee, cfg->borderless);
snprintf(theme_file, PATH_MAX, "erss - %s", config_file);
ecore_evas_title_set (ee, theme_file);
- ecore_evas_shaped_set (ee, 1);
ecore_x_window_prop_layer_set(win, -1);
ecore_evas_show (ee);
@@ -643,8 +640,7 @@
erss_connect (NULL);
ecore_timer_add (cfg->update_rate, erss_connect, NULL);
- ecore_timer_add (1, erss_set_time, NULL);
-
+
ecore_main_loop_begin ();
ecore_evas_shutdown ();
===================================================================
RCS file: /cvsroot/enlightenment/misc/erss/src/tooltip.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- tooltip.c 7 Feb 2004 00:57:11 -0000 1.2
+++ tooltip.c 17 Feb 2004 22:01:22 -0000 1.3
@@ -18,13 +18,13 @@
{
Erss_Tooltip *tt;
int x, y, w, h;
+ double ew, eh;
tt = malloc (sizeof (Erss_Tooltip));
memset (tt, 0, sizeof (Erss_Tooltip));
tt->ee = ecore_evas_software_x11_new (NULL, 0, 0, 0, 250, 80);
ecore_evas_borderless_set (tt->ee, TRUE);
- ecore_evas_shaped_set (tt->ee, TRUE);
tt->win = ecore_evas_software_x11_window_get(ee);
ecore_x_window_prop_window_type_set (tt->win, ECORE_X_WINDOW_TYPE_UTILITY);
ecore_evas_geometry_get (tt->ee, &x, &y, &w, &h);
@@ -47,21 +47,33 @@
evas_object_name_set(tt->bg, "background");
evas_object_show (tt->bg);
- tt->etox = etox_new_all(tt->evas, x + 5, y + 5, w - 10 , h - 20,
+ tt->etox = etox_new_all(tt->evas, x + 5, y + 5, w - 10 , h - 10,
255, ETOX_ALIGN_LEFT);
+ etox_context_set_wrap_marker(etox_get_context(tt->etox), NULL, NULL);
etox_context_set_align(etox_get_context(tt->etox), ETOX_ALIGN_LEFT);
etox_context_set_font(etox_get_context(tt->etox), "Vera", 10);
etox_context_set_style(etox_get_context(tt->etox), "shadow");
etox_context_set_color(etox_get_context(tt->etox), 225, 225, 225, 255);
etox_set_soft_wrap(tt->etox, 1);
+ etox_set_word_wrap(tt->etox, 1);
etox_set_alpha(tt->etox, 255);
evas_object_layer_set(tt->etox, 1000);
etox_set_text (tt->etox, description);
evas_object_show (tt->etox);
+ evas_object_geometry_get(tt->etox, NULL, NULL, &ew, &eh);
+
+ if (eh > ew) {
+ double scale = ew / eh;
+ ew = ew / scale;
+ eh *= scale;
+ evas_object_resize(tt->etox, ew, eh);
+ evas_object_geometry_get(tt->etox, NULL, NULL, &ew, &eh);
+ }
ecore_evas_callback_move_set (tt->ee, erss_window_move_tooltip);
ecore_evas_callback_resize_set(tt->ee, erss_window_resize);
-
+ ecore_evas_resize(tt->ee, ew + 10, eh + 10);
+
return tt;
}
-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
