Mercurial > octave

changeset 25241:e74d85f7ac47 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change Documentation shortcut context to not interfere with Editor (bug #53640). * documentation.cc (documentation::documentation): For all shortcut keys, make the octave_dock_widget container the parent and change the context from Qt::WindowShortcut to Qt::WidgetWithChildrenShortcut.
author Daniel J Sebald <daniel.sebald@ieee.org>
date Fri, 13 Apr 2018 11:50:56 -0500
parents 23eab5ced171
children e5341aff3cb8
files libgui/src/documentation.cc
diffstat 1 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/src/documentation.cc	Fri Apr 13 07:49:44 2018 -0700
+++ b/libgui/src/documentation.cc	Fri Apr 13 11:50:56 2018 -0500
@@ -133,26 +133,26 @@
     v_box_browser_find->addWidget (find_footer);
     browser_find->setLayout (v_box_browser_find);
 
-    QShortcut *show_shortcut = new QShortcut (QKeySequence (QKeySequence::Find), browser_find);
-    show_shortcut->setContext(Qt::WindowShortcut);
+    QShortcut *show_shortcut = new QShortcut (QKeySequence (QKeySequence::Find), p);
+    show_shortcut->setContext (Qt::WidgetWithChildrenShortcut);
     connect (show_shortcut, SIGNAL (activated (void)),
              m_find_line_edit->parentWidget (), SLOT (show (void)));
     connect (show_shortcut, SIGNAL (activated (void)),
              m_find_line_edit, SLOT (selectAll (void)));
     connect (show_shortcut, SIGNAL (activated (void)),
              m_find_line_edit, SLOT (setFocus (void)));
-    QShortcut *hide_shortcut = new QShortcut (QKeySequence (tr ("Escape")), m_find_line_edit);
-    hide_shortcut->setContext(Qt::WindowShortcut);
+    QShortcut *hide_shortcut = new QShortcut (QKeySequence (tr ("Escape")), p);
+    hide_shortcut->setContext (Qt::WidgetWithChildrenShortcut);
     connect (hide_shortcut, SIGNAL (activated (void)),
              m_find_line_edit->parentWidget (), SLOT(hide (void)));
     connect (hide_shortcut, SIGNAL (activated (void)),
              m_doc_browser, SLOT (setFocus (void)));
-    QShortcut *findnext_shortcut = new QShortcut (QKeySequence (QKeySequence::FindNext), browser_find);
-    findnext_shortcut->setContext(Qt::WindowShortcut);
+    QShortcut *findnext_shortcut = new QShortcut (QKeySequence (QKeySequence::FindNext), p);
+    findnext_shortcut->setContext (Qt::WidgetWithChildrenShortcut);
     connect (findnext_shortcut, SIGNAL (activated (void)),
              this, SLOT(find_forward (void)));
-    QShortcut *findprev_shortcut = new QShortcut (QKeySequence (QKeySequence::FindPrevious), browser_find);
-    findprev_shortcut->setContext(Qt::WindowShortcut);
+    QShortcut *findprev_shortcut = new QShortcut (QKeySequence (QKeySequence::FindPrevious), p);
+    findprev_shortcut->setContext (Qt::WidgetWithChildrenShortcut);
     connect (findprev_shortcut, SIGNAL (activated (void)),
              this, SLOT(find_backward (void)));
     find_footer->hide ();