logic: Fixed spaces not working in search bar
The QShortcut members of QtMainWindow did not propagate the keypress events further. The keyPressEvent of QtMainWindow is now used instead.
This commit is contained in:
@@ -155,8 +155,6 @@ QtMainWindow::QtMainWindow()
|
||||
setupViewMenu();
|
||||
setupHelpMenu();
|
||||
|
||||
setupShortcuts();
|
||||
|
||||
// Need to call loadLayout here for right DockWidget size on Linux
|
||||
// Seconde call is in Application.cpp
|
||||
loadLayout();
|
||||
@@ -301,9 +299,19 @@ bool QtMainWindow::event(QEvent* event)
|
||||
|
||||
void QtMainWindow::keyPressEvent(QKeyEvent* event)
|
||||
{
|
||||
if (event->key() == Qt::Key_Backspace)
|
||||
switch (event->key())
|
||||
{
|
||||
MessageUndo().dispatch();
|
||||
case Qt::Key_Backspace:
|
||||
MessageUndo().dispatch();
|
||||
break;
|
||||
|
||||
case Qt::Key_Escape:
|
||||
MessageInterruptTasks().dispatch();
|
||||
break;
|
||||
|
||||
case Qt::Key_Space:
|
||||
PRINT_TRACES();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -503,16 +511,6 @@ void QtMainWindow::toggleView(View* view, bool fromMenu)
|
||||
}
|
||||
}
|
||||
|
||||
void QtMainWindow::handleEscapeShortcut()
|
||||
{
|
||||
MessageInterruptTasks().dispatch();
|
||||
}
|
||||
|
||||
void QtMainWindow::handleSpaceShortcut()
|
||||
{
|
||||
PRINT_TRACES();
|
||||
}
|
||||
|
||||
void QtMainWindow::setupProjectMenu()
|
||||
{
|
||||
QMenu *menu = new QMenu(tr("&Project"), this);
|
||||
@@ -664,15 +662,6 @@ void QtMainWindow::setupHelpMenu()
|
||||
}
|
||||
}
|
||||
|
||||
void QtMainWindow::setupShortcuts()
|
||||
{
|
||||
m_escapeShortcut = new QShortcut(QKeySequence(Qt::Key_Escape), this);
|
||||
connect(m_escapeShortcut, SIGNAL(activated()), SLOT(handleEscapeShortcut()));
|
||||
|
||||
m_spaceShortcut = new QShortcut(QKeySequence(Qt::Key_Space), this);
|
||||
connect(m_spaceShortcut, SIGNAL(activated()), SLOT(handleSpaceShortcut()));
|
||||
}
|
||||
|
||||
QtMainWindow::DockWidget* QtMainWindow::getDockWidgetForView(View* view)
|
||||
{
|
||||
for (DockWidget& dock : m_dockWidgets)
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
#include <vector>
|
||||
|
||||
#include <QMainWindow>
|
||||
#include <QShortcut>
|
||||
|
||||
#include "qt/utility/QtThreadedFunctor.h"
|
||||
#include "qt/window/QtWindowStack.h"
|
||||
@@ -130,9 +129,6 @@ public slots:
|
||||
|
||||
void toggleView(View* view, bool fromMenu);
|
||||
|
||||
void handleEscapeShortcut();
|
||||
void handleSpaceShortcut();
|
||||
|
||||
void updateRecentProjectMenu();
|
||||
|
||||
private slots:
|
||||
@@ -152,8 +148,6 @@ private:
|
||||
void setupViewMenu();
|
||||
void setupHelpMenu();
|
||||
|
||||
void setupShortcuts();
|
||||
|
||||
DockWidget* getDockWidgetForView(View* view);
|
||||
|
||||
void setShowDockWidgetTitleBars(bool showTitleBars);
|
||||
@@ -169,9 +163,6 @@ private:
|
||||
bool m_showDockWidgetTitleBars;
|
||||
|
||||
QtWindowStack m_windowStack;
|
||||
|
||||
QShortcut* m_escapeShortcut;
|
||||
QShortcut* m_spaceShortcut;
|
||||
};
|
||||
|
||||
#endif // QT_MAIN_WINDOW_H
|
||||
|
||||
Reference in New Issue
Block a user