summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2006-01-10 04:36:36 +0000
committerElijah Newren <newren@src.gnome.org>2006-01-10 04:36:36 +0000
commit35532d14cbbd422f16b507344d4b6259fd6071f8 (patch)
treeb61a802738555ceb0142c0bdee75f6c114f1b249
parent9516694385d8a3c6236866bda379f76679f95f22 (diff)
downloadmetacity-35532d14cbbd422f16b507344d4b6259fd6071f8.tar.gz
Make extra timeout edge resistance apply even if one edge already
2006-01-09 Elijah Newren <newren@gmail.com> * src/edge-resistance.c (apply_edge_resistance): Make extra timeout edge resistance apply even if one edge already offscreen. Fixes another of the zillions of issues covered in #321905.
-rw-r--r--ChangeLog6
-rw-r--r--src/edge-resistance.c6
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 2fa0a08c..c04ac7d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2006-01-09 Elijah Newren <newren@gmail.com>
+ * src/edge-resistance.c (apply_edge_resistance): Make extra
+ timeout edge resistance apply even if one edge already offscreen.
+ Fixes another of the zillions of issues covered in #321905.
+
+2006-01-09 Elijah Newren <newren@gmail.com>
+
Allow edge resistance at both sides of a window and also when
edges don't overlap but are a single pixel away from doing so.
Fixes one of the zillions of issues covered in #321905.
diff --git a/src/edge-resistance.c b/src/edge-resistance.c
index 40979beb..443b8cba 100644
--- a/src/edge-resistance.c
+++ b/src/edge-resistance.c
@@ -495,12 +495,10 @@ apply_edge_resistance (MetaWindow *window,
timeout_length_ms = TIMEOUT_RESISTANCE_LENGTH_MS_WINDOW;
break;
case META_EDGE_XINERAMA:
- if (window->require_on_single_xinerama)
- timeout_length_ms = TIMEOUT_RESISTANCE_LENGTH_MS_XINERAMA;
+ timeout_length_ms = TIMEOUT_RESISTANCE_LENGTH_MS_XINERAMA;
break;
case META_EDGE_SCREEN:
- if (window->require_fully_onscreen)
- timeout_length_ms = TIMEOUT_RESISTANCE_LENGTH_MS_SCREEN;
+ timeout_length_ms = TIMEOUT_RESISTANCE_LENGTH_MS_SCREEN;
break;
}