aboutsummaryrefslogtreecommitdiff
path: root/src/FbTk
diff options
context:
space:
mode:
authorrathnor <rathnor>2003-10-06 09:55:36 (GMT)
committerrathnor <rathnor>2003-10-06 09:55:36 (GMT)
commit29a69a69c1a2f51d6fb790534a0da8683ee24eb9 (patch)
treef8bfad0fedfd125933f2f9b2734e1706ef794dc0 /src/FbTk
parente5dd3d2e85b55931003583ede06fec57c2caaa95 (diff)
downloadfluxbox-29a69a69c1a2f51d6fb790534a0da8683ee24eb9.zip
fluxbox-29a69a69c1a2f51d6fb790534a0da8683ee24eb9.tar.bz2
minor menu positioning tweaks
Diffstat (limited to 'src/FbTk')
-rw-r--r--src/FbTk/Menu.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc
index 199fa77..ebaea3b 100644
--- a/src/FbTk/Menu.cc
+++ b/src/FbTk/Menu.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Menu.cc,v 1.38 2003/09/07 14:57:49 rathnor Exp $ 25// $Id: Menu.cc,v 1.39 2003/10/06 09:55:36 rathnor Exp $
26 26
27//use GNU extensions 27//use GNU extensions
28#ifndef _GNU_SOURCE 28#ifndef _GNU_SOURCE
@@ -1231,18 +1231,18 @@ void Menu::enterNotifyEvent(XCrossingEvent &ce) {
1231 1231
1232 menu.x_shift = menu.x, menu.y_shift = menu.y; 1232 menu.x_shift = menu.x, menu.y_shift = menu.y;
1233 if (menu.x + menu.width > m_screen_width) { 1233 if (menu.x + menu.width > m_screen_width) {
1234 menu.x_shift = m_screen_width - menu.width - m_border_width; 1234 menu.x_shift = m_screen_width - menu.width - 2*m_border_width;
1235 shifted = true; 1235 shifted = true;
1236 } else if (menu.x < 0) { 1236 } else if (menu.x < 0) {
1237 menu.x_shift = -m_border_width; 1237 menu.x_shift = 0; //-m_border_width;
1238 shifted = true; 1238 shifted = true;
1239 } 1239 }
1240 1240
1241 if (menu.y + menu.height > m_screen_height) { 1241 if (menu.y + menu.height + 2*m_border_width > m_screen_height) {
1242 menu.y_shift = m_screen_height - menu.height - m_border_width; 1242 menu.y_shift = m_screen_height - menu.height - 2*m_border_width;
1243 shifted = true; 1243 shifted = true;
1244 } else if (menu.y + (signed) menu.title_h < 0) { 1244 } else if (menu.y + (signed) menu.title_h < 0) {
1245 menu.y_shift = -m_border_width;; 1245 menu.y_shift = 0; // -m_border_width;;
1246 shifted = true; 1246 shifted = true;
1247 } 1247 }
1248 1248