Enlightenment CVS committal
Author : moom
Project : e17
Module : libs/etk
Dir : e17/libs/etk/src/lib
Modified Files:
etk_bin.h etk_label.c
Log Message:
* [Label] The part-objects of a Edje-object should not be manipulated.
Move the theme-object instead of the "etk.text.label" part-object.
===================================================================
RCS file: /cvs/e/e17/libs/etk/src/lib/etk_bin.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- etk_bin.h 2 Apr 2007 09:48:29 -0000 1.12
+++ etk_bin.h 15 Aug 2007 11:51:00 -0000 1.13
@@ -33,7 +33,7 @@
};
-Etk_Type *etk_bin_type_get(void);
+Etk_Type *etk_bin_type_get(void);
void etk_bin_child_set(Etk_Bin *bin, Etk_Widget *child);
Etk_Widget *etk_bin_child_get(Etk_Bin *bin);
===================================================================
RCS file: /cvs/e/e17/libs/etk/src/lib/etk_label.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- etk_label.c 14 Aug 2007 22:05:36 -0000 1.32
+++ etk_label.c 15 Aug 2007 11:51:00 -0000 1.33
@@ -241,28 +241,24 @@
{
Etk_Label *label;
Evas_Object *theme_object;
- Evas_Object *o;
Etk_Size requested_size;
if (!(label = ETK_LABEL(widget)))
return;
- theme_object = ETK_WIDGET(widget)->theme_object;
- o = edje_object_part_object_get(theme_object, "etk.text.label");
- if (o)
+ if ((theme_object = widget->theme_object))
{
- int x = 0;
- int y = 0;
-
- etk_widget_size_request(widget, &requested_size);
- if (requested_size.w < geometry.w)
- x = (geometry.w - requested_size.w) * label->xalign;
-
- if (requested_size.h < geometry.h)
- y = (geometry.h - requested_size.h) * label->yalign;
-
- evas_object_move(o, geometry.x + x, geometry.y + y);
- evas_object_resize(o, geometry.w, geometry.h);
+ int x = 0;
+ int y = 0;
+
+ etk_widget_size_request(widget, &requested_size);
+ if (requested_size.w < geometry.w)
+ x = (geometry.w - requested_size.w) * label->xalign;
+ if (requested_size.h < geometry.h)
+ y = (geometry.h - requested_size.h) * label->yalign;
+
+ evas_object_move(theme_object, geometry.x + x, geometry.y + y);
+ evas_object_resize(theme_object, ETK_MIN(geometry.w, requested_size.w),
ETK_MIN(geometry.h, requested_size.h));
}
}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
