[PATCH 2/2] WPrefs: Add snap edge and corner detect to Expert panel.

These are both integer values, and thus use the new OPTION_WMAKER_INT class.
We also update the text describing the window snapping feature for
clarification and consistency.
---
 NEWS                | 10 ++++++----
 WPrefs.app/Expert.c |  8 +++++++-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/NEWS b/NEWS
index d60603c..36fb3f4 100644
--- a/NEWS
+++ b/NEWS
@@ -9,8 +9,9 @@ Window snapping
 
 You can now "snap" a window, i.e., maximize it to a side or corner of the
 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.
+"WindowSnapping = YES" in ~/GNUstep/Defaults/WindowMaker or selecting "Maximize
+(snap) a window to edge or corner by dragging." under "Expert User Preferences"
+in WPrefs.app.
 
 Note that if "Switch workspaces while dragging windows" is selected under
 "Workspace Preferences" in WPrefs.app, or if "DontLinkWorkspaces = NO" in
@@ -19,8 +20,9 @@ bottom of the screen.
 
 You may set the distance (in pixels) from the edge or corner of the screen at
 which a window will begin snapping using "SnapEdgeDetect" and "SnapCornerDetect"
-in ~/GNUstep/Defaults/WindowMaker.  (The defaults are 1 pixel and 10 pixels,
-respectively).
+in ~/GNUstep/Defaults/WindowMaker or setting "Distance from edge/corner to begin
+window snap." under "Expert User Preferences" in WPrefs.app.  (The defaults are
+1 pixel and 10 pixels, respectively).
 
 
 Dragging maximized windows
diff --git a/WPrefs.app/Expert.c b/WPrefs.app/Expert.c
index 0c6ed7b..616f9ec 100644
--- a/WPrefs.app/Expert.c
+++ b/WPrefs.app/Expert.c
@@ -88,9 +88,15 @@ static const struct {
 	  /* default: */ False, OPTION_WMAKER, "KbdModeLock" },
 #endif /* XKB_MODELOCK */
 
-	{ N_("Maximize a window to side or corner by dragging."),
+	{ N_("Maximize (snap) a window to edge or corner by dragging."),
 	  /* default: */ False, OPTION_WMAKER, "WindowSnapping" },
 
+	{ N_("Distance from edge to begin window snap."),
+	  /* default: */ 1, OPTION_WMAKER_INT, "SnapEdgeDetect" },
+
+	{ N_("Distance from corner to begin window snap."),
+	  /* default: */ 10, OPTION_WMAKER_INT, "SnapCornerDetect" },
+
 	{ N_("Open dialogs in the same workspace as their owners."),
 	  /* default: */ False, OPTION_WMAKER, "OpenTransientOnOwnerWorkspace" }
 
-- 
2.1.4


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