From bb0b344da96780f9b4487d76d5cd0238a7ce75c4 Mon Sep 17 00:00:00 2001 From: Mandrake Date: Thu, 26 Aug 1999 20:07:51 +0000 Subject: [PATCH] this is a commit list test. *pray* SVN revision: 104 --- src/menus.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/src/menus.c b/src/menus.c index af569d0a..c77b3fa9 100644 --- a/src/menus.c +++ b/src/menus.c @@ -304,7 +304,24 @@ ShowMenu(Menu * m, char noshow) wy = 0; if (mode.menusonscreen) { - Border *b; + <<<<<< (int)root.w) + wx = 0 + ((int)mw - (int)w); + else if (mode.x + (int)w > (int)root.w) + wx = root.w - (int)mw - ((int)mw - (int)w); + else + wx = mode.x - x - ((int)w / 2); + if ((wx - ((int)w / 2)) < 0) + wx = 0; + + if (mode.y + (int)mh > (int)root.h) + wy = (int)root.h - (int)mh; + else + wy = mode.y - y - ((int)h / 2); + if ((wy - ((int)h / 2)) < 0) + wy = 0; + == == == = + Border * b; b = (Border *) FindItem(m->style->border_name, 0, LIST_FINDBY_NAME, LIST_TYPE_BORDER); @@ -326,6 +343,7 @@ ShowMenu(Menu * m, char noshow) if ((wy - ((int)h / 2) - (int)b->border.top) < 0) wy = (int)b->border.top; } + >>>>>>>1.8 } if ((mode.x >= 0) && (mode.y >= 0))