Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : libs/ewl

Dir     : e17/libs/ewl/src/lib


Modified Files:
        ewl_calendar.c 


Log Message:
- don't pass null to icon path set
- change fill policies a bit

===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_calendar.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- ewl_calendar.c      1 Apr 2007 21:48:06 -0000       1.29
+++ ewl_calendar.c      15 Apr 2007 05:28:47 -0000      1.30
@@ -65,6 +65,7 @@
        Ewl_Widget *w, *vbox, *top_hbox, *o;
        struct tm *ptr;
        time_t tm;
+       const char *icon;
 
        DENTER_FUNCTION(DLEVEL_STABLE);
        DCHECK_PARAM_PTR_RET("ib", ib, FALSE);
@@ -90,12 +91,12 @@
 
        o = ewl_icon_new();
        ewl_container_child_append(EWL_CONTAINER(top_hbox), o);
-       ewl_object_fill_policy_set(EWL_OBJECT(o), EWL_FLAG_FILL_NONE);
+       ewl_object_fill_policy_set(EWL_OBJECT(o), EWL_FLAG_FILL_SHRINK);
        ewl_object_alignment_set(EWL_OBJECT(o), EWL_FLAG_ALIGN_LEFT);
-       ewl_icon_image_set(EWL_ICON(o), 
-                       ewl_icon_theme_icon_path_get(EWL_ICON_GO_PREVIOUS, 
-                                                       EWL_ICON_SIZE_SMALL), 
-                       EWL_ICON_GO_PREVIOUS);
+       icon = ewl_icon_theme_icon_path_get(EWL_ICON_GO_PREVIOUS, 
+                                               EWL_ICON_SIZE_SMALL);
+       if (icon)
+               ewl_icon_image_set(EWL_ICON(o), icon, EWL_ICON_GO_PREVIOUS);
        ewl_icon_alt_text_set(EWL_ICON(o), "<<");
        ewl_callback_append(o, EWL_CALLBACK_CLICKED, 
                                        ewl_calendar_prev_month_cb, ib);
@@ -103,20 +104,21 @@
 
        ib->month_label = ewl_label_new();
        ewl_object_fill_policy_set(EWL_OBJECT(ib->month_label), 
-                                               EWL_FLAG_FILL_FILL);
+                                               EWL_FLAG_FILL_HFILL |
+                                               EWL_FLAG_FILL_VSHRINK);
        ewl_object_alignment_set(EWL_OBJECT(ib->month_label), 
                                                EWL_FLAG_ALIGN_CENTER);
        ewl_container_child_append(EWL_CONTAINER(top_hbox), ib->month_label);
        ewl_widget_show(ib->month_label);
 
        o = ewl_icon_new();
-       ewl_object_fill_policy_set(EWL_OBJECT(o), EWL_FLAG_FILL_NONE);
+       ewl_object_fill_policy_set(EWL_OBJECT(o), EWL_FLAG_FILL_SHRINK);
        ewl_object_alignment_set(EWL_OBJECT(o), EWL_FLAG_ALIGN_RIGHT);
        ewl_container_child_append(EWL_CONTAINER(top_hbox), o); 
-       ewl_icon_image_set(EWL_ICON(o),
-                               ewl_icon_theme_icon_path_get(EWL_ICON_GO_NEXT, 
-                                                       EWL_ICON_SIZE_SMALL), 
-                               EWL_ICON_GO_NEXT);
+       icon = ewl_icon_theme_icon_path_get(EWL_ICON_GO_NEXT, 
+                                               EWL_ICON_SIZE_SMALL);
+       if (icon)
+               ewl_icon_image_set(EWL_ICON(o), icon, EWL_ICON_GO_NEXT);
        ewl_icon_alt_text_set(EWL_ICON(o), ">>");
        ewl_callback_append(o, EWL_CALLBACK_CLICKED, 
                                        ewl_calendar_next_month_cb, ib);



-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to