diff options
author | fluxgen <fluxgen> | 2002-10-19 14:00:09 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2002-10-19 14:00:09 (GMT) |
commit | 28b84d6fc03587ffacfcc575323e9113ae172be3 (patch) | |
tree | 4bc624c5399a61c1b346521b584b6388c5c6731b | |
parent | 38253628c20a4ffcc9bc779f6988648ce0c46710 (diff) | |
download | fluxbox-28b84d6fc03587ffacfcc575323e9113ae172be3.zip fluxbox-28b84d6fc03587ffacfcc575323e9113ae172be3.tar.bz2 |
using ascent and descent again
-rw-r--r-- | src/Basemenu.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Basemenu.cc b/src/Basemenu.cc index 2c3cb22..d37a81e 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.31 2002/10/13 22:37:14 fluxgen Exp $ | 25 | // $Id: Basemenu.cc,v 1.32 2002/10/19 14:00:09 fluxgen Exp $ |
26 | 26 | ||
27 | //use GNU extensions | 27 | //use GNU extensions |
28 | #ifndef _GNU_SOURCE | 28 | #ifndef _GNU_SOURCE |
@@ -467,7 +467,7 @@ void Basemenu::redrawTitle() { | |||
467 | m_screen->getScreenNumber(), | 467 | m_screen->getScreenNumber(), |
468 | m_screen->getMenuStyle()->t_text_gc, // graphic context | 468 | m_screen->getMenuStyle()->t_text_gc, // graphic context |
469 | text, len, // text string with lenght | 469 | text, len, // text string with lenght |
470 | dx, m_screen->getMenuStyle()->titlefont.height() + menu.bevel_w/2); // position | 470 | dx, m_screen->getMenuStyle()->titlefont.ascent() + menu.bevel_w); // position |
471 | 471 | ||
472 | 472 | ||
473 | } | 473 | } |
@@ -613,7 +613,7 @@ void Basemenu::drawItem(unsigned int index, bool highlight, bool clear, | |||
613 | if (text) { | 613 | if (text) { |
614 | text_w = m_screen->getMenuStyle()->framefont.textWidth(text, len); | 614 | text_w = m_screen->getMenuStyle()->framefont.textWidth(text, len); |
615 | 615 | ||
616 | text_y = item_y + menu.bevel_w/4 + m_screen->getMenuStyle()->framefont.height(); | 616 | text_y = item_y + menu.bevel_w/2 + m_screen->getMenuStyle()->framefont.ascent(); |
617 | 617 | ||
618 | switch(m_screen->getMenuStyle()->framefont_justify) { | 618 | switch(m_screen->getMenuStyle()->framefont_justify) { |
619 | case DrawUtil::Font::LEFT: | 619 | case DrawUtil::Font::LEFT: |