Enlightenment CVS committal
Author : handyande
Project : misc
Module : engage
Dir : misc/engage/src
Modified Files:
config.c dock.c engage.h icon.c
Log Message:
Remove legacy text code - theme edje now controls this.
Seems to fix the gaim killing engage on close bug :)
===================================================================
RCS file: /cvsroot/enlightenment/misc/engage/src/config.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -3 -r1.43 -r1.44
--- config.c 8 Oct 2004 15:02:06 -0000 1.43
+++ config.c 11 Oct 2004 08:20:25 -0000 1.44
@@ -67,12 +67,6 @@
colour = od_argb_to_colour(ecore_config_argbstr_get(key));
switch (tag) {
- case TT_TXT:
- options.tt_txt_color = colour;
- break;
- case TT_SHD:
- options.tt_shd_color = colour;
- break;
case BG_FORE:
options.bg_fore = colour;
break;
@@ -125,8 +119,6 @@
"zoom-time",
"Time taken (in seconds) for icons to zoom");
- ecore_config_argb_create("engage.options.tt_txt_color", "#00000000", 'c',
"text-color", "Text color");
- ecore_config_argb_create("engage.options.tt_shd_color", "#7f000000", 'C',
"shadow-color", "Text shadow color");
ecore_config_argb_create("engage.options.bg_fore", "#7f000000", 'B',
"bg-outline-color", "Background outline color");
ecore_config_argb_create("engage.options.bg_back", "#7fffffff", 'b',
"bg-main-color", "Background main color");
@@ -161,14 +153,6 @@
options.dock_zoom_duration =
ecore_config_float_get("engage.options.zoom_duration");
- options.tt_txt_color =
- od_argb_to_colour(ecore_config_argbstr_get("engage.options.tt_txt_color"));
- ecore_config_listen("colour", "engage.options.tt_txt_color",
- colour_listener, TT_TXT, NULL);
- options.tt_shd_color =
- od_argb_to_colour(ecore_config_argbstr_get("engage.options.tt_shd_color"));
- ecore_config_listen("colour", "engage.options.tt_shd_color",
- colour_listener, TT_SHD, NULL);
options.bg_fore =
od_argb_to_colour(ecore_config_argbstr_get("engage.options.bg_fore"));
ecore_config_listen("colour", "engage.options.bg_fore",
===================================================================
RCS file: /cvsroot/enlightenment/misc/engage/src/dock.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- dock.c 6 Oct 2004 15:20:19 -0000 1.13
+++ dock.c 11 Oct 2004 08:20:25 -0000 1.14
@@ -140,22 +140,6 @@
dock.x + relative_x - 0.5 * size,
options.height - ARROW_SPACE - size);
- if (fabs(relative_x) < 0.5 * size && dock.state != unzoomed)
- od_icon_tt_show(icon);
- else
- od_icon_tt_hide(icon);
-
- {
- Evas_Coord w, h;
-
- evas_object_geometry_get(icon->tt_txt, NULL, NULL, &w, &h);
- evas_object_move(icon->tt_txt, dock.x + relative_x - 0.5 * w,
- options.height - ARROW_SPACE_DOUBLE - size - h);
- evas_object_move(icon->tt_shd, dock.x + relative_x - 0.5 * w + 1.0,
- options.height - ARROW_SPACE_DOUBLE - size - h +
- 1.0);
- }
-
item = item->next;
}
===================================================================
RCS file: /cvsroot/enlightenment/misc/engage/src/engage.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- engage.h 7 Oct 2004 10:39:45 -0000 1.22
+++ engage.h 11 Oct 2004 08:20:25 -0000 1.23
@@ -67,8 +67,6 @@
void od_icon_del(OD_Icon * od_icon);
void od_icon_arrow_show(OD_Icon * icon);
void od_icon_arrow_hide(OD_Icon * icon);
-void od_icon_tt_show(OD_Icon * icon);
-void od_icon_tt_hide(OD_Icon * icon);
void od_icon_name_change(OD_Icon * icon, const char *name);
void od_icon_add_path(const char *path);
void od_icon_add_kde_set(const char *path);
@@ -93,7 +91,7 @@
int size, spacing; // icon-*
double zoomfactor, dock_zoom_duration;
- unsigned tt_txt_color, tt_shd_color, bg_fore, bg_back; // color - ARGB
+ unsigned bg_fore, bg_back; // color - ARGB
char *tt_fa; // font name
int tt_fs; // font size
double icon_appear_duration;
@@ -126,7 +124,7 @@
#define OD_ICON_STATE_BOUNCING 0x00000008
struct _OD_Icon {
- Evas_Object *icon, *pic, *tt_txt, *tt_shd;
+ Evas_Object *icon, *pic;
unsigned state; // see above
char *name, *icon_file, *winclass;
double x, y; // relative to evas
===================================================================
RCS file: /cvsroot/enlightenment/misc/engage/src/icon.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -3 -r1.37 -r1.38
--- icon.c 6 Oct 2004 15:20:19 -0000 1.37
+++ icon.c 11 Oct 2004 08:20:25 -0000 1.38
@@ -164,8 +164,6 @@
Evas_Object *icon = NULL;
Evas_Object *pic = NULL;
- Evas_Object *tt_txt = NULL;
- Evas_Object *tt_shd = NULL;
icon = in->icon;
winclass = in->winclass;
@@ -244,24 +242,6 @@
}
if (edje_object_part_exists(icon, "EngageName")) {
edje_object_part_text_set(icon, "EngageName", name);
- } else {
- tt_txt = in->tt_txt = evas_object_text_add(evas);
- tt_shd = in->tt_shd = evas_object_text_add(evas);
- evas_object_text_font_set(tt_txt, options.tt_fa, options.tt_fs);
- evas_object_text_text_set(tt_txt, name);
- evas_object_color_set(tt_txt,
- (options.tt_txt_color >> 16) & 0xff,
- (options.tt_txt_color >> 8) & 0xff,
- (options.tt_txt_color >> 0) & 0xff, 255);
- evas_object_layer_set(tt_txt, 200);
-
- evas_object_text_font_set(tt_shd, options.tt_fa, options.tt_fs);
- evas_object_text_text_set(tt_shd, name);
- evas_object_color_set(tt_shd,
- (options.tt_shd_color >> 16) & 0xff,
- (options.tt_shd_color >> 8) & 0xff,
- (options.tt_shd_color >> 0) & 0xff, 127);
- evas_object_layer_set(tt_shd, 199);
}
evas_object_layer_set(icon, 100);
evas_object_show(icon);
@@ -316,25 +296,21 @@
assert(icon);
switch (icon->type) {
case application_link:
- assert(icon->data.applnk.command);
assert(icon->data.applnk.winclass);
- free(icon->data.applnk.command);
+ if (icon->data.applnk.command)
+ free(icon->data.applnk.command);
free(icon->data.applnk.winclass);
break;
case minimised_window:
break;
}
- assert(icon->icon);
- evas_object_del(icon->icon);
+ if (icon->icon)
+ evas_object_del(icon->icon);
if (icon->pic)
evas_object_del(icon->pic);
- if (icon->tt_txt)
- evas_object_del(icon->tt_txt);
- if (icon->tt_shd)
- evas_object_del(icon->tt_shd);
- assert(icon->name);
- free(icon->name);
+ if (icon->name)
+ free(icon->name);
free(icon);
}
@@ -355,30 +331,11 @@
}
void
-od_icon_tt_show(OD_Icon * icon)
-{
- if (icon->tt_txt)
- evas_object_show(icon->tt_txt);
- if (icon->tt_shd)
- evas_object_show(icon->tt_shd);
-}
-
-void
-od_icon_tt_hide(OD_Icon * icon)
-{
- if (icon->tt_txt)
- evas_object_hide(icon->tt_txt);
- if (icon->tt_shd)
- evas_object_hide(icon->tt_shd);
-}
-
-void
od_icon_name_change(OD_Icon * icon, const char *name)
{
free(icon->name);
icon->name = strdup(name);
- evas_object_text_text_set(icon->tt_txt, name);
- evas_object_text_text_set(icon->tt_shd, name);
+ edje_object_part_text_set(icon->icon, "EngageName", name);
need_redraw = true;
}
-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
