add the resource for the window snapping offset

diff --git a/src/Screen.cc b/src/Screen.cc
index 8512b3dc3cc05dce8eb5d3e5534bff377679681e..447a7adf543eb28d457a6bbad32fca3e8641cce5 100644 (file)
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -490,6 +490,13 @@ void BScreen::saveSnapThreshold(int t) {
 }
 
 
+void BScreen::saveSnapOffset(int t) {
+  resource.snap_offset = t;
+  config->setValue(screenstr + "edgeSnapOffset",
+                   resource.snap_offset);
+}
+
+
 void BScreen::saveRowPlacementDirection(int d) {
   resource.row_direction = d;
   config->setValue(screenstr + "rowPlacementDirection",
@@ -599,6 +606,7 @@ void BScreen::save_rc(void) {
   saveWorkspaces(resource.workspaces);
   savePlacementPolicy(resource.placement_policy);
   saveSnapThreshold(resource.snap_threshold);
+  saveSnapOffset(resource.snap_offset);
   saveResistanceSize(resource.resistance_size);
   saveRowPlacementDirection(resource.row_direction);
   saveColPlacementDirection(resource.col_direction);
@@ -673,6 +681,10 @@ void BScreen::load_rc(void) {
     b = true;
   image_control->setDither(b);
 
+  if (! config->getValue(screenstr + "edgeSnapOffset",
+                        resource.snap_offset))
+    resource.snap_offset = 0;
+  
   if (! config->getValue(screenstr + "edgeSnapThreshold",
                         resource.snap_threshold))
     resource.snap_threshold = 4;

diff --git a/src/Screen.hh b/src/Screen.hh
index ca8194ce317172d9204f30b42550a82efd924ead..71a012dd50d43fb9cf46edaef0ab7fc4a3512147 100644 (file)
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -151,6 +151,7 @@ private:
       ignore_shaded, ignore_maximized, workspace_warping;
 
     int snap_to_windows, snap_to_edges;
+    unsigned int snap_offset;
 
     BColor border_color;
 
@@ -270,6 +271,8 @@ public:
   { return resource.workspaces; }
   inline int getPlacementPolicy(void) const
   { return resource.placement_policy; }
+  inline int getSnapOffset(void) const
+  { return resource.snap_offset; }
   inline int getSnapThreshold(void) const
   { return resource.snap_threshold; }
   inline int getResistanceSize(void) const
@@ -290,6 +293,7 @@ public:
   void saveRowPlacementDirection(int d);
   void saveColPlacementDirection(int d);
   void saveSnapThreshold(int t);
+  void saveSnapOffset(int o);
   void saveResistanceSize(int s);
   void saveImageDither(bool d);
   void saveAAFonts(bool f);

diff --git a/src/Window.cc b/src/Window.cc
index 98ac82fa6052148de8200297e4de4f41d6778d77..dc09a658ded8bebcf701d2ece672866acead50dd 100644 (file)
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -3124,7 +3124,7 @@ void BlackboxWindow::doWindowSnapping(int &dx, int &dy) {
   const int snap_to_windows = screen->getWindowToWindowSnap();
   const int snap_to_edges = screen->getWindowToEdgeSnap();
   // the amount of space away from the edge to provide resistance/snap
-  const int snap_offset = 0;
+  const int snap_offset = screen->getSnapOffset();
 
   // find the geomeetery where the moving window currently is
   const Rect &moving = screen->doOpaqueMove() ? frame.rect : frame.changing;