The following shows the diffstat and patchsets between
fb4e671..ef8a167^
----------------------------------------------------------------
commit ef8a167c060dd5e11796d8cede948500b9bad9c0
Author: Thomas Adam <[email protected]>
Date: Thu Dec 4 00:18:17 2014 +0000
Sticky windows: Use global screen for repositioning
When working out when to (re)position sticky windows,
IsRectangleOnThisPage()
currently assumes the coordinates to be Xinerama-like in the geometry
translation. For now, assume this to be the global screen; rework of this
to
take place at a later date.
---
mvwm/misc.c | 4 ++--
mvwm/move_resize.c | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/mvwm/misc.c b/mvwm/misc.c
index b6423ee..28703d9 100644
--- a/mvwm/misc.c
+++ b/mvwm/misc.c
@@ -527,9 +527,9 @@ Bool IsRectangleOnThisPage(struct monitor *m, const
rectangle *rec, int desk)
return (desk == m->virtual_scr.CurrentDesk &&
rec->x + (signed int)rec->width > 0 &&
- (rec->x > m->coord.x || rec->x < m->coord.w) &&
+ (rec->x < 0 || rec->x < m->coord.w) &&
rec->y + (signed int)rec->height > 0 &&
- (rec->y > m->coord.y || rec->y < m->coord.h)) ?
+ (rec->y < 0 || rec->y < m->coord.h)) ?
True : False;
}
diff --git a/mvwm/move_resize.c b/mvwm/move_resize.c
index c12d043..796eeb6 100644
--- a/mvwm/move_resize.c
+++ b/mvwm/move_resize.c
@@ -5103,7 +5103,8 @@ int stick_across_pages(F_CMD_ARGS, int toggle)
}
else
{
- if (!IsRectangleOnThisPage(fw->m, &fw->g.frame,
fw->m->virtual_scr.CurrentDesk))
+ if (!IsRectangleOnThisPage(monitor_by_name("global"),
+ &fw->g.frame, fw->m->virtual_scr.CurrentDesk))
{
action = "";
__move_window(F_PASS_ARGS, False, MOVE_PAGE);
----------------------------------------------------------------
Diffstat:
----------------------------------------------------------------
mvwm/misc.c | 4 ++--
mvwm/move_resize.c | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------
