[EGIT] [core/enlightenment] master 02/02: block linear desk flips that would wrap if desk flip wrapping is disabled

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=fbad4c7fd88afcf7dc3ed936ec4035186adb62fe

commit fbad4c7fd88afcf7dc3ed936ec4035186adb62fe
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Tue Feb 17 18:54:39 2015 -0500

    block linear desk flips that would wrap if desk flip wrapping is disabled
    
    fix T1948
---
 src/bin/e_zone.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/bin/e_zone.c b/src/bin/e_zone.c
index 65aa1a3..335c5c2 100644
--- a/src/bin/e_zone.c
+++ b/src/bin/e_zone.c
@@ -812,6 +812,8 @@ e_zone_desk_linear_flip_by(E_Zone *zone,
 
    dx = zone->desk_x_current +
      (zone->desk_y_current * zone->desk_x_count) + dx;
+   if ((!e_config->desk_flip_wrap) &&
+     ((dx < 0) || (dx >= zone->desk_x_count * zone->desk_y_count))) return;
    dx = dx % (zone->desk_x_count * zone->desk_y_count);
    while (dx < 0)
      dx += (zone->desk_x_count * zone->desk_y_count);

--