Enlightenment CVS committal

Author  : sebastid
Project : e17
Module  : apps/e

Dir     : e17/apps/e/src/bin


Modified Files:
        e_gadman.c 


Log Message:
If the object only can move along edges, remove horz/vert centering.
Maybe the centering rather should be fixed?

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_gadman.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- e_gadman.c  14 Feb 2005 11:59:42 -0000      1.22
+++ e_gadman.c  16 Feb 2005 11:27:01 -0000      1.23
@@ -461,6 +461,7 @@
 {
    E_Menu *m;
    E_Menu_Item *mi;
+   int disallow, seperator;
    
    E_OBJECT_CHECK_RETURN(gmc, NULL);
    E_OBJECT_TYPE_CHECK_RETURN(gmc, E_GADMAN_CLIENT_TYPE, NULL);
@@ -468,8 +469,10 @@
    
    gmc->menu = m;
 
+   seperator = 0;
    if (gmc->policy & E_GADMAN_POLICY_HSIZE)
      {
+       seperator = 1;
        if (gmc->autow > 0)
          {
             mi = e_menu_item_new(m);
@@ -493,24 +496,26 @@
                                  "full_width");
        e_menu_item_callback_set(mi, _e_gadman_cb_full_width, gmc);
      }
-   if (gmc->policy & E_GADMAN_POLICY_HMOVE)
+   disallow = (gmc->policy & E_GADMAN_POLICY_EDGES)
+             && ((gmc->edge == E_GADMAN_EDGE_LEFT) || (gmc->edge == 
E_GADMAN_EDGE_RIGHT));
+   if ((gmc->policy & E_GADMAN_POLICY_HMOVE) && !(disallow))
      {
+       seperator = 1;
        mi = e_menu_item_new(m);
        e_menu_item_label_set(mi, "Center Horizontally");
        e_menu_item_icon_edje_set(mi, e_path_find(path_icons, "default.eet"),
                                  "center_horiz");
        e_menu_item_callback_set(mi, _e_gadman_cb_center_horiz, gmc);
      }
-   if (((gmc->policy & E_GADMAN_POLICY_HSIZE) ||
-       (gmc->policy & E_GADMAN_POLICY_HMOVE)) &&
-       ((gmc->policy & E_GADMAN_POLICY_VSIZE) ||
-       (gmc->policy & E_GADMAN_POLICY_VMOVE)))
+   if (seperator)
      {
        mi = e_menu_item_new(m);
        e_menu_item_separator_set(mi, 1);
      }
+   seperator = 0;
    if (gmc->policy & E_GADMAN_POLICY_VSIZE)
      {
+       seperator = 1;
        if (gmc->autoh > 0)
          {
             mi = e_menu_item_new(m);
@@ -534,16 +539,22 @@
                                  "full_height");
        e_menu_item_callback_set(mi, _e_gadman_cb_full_height, gmc);
      }
-   if (gmc->policy & E_GADMAN_POLICY_VMOVE)
+   disallow = (gmc->policy & E_GADMAN_POLICY_EDGES)
+             && ((gmc->edge == E_GADMAN_EDGE_TOP) || (gmc->edge == 
E_GADMAN_EDGE_BOTTOM));
+   if ((gmc->policy & E_GADMAN_POLICY_VMOVE) && !(disallow))
      {
+       seperator = 1;
        mi = e_menu_item_new(m);
        e_menu_item_label_set(mi, "Center Vertically");
        e_menu_item_icon_edje_set(mi, e_path_find(path_icons, "default.eet"),
                                  "center_vert");
        e_menu_item_callback_set(mi, _e_gadman_cb_center_vert, gmc);
      }
-   mi = e_menu_item_new(m);
-   e_menu_item_separator_set(mi, 1);
+   if (seperator)
+     {
+       mi = e_menu_item_new(m);
+       e_menu_item_separator_set(mi, 1);
+     }
    mi = e_menu_item_new(m);
    e_menu_item_label_set(mi, "End Edit Mode");
    e_menu_item_callback_set(mi, _e_gadman_cb_end_edit_mode, gmc);




-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to