respect border size in the MoveTo action, especially at the right and lower

border of the screen.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/CurrentWindowCmd.cc b/src/CurrentWindowCmd.cc
index f6b38aa..084362b 100644
--- a/src/CurrentWindowCmd.cc
+++ b/src/CurrentWindowCmd.cc
@@ -143,11 +143,11 @@ void MoveToCmd::real_execute() {
     const int head = fbwindow().screen().getHead(fbwindow().fbWindow());
     
     if (m_refc & MoveToCmd::LOWER)
-        y = fbwindow().screen().maxBottom(head) - fbwindow().height() - m_step_size_y;
+        y = fbwindow().screen().maxBottom(head) - fbwindow().height() - 2 * fbwindow().frame().window().borderWidth() - m_step_size_y;
     if (m_refc & MoveToCmd::UPPER)
         y = fbwindow().screen().maxTop(head) + m_step_size_y;
     if (m_refc & MoveToCmd::RIGHT)
-        x = fbwindow().screen().maxRight(head) - fbwindow().width() - m_step_size_x;
+        x = fbwindow().screen().maxRight(head) - fbwindow().width() - 2 * fbwindow().frame().window().borderWidth() - m_step_size_x;
     if (m_refc & MoveToCmd::LEFT)
         x = fbwindow().screen().maxLeft(head) + m_step_size_x;