Enlightenment CVS committal
Author : moom
Project : e17
Module : libs/etk
Dir : e17/libs/etk/src/lib
Modified Files:
etk_widget.c
Log Message:
* temporary fix that removes the white rect over the tree-headers
===================================================================
RCS file: /cvs/e/e17/libs/etk/src/lib/etk_widget.c,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -3 -r1.109 -r1.110
--- etk_widget.c 25 Mar 2007 18:22:01 -0000 1.109
+++ etk_widget.c 25 Mar 2007 19:47:42 -0000 1.110
@@ -1426,6 +1426,7 @@
Etk_Widget_Member_Object *member_object;
Etk_Widget *prev_widget;
int r, g, b, a;
+ int r2, g2, b2, a2;
if (!widget || !object || !widget->realized
|| (evas_object_evas_get(object) !=
etk_widget_toplevel_evas_get(widget)))
@@ -1442,13 +1443,14 @@
member_object->object = object;
member_object->visible = evas_object_visible_get(object);
- /* TODO: do not do this if the widget has a color_set() method */
_etk_widget_real_color_get(widget, &r, &g, &b, &a);
- evas_object_color_set(object, r, g, b, a);
+ evas_object_color_get(object, &r2, &g2, &b2, &a2);
+ evas_object_color_set(object, (r * r2) / 255, (g * g2) / 255, (b * b2) /
255, (a * a2) / 255);
_etk_widget_object_add_to_smart(widget, object,
(evas_object_clip_get(object) == NULL));
evas_object_intercept_show_callback_add(object,
_etk_widget_member_object_intercept_show_cb, widget);
evas_object_intercept_hide_callback_add(object,
_etk_widget_member_object_intercept_hide_cb, widget);
+ evas_object_intercept_hide_callback_add(object,
_etk_widget_member_object_intercept_hide_cb, widget);
evas_object_event_callback_add(object, EVAS_CALLBACK_FREE,
_etk_widget_member_object_deleted_cb, widget);
evas_object_data_set(object, "_Etk_Widget::Parent", widget);
@@ -2027,7 +2029,7 @@
theme_child = ETK_WIDGET(widget->theme_children->data);
theme_child->theme_parent = NULL;
widget->theme_children = evas_list_remove_list(widget->theme_children,
widget->theme_children);
- etk_object_notify(ETK_OBJECT(theme_child), "theme_parent");
+ etk_object_notify(ETK_OBJECT(theme_child), "theme-parent");
/* TODO: update the theme of the theme-child? */
}
if (widget->theme_parent)
@@ -3296,7 +3298,7 @@
{
Evas_List *l;
Etk_Widget_Member_Object *m;
- Etk_Widget *widget, *parent, *child;
+ Etk_Widget *widget, *child;
if (!obj || !(widget = ETK_WIDGET(evas_object_smart_data_get(obj))))
return;
@@ -3306,22 +3308,16 @@
widget->color.b = b;
widget->color.a = a;
- for (parent = widget->parent; parent && parent->propagate_color; parent =
parent->parent)
- {
- r = (r * parent->color.r) / 255;
- g = (g * parent->color.g) / 255;
- b = (b * parent->color.b) / 255;
- a = (a * parent->color.a) / 255;
- }
-
if (widget->theme_object)
+ {
+ _etk_widget_real_color_get(widget, &r, &g, &b, &a);
evas_object_color_set(widget->theme_object, r, g, b, a);
+ }
- /* TODO: we could have a "color_set" method to override this behavior */
for (l = widget->member_objects; l; l = l->next)
{
m = l->data;
- evas_object_color_set(m->object, r, g, b, a);
+ evas_object_color_set(m->object, widget->color.r, widget->color.g,
widget->color.b, widget->color.a);
}
if (widget->propagate_color)
{
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
