fix some menu drawing issues

2 files changed, 25 insertions, 4 deletions

diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc
index fbf7e45..e0e3e7f 100644
--- a/src/FbTk/Menu.cc
+++ b/src/FbTk/Menu.cc
@@ -475,7 +475,7 @@ void Menu::updateMenu(int active_index) {
     }
 
     menu.frame.moveResize(0, ((m_title_vis) ? menu.title.y() + menu.title.height() + 
-                              menu.title.borderWidth()*2 : 1), 
+                              menu.title.borderWidth()*2 : 0), 
                           width(), menu.frame_h);
 
     if (m_title_vis && m_need_update) {
@@ -927,6 +927,8 @@ void Menu::motionNotifyEvent(XMotionEvent &me) {
             }
 
             m_moving = m_torn = true;
+            // clear current highlighted item
+            clearItem(m_active_index);
 
             if (m_which_sub >= 0)
                 drawSubmenu(m_which_sub);
@@ -1238,7 +1240,8 @@ void Menu::clearItem(int index, bool clear) {
     int item_x = (sbl * item_w), item_y = (i * item_h);
     bool highlight = (index == m_active_index);
 
-    if (highlight) {
+    // don't highlight if moving, doesn't work with alpha on
+    if (highlight && !m_moving) {
         highlightItem(index);
         return;
     } else if (clear)
diff --git a/src/FbTk/MenuItem.hh b/src/FbTk/MenuItem.hh
index 20da8f7..b3b2f6b 100644
--- a/src/FbTk/MenuItem.hh
+++ b/src/FbTk/MenuItem.hh
@@ -42,6 +42,7 @@ class MenuItem {
 public:
     MenuItem()
         : m_label(""),
+          m_menu(0),
           m_submenu(0),
           m_enabled(true),
           m_selected(false),
@@ -50,14 +51,25 @@ public:
     explicit MenuItem(
              const char *label)
         : m_label(label ? label : ""),
+          m_menu(0),
+          m_submenu(0),
+          m_enabled(true),
+          m_selected(false),
+          m_toggle_item(false)
+    { }
+
+    MenuItem(const char *label, Menu &host_menu)
+        : m_label(label ? label : ""),
+          m_menu(&host_menu),
           m_submenu(0),
           m_enabled(true),
           m_selected(false),
           m_toggle_item(false)
     { }
     /// create a menu item with a specific command to be executed on click
-    MenuItem(const char *label, RefCount<Command> &cmd):
+    MenuItem(const char *label, RefCount<Command> &cmd, Menu *menu = 0):
         m_label(label ? label : ""),
+        m_menu(menu),
         m_submenu(0),
         m_command(cmd),
         m_enabled(true),
@@ -66,8 +78,9 @@ public:
                 
     }
 
-    MenuItem(const char *label, Menu *submenu)
+    MenuItem(const char *label, Menu *submenu, Menu *host_menu = 0)
         : m_label(label ? label : "")
+        , m_menu(host_menu)
         , m_submenu(submenu)
         , m_enabled(true)
         , m_selected(false),
@@ -110,9 +123,13 @@ public:
     RefCount<Command> &command() { return m_command; }
     const RefCount<Command> &command() const { return m_command; }
     //@}
+
+    void setMenu(Menu &menu) { m_menu = &menu; }
+    Menu *menu() { return m_menu; }
         
 private:
     std::string m_label; ///< label of this item
+    Menu *m_menu; ///< the menu we live in
     Menu *m_submenu; ///< a submenu, 0 if we don't have one
     RefCount<Command> m_command; ///< command to be executed
     bool m_enabled, m_selected;
@@ -123,6 +140,7 @@ private:
         std::string filename;
     };
     std::auto_ptr<Icon> m_icon;
+
 };
 
 } // end namespace FbTk