summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJani Mustonen <janijohannes@kapsi.fi>2017-11-03 08:54:17 +0200
committermujx <mujx@users.noreply.github.com>2017-11-03 08:54:17 +0200
commit13cb0521fa4fd692f66a89c83ef17b7e3ea339bb (patch)
tree632e0721e88b301e2ed7b45a10e9f48bf18004f6 /include
parentbeda0db543208a5ca7ad2b132625b21055a35f95 (diff)
Improvements to the quick switcher (#109)
- Ghetto disambiguation for the quick switcher - Fix the Ctrl+K shortcut - Fix keyboard focus when the quick switcher is closed fixes #114
Diffstat (limited to 'include')
-rw-r--r--include/MainWindow.h1
-rw-r--r--include/TextInputWidget.h3
2 files changed, 3 insertions, 1 deletions
diff --git a/include/MainWindow.h b/include/MainWindow.h
index 21530d07..2d047b51 100644
--- a/include/MainWindow.h
+++ b/include/MainWindow.h
@@ -47,7 +47,6 @@ public:
protected:
void closeEvent(QCloseEvent *event);
- void keyPressEvent(QKeyEvent *event);
private slots:
// Handle interaction with the tray icon.
diff --git a/include/TextInputWidget.h b/include/TextInputWidget.h
index e32ce2ff..32da6ba3 100644
--- a/include/TextInputWidget.h
+++ b/include/TextInputWidget.h
@@ -79,6 +79,9 @@ signals:
void startedTyping();
void stoppedTyping();
+protected:
+ void focusInEvent(QFocusEvent *event);
+
private:
void showUploadSpinner();
QString parseEmoteCommand(const QString &cmd);