[repo.or.cz] wmaker-crm.git branch next updated: wmaker-0.95.6-324-g3c5533b

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project wmaker-crm.git.

The branch, next has been updated
       via  3c5533bec25a4f94c42ffaf7f77c27db6ddb7ac7 (commit)
      from  71809a2011b126a984bbbe2ed230673c62a26eeb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://repo.or.cz/w/wmaker-crm.git/commit/3c5533bec25a4f94c42ffaf7f77c27db6ddb7ac7

commit 3c5533bec25a4f94c42ffaf7f77c27db6ddb7ac7
Author: Doug Torrance <[email protected]>
Date:   Sat Jun 20 22:46:25 2015 -0500

    wmaker: Allow window snapping and linked workspaces simultaneously.
    
    If workspaces are linked, then windows will only snap to the top or bottom
    of the screen.
    
    Suggested-by: Josip Deanovic <[email protected]>

diff --git a/NEWS b/NEWS
index 023ceb1..fb96dbb 100644
--- a/NEWS
+++ b/NEWS
@@ -12,10 +12,10 @@ screen, by dragging it to that side or corner.  It is enabled by setting
 "WindowSnapping = YES" in ~/GNUstep/Defaults/WindowMaker or selecting "Enable
 window snapping" under "Expert User Preferences" in WPrefs.app.
 
-Note that window snapping is automatically disabled if "Switch workspaces while
-dragging windows" is selected under "Workspace Preferences" in WPrefs.app, or
-if "DontLinkWorkspaces = NO" in  ~/GNUstep/Defaults/WindowMaker, as this feature
-also involves dragging a window to one side of the screen.
+Note that if "Switch workspaces while dragging windows" is selected under
+"Workspace Preferences" in WPrefs.app, or if "DontLinkWorkspaces = NO" in
+~/GNUstep/Defaults/WindowMaker, then you may only snap a window to the top or
+bottom of the screen.
 
 
 Dragging maximized windows
diff --git a/src/moveres.c b/src/moveres.c
index b271f32..cded064 100644
--- a/src/moveres.c
+++ b/src/moveres.c
@@ -1766,11 +1766,16 @@ int wMouseMoveWindow(WWindow * wwin, XEvent * ev)
 			break;
 
 		case MotionNotify:
-			if (IS_RESIZABLE(wwin) && wPreferences.window_snapping && wPreferences.no_autowrap) {
+			if (IS_RESIZABLE(wwin) && wPreferences.window_snapping) {
 				int snap_direction;
 
 				snap_direction = get_snap_direction(scr, moveData.mouseX, moveData.mouseY);
 
+				if (!wPreferences.no_autowrap &&
+				    snap_direction != SNAP_TOP &&
+				    snap_direction != SNAP_BOTTOM)
+					snap_direction = SNAP_NONE;
+
 				if (moveData.snap != snap_direction) {
 					/* erase old frame */
 					if (moveData.snap)

-----------------------------------------------------------------------

Summary of changes:
 NEWS          | 8 ++++----
 src/moveres.c | 7 ++++++-
 2 files changed, 10 insertions(+), 5 deletions(-)


repo.or.cz automatic notification. Contact project admin [email protected]
if you want to unsubscribe, or site admin [email protected] if you receive
no reply.
-- 
wmaker-crm.git ("The Window Maker window manager")


-- 
To unsubscribe, send mail to [email protected].