aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2004-07-05 09:40:08 (GMT)
committerfluxgen <fluxgen>2004-07-05 09:40:08 (GMT)
commitdf570bc9452b24e963c38591cfcb185eb70a8a38 (patch)
tree6c1fc747126955503fb569afd00c740648ba22fe
parenta1e5cfa6f5153c358bbfef61484237d2141f77d8 (diff)
downloadfluxbox_paul-df570bc9452b24e963c38591cfcb185eb70a8a38.zip
fluxbox_paul-df570bc9452b24e963c38591cfcb185eb70a8a38.tar.bz2
fixed menutitle and menulables drawn to close to screen-bottom, patch from Mathias Gumz
-rw-r--r--src/FbTk/Menu.cc4
-rw-r--r--src/FbTk/MenuItem.cc4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc
index ac8d651..9109913 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.69 2004/06/27 13:50:24 fluxgen Exp $ 25// $Id: Menu.cc,v 1.70 2004/07/05 09:40:08 fluxgen Exp $
26 26
27//use GNU extensions 27//use GNU extensions
28#ifndef _GNU_SOURCE 28#ifndef _GNU_SOURCE
@@ -768,7 +768,7 @@ void Menu::redrawTitle() {
768 screenNumber(), 768 screenNumber(),
769 theme().titleTextGC().gc(), // graphic context 769 theme().titleTextGC().gc(), // graphic context
770 text, len, // text string with lenght 770 text, len, // text string with lenght
771 dx, theme().titleHeight()/2 + (font.ascent() + theme().bevelWidth())/2); // position 771 dx, theme().titleHeight()/2 + (font.ascent() - theme().bevelWidth())/2); // position
772} 772}
773 773
774 774
diff --git a/src/FbTk/MenuItem.cc b/src/FbTk/MenuItem.cc
index 0d5989f..be8555b 100644
--- a/src/FbTk/MenuItem.cc
+++ b/src/FbTk/MenuItem.cc
@@ -19,7 +19,7 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: MenuItem.cc,v 1.3 2004/06/10 11:40:43 fluxgen Exp $ 22// $Id: MenuItem.cc,v 1.4 2004/07/05 09:40:08 fluxgen Exp $
23 23
24#include "MenuItem.hh" 24#include "MenuItem.hh"
25#include "Command.hh" 25#include "Command.hh"
@@ -90,7 +90,7 @@ void MenuItem::draw(FbDrawable &draw,
90 90
91 int text_w = theme.frameFont().textWidth(label().c_str(), label().size()); 91 int text_w = theme.frameFont().textWidth(label().c_str(), label().size());
92 92
93 text_y = y + theme.bevelWidth()/2 + theme.frameFont().ascent()/2 + height/2; 93 text_y = y - theme.bevelWidth()/2 + theme.frameFont().ascent()/2 + height/2;
94 94
95 switch(theme.frameFontJustify()) { 95 switch(theme.frameFontJustify()) {
96 case FbTk::LEFT: 96 case FbTk::LEFT: