From 7b65db91729534a80d777094927a767eb8849da2 Mon Sep 17 00:00:00 2001 From: fluxgen Date: Tue, 9 Apr 2002 12:22:06 +0000 Subject: fixed getHeight --- src/Basemenu.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Basemenu.cc b/src/Basemenu.cc index 802654f..9ddcb2e 100644 --- a/src/Basemenu.cc +++ b/src/Basemenu.cc @@ -22,7 +22,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: Basemenu.cc,v 1.20 2002/04/08 22:37:49 fluxgen Exp $ +// $Id: Basemenu.cc,v 1.21 2002/04/09 12:22:06 fluxgen Exp $ //use GNU extensions #ifndef _GNU_SOURCE @@ -589,7 +589,7 @@ void Basemenu::drawSubmenu(unsigned int index) { y = head_y; #else // !XINERAMA - if ((x + item->submenu()->width()) > m_screen->width()) { + if ((x + item->submenu()->width()) > m_screen->getWidth()) { x = ((shifted) ? menu.x_shift : menu.x) - item->submenu()->width() - m_screen->getBorderWidth(); } @@ -597,8 +597,8 @@ void Basemenu::drawSubmenu(unsigned int index) { if (x < 0) x = 0; - if ((y + item->submenu()->getHeight()) > m_screen->getHeight()) { - y = m_screen->getHeight() - item->submenu()->getHeight() - + if ((y + item->submenu()->height()) > m_screen->getHeight()) { + y = m_screen->getHeight() - item->submenu()->height() - m_screen->getBorderWidth2x(); } -- cgit v0.11.2