[E-devel] bug in svn commit 57998: no 'move to' submenu when only one vdesk

[Bruno Prémont]

Commit 57998 (no 'move to' submenu when only one vdesk, by morlenxus)
makes "move to" window submenu disappear even though there are multiple
virtual desktops though only vertical ones.

Original commit was:

Index: e_int_border_menu.c
===================================================================
--- e_int_border_menu.c (revision 57997)
+++ e_int_border_menu.c (revision 57998)
@@ -89,7 +89,7 @@
    mi = e_menu_item_new(m);
    e_menu_item_separator_set(mi, 1);
 
-   if (!bd->sticky)
+   if ((!bd->sticky) && (bd->zone->desk_x_count > 1)) 
      {
         mi = e_menu_item_new(m);
         e_menu_item_label_set(mi, _("Move to"));
@@ -589,7 +589,7 @@
    e_object_data_set(E_OBJECT(subm), bd);
    e_menu_item_submenu_set(mi, subm);
 
-   if (!bd->sticky)
+   if ((!bd->sticky) && (bd->zone->desk_x_count > 1)) 
      {
         submi = e_menu_item_new(subm);
         e_menu_item_label_set(submi, _("Move to"));


It should rather have been:

Index: e_int_border_menu.c
===================================================================
--- e_int_border_menu.c (revision 57997)
+++ e_int_border_menu.c (revision 57998)
@@ -89,7 +89,7 @@
    mi = e_menu_item_new(m);
    e_menu_item_separator_set(mi, 1);
 
-   if (!bd->sticky)
+   if ((!bd->sticky) && (bd->zone->desk_x_count * bd->zone->desk_y_count > 1)) 
      {
         mi = e_menu_item_new(m);
         e_menu_item_label_set(mi, _("Move to"));
@@ -589,7 +589,7 @@
    e_object_data_set(E_OBJECT(subm), bd);
    e_menu_item_submenu_set(mi, subm);
 
-   if (!bd->sticky)
+   if ((!bd->sticky) && (bd->zone->desk_x_count * bd->zone->desk_y_count > 1)) 
      {
         submi = e_menu_item_new(subm);
         e_menu_item_label_set(submi, _("Move to"));


Please apply attached patch to correct behavior.

Thanks,
Bruno
diff -u e_int_border_menu.c e_int_border_menu.c
--- e_int_border_menu.c	(revision 57998)
+++ e_int_border_menu.c	(revision 57998)
@@ -89,7 +89,7 @@
    mi = e_menu_item_new(m);
    e_menu_item_separator_set(mi, 1);
 
-   if ((!bd->sticky) && (bd->zone->desk_x_count * bd->zone->desk_y_count > 1)) 
+   if ((!bd->sticky) && (bd->zone->desk_x_count > 1)) 
      {
         mi = e_menu_item_new(m);
         e_menu_item_label_set(mi, _("Move to"));
@@ -589,7 +589,7 @@
    e_object_data_set(E_OBJECT(subm), bd);
    e_menu_item_submenu_set(mi, subm);
 
-   if ((!bd->sticky) && (bd->zone->desk_x_count * bd->zone->desk_y_count > 1)) 
+   if ((!bd->sticky) && (bd->zone->desk_x_count > 1)) 
      {
         submi = e_menu_item_new(subm);
         e_menu_item_label_set(submi, _("Move to"));

------------------------------------------------------------------------------
Xperia(TM) PLAY
It's a major breakthrough. An authentic gaming
smartphone on the nation's most reliable network.
And it wants your games.
http://p.sf.net/sfu/verizon-sfdev
_______________________________________________
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel