a few random fixes

3 files changed, 16 insertions, 7 deletions

diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc
index 18c3b75..5fe8e36 100644
--- a/src/FbTk/Menu.cc
+++ b/src/FbTk/Menu.cc
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Menu.cc,v 1.74 2004/08/28 19:03:09 rathnor Exp $
+// $Id: Menu.cc,v 1.75 2004/08/29 08:33:13 rathnor Exp $
 
 //use GNU extensions
 #ifndef  _GNU_SOURCE
@@ -777,12 +777,14 @@ void Menu::redrawTitle() {
                              0, 0,
                              m_title_pm.width(), m_title_pm.height());
 
+    // difference between height based on font, and style-set height
+    int height_offset = theme().titleHeight() - (font.height() + 2*theme().bevelWidth());
     menu.title.updateTransparent();
     font.drawText(m_real_title_pm.drawable(), // drawable
                   screenNumber(),
                   theme().titleTextGC().gc(), // graphic context
-                  text, len,  // text string with lenght
-                  dx, theme().titleHeight()/2 + (font.ascent() - theme().bevelWidth())/2);  // position
+                  text, len,  // text string with length
+                  dx, font.ascent() + theme().bevelWidth() + height_offset/2);  // position
 }
 
 
@@ -1196,6 +1198,9 @@ void Menu::motionNotifyEvent(XMotionEvent &me) {
         int sbl = (me.x / menu.item_w), 
             i = (me.y / theme().itemHeight()),
             w = (sbl * menu.persub) + i;
+
+        if (w == m_active_index)
+            return;
        
         if (validIndex(m_active_index) && w != m_active_index) {
 
diff --git a/src/FbTk/MenuItem.cc b/src/FbTk/MenuItem.cc
index 898bf99..ee1db93 100644
--- a/src/FbTk/MenuItem.cc
+++ b/src/FbTk/MenuItem.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: MenuItem.cc,v 1.5 2004/08/03 21:31:31 fluxgen Exp $
+// $Id: MenuItem.cc,v 1.6 2004/08/29 08:33:13 rathnor Exp $
 
 #include "MenuItem.hh"
 #include "Command.hh"
@@ -91,7 +91,8 @@ void MenuItem::draw(FbDrawable &draw,
 
     int text_w = theme.frameFont().textWidth(label().c_str(), label().size());
     
-    text_y = y - theme.bevelWidth()/2 + theme.frameFont().ascent()/2 + height/2;
+    int height_offset = theme.itemHeight() - (theme.frameFont().height() + 2*theme.bevelWidth());
+    text_y = y + theme.bevelWidth() + theme.frameFont().ascent() + height_offset/2; ///2 + height/2;
 
     switch(theme.frameFontJustify()) {
     case FbTk::LEFT:
diff --git a/src/FbTk/XftFontImp.cc b/src/FbTk/XftFontImp.cc
index c698238..c2f1dc8 100644
--- a/src/FbTk/XftFontImp.cc
+++ b/src/FbTk/XftFontImp.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-//$Id: XftFontImp.cc,v 1.3 2004/08/10 11:57:35 fluxgen Exp $
+//$Id: XftFontImp.cc,v 1.4 2004/08/29 08:33:13 rathnor Exp $
 
 #include "XftFontImp.hh"
 #include "App.hh"
@@ -157,7 +157,10 @@ unsigned int XftFontImp::textWidth(const char * const text, unsigned int len) co
 unsigned int XftFontImp::height() const {
     if (m_xftfont == 0)
         return 0;
-    return m_xftfont->height;
+    return m_xftfont->height; 
+    //m_xftfont->ascent + m_xftfont->descent;
+    // curiously, fonts seem to have a smaller height, but the "height"
+    // is specified within the actual font, so it must be right, right?
 }
 
 }; // end namespace FbTk