change default resistance to 18

[chaz/openbox] / src / Screen.cc

diff --git a/src/Screen.cc b/src/Screen.cc
index 09f91bdefdb8951f5ae6f0e3fef5ef80d1bcec63..d445391296319ab8a42e520c9ee7ff52db005bfc 100644 (file)
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -434,7 +434,7 @@ void BScreen::saveWindowToWindowSnap(int s) {
   resource.snap_to_windows = s;
   
   const char *snap;
-  switch (resource.snap_to_edges) {
+  switch (resource.snap_to_windows) {
   case WindowNoSnap: snap = "NoSnap"; break;
   case WindowResistance: snap = "Resistance"; break;
   case WindowSnap: default: snap = "Snap"; break;
@@ -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,13 +681,17 @@ 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;
   
   if (! config->getValue(screenstr + "resistanceSize",
                         resource.resistance_size))
-    resource.resistance_size = 12;
+    resource.resistance_size = 18;
   
   if (config->getValue(screenstr + "rowPlacementDirection", s) &&
       s == "RightToLeft")