Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : libs/ewl

Dir     : e17/libs/ewl/src/lib


Modified Files:
        ewl_colorpicker.c 


Log Message:
- use the grid for the preview boxes

===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_colorpicker.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- ewl_colorpicker.c   26 May 2006 15:35:02 -0000      1.22
+++ ewl_colorpicker.c   10 Jul 2006 22:49:03 -0000      1.23
@@ -147,11 +147,14 @@
 
        ewl_spectrum_hsv_get(EWL_SPECTRUM(cp->picker.square), &h, &s, &v);
 
-       /* hbox to hold the colour previews */
-       hbox = ewl_hbox_new();
+       /* grid to hold the colour previews */
+       hbox = ewl_grid_new();
        ewl_widget_internal_set(hbox, TRUE);
+       ewl_grid_dimensions_set(EWL_GRID(hbox), 2, 2);
+       ewl_grid_homogeneous_set(EWL_GRID(hbox), TRUE);
        ewl_container_child_append(EWL_CONTAINER(vbox), hbox);
-       ewl_object_fill_policy_set(EWL_OBJECT(hbox), EWL_FLAG_FILL_HFILL);
+       ewl_object_fill_policy_set(EWL_OBJECT(hbox), 
+                               EWL_FLAG_FILL_NONE | EWL_FLAG_FILL_HFILL);
        ewl_widget_show(hbox);
 
        o = ewl_label_new();
@@ -168,16 +171,11 @@
        ewl_widget_color_set(o, r, g, b, 255);
        ewl_object_padding_set(EWL_OBJECT(o), 2, 2, 2, 2);
        ewl_object_minimum_h_set(EWL_OBJECT(o), 20);
-       ewl_object_fill_policy_set(EWL_OBJECT(o), EWL_FLAG_FILL_ALL);
+       ewl_object_fill_policy_set(EWL_OBJECT(o), 
+                               EWL_FLAG_FILL_HFILL | EWL_FLAG_FILL_VSHRINK);
        cp->preview.current = o;
        ewl_widget_show(o);
 
-       hbox = ewl_hbox_new();
-       ewl_widget_internal_set(hbox, TRUE);
-       ewl_container_child_append(EWL_CONTAINER(vbox), hbox);
-       ewl_object_fill_policy_set(EWL_OBJECT(hbox), EWL_FLAG_FILL_HFILL);
-       ewl_widget_show(hbox);
-
        o = ewl_label_new();
        ewl_widget_internal_set(o, TRUE);
        ewl_label_text_set(EWL_LABEL(o), "Previous:");
@@ -192,7 +190,8 @@
        ewl_widget_color_set(o, r, g, b, 255);
        ewl_object_padding_set(EWL_OBJECT(o), 2, 2, 2, 2);
        ewl_object_minimum_h_set(EWL_OBJECT(o), 20);
-       ewl_object_fill_policy_set(EWL_OBJECT(o), EWL_FLAG_FILL_ALL);
+       ewl_object_fill_policy_set(EWL_OBJECT(o), 
+                               EWL_FLAG_FILL_HFILL | EWL_FLAG_FILL_VSHRINK);
        ewl_callback_append(o, EWL_CALLBACK_CLICKED, 
                                ewl_colorpicker_cb_previous_clicked, cp);
        cp->preview.previous = o;




-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to