Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_button.c ewl_label.c
Log Message:
- move buttons over to use the label
- fixup label preferred size
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_button.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ewl_button.c 28 Mar 2005 07:04:27 -0000 1.2
+++ ewl_button.c 16 Jun 2005 02:10:53 -0000 1.3
@@ -49,7 +49,7 @@
* Create and setup the label for the button if it's desired.
*/
if (label)
- b->label_object = ewl_text_new(label);
+ b->label_object = ewl_label_new(label);
if (b->label_object) {
ewl_object_alignment_set(EWL_OBJECT(b->label_object),
@@ -81,12 +81,12 @@
b->label_object = NULL;
}
else if (!b->label_object) {
- b->label_object = ewl_text_new(l);
+ b->label_object = ewl_label_new(l);
ewl_widget_show(b->label_object);
ewl_container_child_append(EWL_CONTAINER(b), b->label_object);
}
else
- ewl_text_text_set(EWL_TEXT(b->label_object), l);
+ ewl_label_text_set(EWL_LABEL(b->label_object), l);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -103,7 +103,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
if (b->label_object)
- val = ewl_text_text_get(EWL_TEXT(b->label_object));
+ val = ewl_label_text_get(EWL_LABEL(b->label_object));
DRETURN_PTR(val, DLEVEL_STABLE);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_label.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ewl_label.c 15 Jun 2005 20:17:43 -0000 1.1
+++ ewl_label.c 16 Jun 2005 02:10:56 -0000 1.2
@@ -83,6 +83,7 @@
ewl_label_apply(Ewl_Label *la)
{
Ewl_Widget *w;
+ Evas_Coord nw, nh;
w = EWL_WIDGET(la);
if (!w->theme_object) return;
@@ -92,5 +93,9 @@
printf(" NO PART\n");
*/
edje_object_part_text_set(w->theme_object, "text", la->text);
+ edje_object_size_min_calc(w->theme_object, &nw, &nh);
+
+ ewl_object_preferred_inner_size_set(EWL_OBJECT(la), (int)nw, (int)nh);
}
+
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
