diff options
author | fluxgen <fluxgen> | 2002-04-09 12:22:06 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2002-04-09 12:22:06 (GMT) |
commit | 7b65db91729534a80d777094927a767eb8849da2 (patch) | |
tree | 9fb70119c550c0291e330461e55608ef70a6e37b | |
parent | 674aa1fc9519ea82df248ef2925a2b78af10fa3a (diff) | |
download | fluxbox-7b65db91729534a80d777094927a767eb8849da2.zip fluxbox-7b65db91729534a80d777094927a767eb8849da2.tar.bz2 |
fixed getHeight
-rw-r--r-- | src/Basemenu.cc | 8 |
1 files 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 @@ | |||
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: Basemenu.cc,v 1.20 2002/04/08 22:37:49 fluxgen Exp $ | 25 | // $Id: Basemenu.cc,v 1.21 2002/04/09 12:22:06 fluxgen Exp $ |
26 | 26 | ||
27 | //use GNU extensions | 27 | //use GNU extensions |
28 | #ifndef _GNU_SOURCE | 28 | #ifndef _GNU_SOURCE |
@@ -589,7 +589,7 @@ void Basemenu::drawSubmenu(unsigned int index) { | |||
589 | y = head_y; | 589 | y = head_y; |
590 | #else // !XINERAMA | 590 | #else // !XINERAMA |
591 | 591 | ||
592 | if ((x + item->submenu()->width()) > m_screen->width()) { | 592 | if ((x + item->submenu()->width()) > m_screen->getWidth()) { |
593 | x = ((shifted) ? menu.x_shift : menu.x) - | 593 | x = ((shifted) ? menu.x_shift : menu.x) - |
594 | item->submenu()->width() - m_screen->getBorderWidth(); | 594 | item->submenu()->width() - m_screen->getBorderWidth(); |
595 | } | 595 | } |
@@ -597,8 +597,8 @@ void Basemenu::drawSubmenu(unsigned int index) { | |||
597 | if (x < 0) | 597 | if (x < 0) |
598 | x = 0; | 598 | x = 0; |
599 | 599 | ||
600 | if ((y + item->submenu()->getHeight()) > m_screen->getHeight()) { | 600 | if ((y + item->submenu()->height()) > m_screen->getHeight()) { |
601 | y = m_screen->getHeight() - item->submenu()->getHeight() - | 601 | y = m_screen->getHeight() - item->submenu()->height() - |
602 | m_screen->getBorderWidth2x(); | 602 | m_screen->getBorderWidth2x(); |
603 | } | 603 | } |
604 | 604 | ||