Fix occasional highlighting of menu nops+separators, sf.net patch

 #1475268 (thanks Scott Kuhl; skuhl AT cs utah edu)

3 files changed, 6 insertions, 3 deletions

diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc
index b08bfe9..d99c9ba 100644
--- a/src/FbTk/Menu.cc
+++ b/src/FbTk/Menu.cc
@@ -1182,7 +1182,7 @@ void Menu::openSubmenu() {
         return;
 
     int item = m_which_sbl * menu.persub + m_which_press;
-    if (!validIndex(item))
+    if (!validIndex(item) || !menuitems[item]->isEnabled())
         return;
 
     clearItem(item);
diff --git a/src/FbTk/MenuSeparator.cc b/src/FbTk/MenuSeparator.cc
index 34c97fe..be43a87 100644
--- a/src/FbTk/MenuSeparator.cc
+++ b/src/FbTk/MenuSeparator.cc
@@ -38,8 +38,10 @@ void MenuSeparator::draw(FbDrawable &drawable,
 
     if (draw_background) {
         const GContext &tgc =
-            (highlight ? theme.hiliteTextGC() :
-             (isEnabled() ? theme.frameTextGC() : theme.disableTextGC() ) );
+// its a separator, it shouldn't be highlighted! or shown as disabled
+//            (highlight ? theme.hiliteTextGC() :
+//             (isEnabled() ? theme.frameTextGC() : theme.disableTextGC() ) );
+            theme.frameTextGC();
 
         drawable.drawRectangle(tgc.gc(),
                                x + theme.bevelWidth() + height + 1, y + height / 2,
diff --git a/src/FbTk/MenuSeparator.hh b/src/FbTk/MenuSeparator.hh
index c35efc4..38f15d3 100644
--- a/src/FbTk/MenuSeparator.hh
+++ b/src/FbTk/MenuSeparator.hh
@@ -36,6 +36,7 @@ public:
                       bool highlight, bool draw_foreground, bool draw_background,
                       int x, int y,
                       unsigned int width, unsigned int height) const;
+    virtual inline bool isEnabled() const { return false; }
 
 };