aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormathias <mathias>2005-07-05 21:57:33 (GMT)
committermathias <mathias>2005-07-05 21:57:33 (GMT)
commit56580b2321ddd3e8b8620a0972723bdd7375eef9 (patch)
tree79fbb28e8738e14a3b933d0622c94dd32fe5f825
parent093b06edd3709b05d4cbb2c5a007c0a821770f36 (diff)
downloadfluxbox_pavel-56580b2321ddd3e8b8620a0972723bdd7375eef9.zip
fluxbox_pavel-56580b2321ddd3e8b8620a0972723bdd7375eef9.tar.bz2
respect border size in the MoveTo action, especially at the right and lower
border of the screen.
-rw-r--r--ChangeLog2
-rw-r--r--src/CurrentWindowCmd.cc4
2 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 1b20bc3..a007e54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
1(Format: Year/Month/Day) 1(Format: Year/Month/Day)
2Changes for 0.9.14: 2Changes for 0.9.14:
3*05/07/05: 3*05/07/05:
4 * Respect border size in the MoveTo action (Mathias)
5 CurrentWindowCmd.cc
4 * Added kcommander, Valknut, dcgui-qt, quickdc, asami, amsn to fbgm (Mathias) 6 * Added kcommander, Valknut, dcgui-qt, quickdc, asami, amsn to fbgm (Mathias)
5 fluxbox-generate_menu.in 7 fluxbox-generate_menu.in
6*05/06/30: 8*05/06/30:
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() {
143 const int head = fbwindow().screen().getHead(fbwindow().fbWindow()); 143 const int head = fbwindow().screen().getHead(fbwindow().fbWindow());
144 144
145 if (m_refc & MoveToCmd::LOWER) 145 if (m_refc & MoveToCmd::LOWER)
146 y = fbwindow().screen().maxBottom(head) - fbwindow().height() - m_step_size_y; 146 y = fbwindow().screen().maxBottom(head) - fbwindow().height() - 2 * fbwindow().frame().window().borderWidth() - m_step_size_y;
147 if (m_refc & MoveToCmd::UPPER) 147 if (m_refc & MoveToCmd::UPPER)
148 y = fbwindow().screen().maxTop(head) + m_step_size_y; 148 y = fbwindow().screen().maxTop(head) + m_step_size_y;
149 if (m_refc & MoveToCmd::RIGHT) 149 if (m_refc & MoveToCmd::RIGHT)
150 x = fbwindow().screen().maxRight(head) - fbwindow().width() - m_step_size_x; 150 x = fbwindow().screen().maxRight(head) - fbwindow().width() - 2 * fbwindow().frame().window().borderWidth() - m_step_size_x;
151 if (m_refc & MoveToCmd::LEFT) 151 if (m_refc & MoveToCmd::LEFT)
152 x = fbwindow().screen().maxLeft(head) + m_step_size_x; 152 x = fbwindow().screen().maxLeft(head) + m_step_size_x;
153 153