Do not use toobar menu as fallback context menu

This is a consequence of 060a9664, although it is not clear why. The
contextMenuEvent code of the workarea should not delegate context
menu when it cannot honor it.

Also fix a small memory leak.

Fixes bug #10616.

(cherry picked from commit ab81c23656b59aa14c41b8acc45f0f3e410ed785)

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index 8d8ca5916a11aab68648cd3ef37686e747bfcbbb..bb54b0aa5cf0c2a3613d32b6c4d632637cf38f5b 100644 (file)
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -3361,8 +3361,7 @@ bool GuiView::goToFileRow(string const & argument)
 
 void GuiView::toolBarPopup(const QPoint & /*pos*/)
 {
-       QMenu * menu = new QMenu;
-       menu = guiApp->menus().menu(toqstr("context-toolbars"), * this);
+       QMenu * menu = guiApp->menus().menu(toqstr("context-toolbars"), * this);
        menu->exec(QCursor::pos());
 }
 

diff --git a/src/frontends/qt4/GuiWorkArea.cpp b/src/frontends/qt4/GuiWorkArea.cpp
index 6bf68cd09ad490b347e5088b2c40fbbdb3aafc9f..bfedecc182b288f3781370f1810d8e936d1d040e 100644 (file)
--- a/src/frontends/qt4/GuiWorkArea.cpp
+++ b/src/frontends/qt4/GuiWorkArea.cpp
@@ -784,7 +784,7 @@ void GuiWorkArea::contextMenuEvent(QContextMenuEvent * e)
        }
        
        if (name.empty()) {
-               QAbstractScrollArea::contextMenuEvent(e);
+               e->accept();
                return;
        }
        // always show mnemonics when the keyboard is used to show the context menu
@@ -792,7 +792,7 @@ void GuiWorkArea::contextMenuEvent(QContextMenuEvent * e)
        bool const keyboard = (e->reason() == QContextMenuEvent::Keyboard);
        QMenu * menu = guiApp->menus().menu(toqstr(name), *d->lyx_view_, keyboard);
        if (!menu) {
-               QAbstractScrollArea::contextMenuEvent(e);
+               e->accept();
                return;
        }
        // Position the menu to the right.

diff --git a/status.22x b/status.22x
index 72e014bef1352143d5c3f09601b2c75456c169d6..6a06b68d03049f39023771a7c461ed17b915d9af 100644 (file)
--- a/status.22x
+++ b/status.22x
@@ -100,6 +100,8 @@ What's new
 
 - Don't swallow labels not entered through the toolbar in mathed (bug 10546).
 
+- Fix bad context menu on insets that do not have one (bug 10626).
+
 
 * INTERNALS