projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improve inputline behavior
[quassel.git]
/
src
/
qtui
/
bufferwidget.cpp
diff --git
a/src/qtui/bufferwidget.cpp
b/src/qtui/bufferwidget.cpp
index
a58723d
..
c514ab8
100644
(file)
--- a/
src/qtui/bufferwidget.cpp
+++ b/
src/qtui/bufferwidget.cpp
@@
-161,11
+161,12
@@
bool BufferWidget::eventFilter(QObject *watched, QEvent *event) {
QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
+ MultiLineEdit *inputLine = qobject_cast<MultiLineEdit *>(watched);
+ if(!inputLine)
+ return false;
+
// Intercept copy key presses
if(keyEvent == QKeySequence::Copy) {
// Intercept copy key presses
if(keyEvent == QKeySequence::Copy) {
- MultiLineEdit *inputLine = qobject_cast<MultiLineEdit *>(watched);
- if(!inputLine)
- return false;
if(inputLine->hasSelectedText())
return false;
ChatView *view = qobject_cast<ChatView *>(ui.stackedWidget->currentWidget());
if(inputLine->hasSelectedText())
return false;
ChatView *view = qobject_cast<ChatView *>(ui.stackedWidget->currentWidget());
@@
-174,6
+175,10
@@
bool BufferWidget::eventFilter(QObject *watched, QEvent *event) {
return true;
}
return true;
}
+ // We don't want to steal cursor movement keys if the input line is in multiline mode
+ if(!inputLine->isSingleLine())
+ return false;
+
switch(keyEvent->key()) {
case Qt::Key_Up:
case Qt::Key_Down:
switch(keyEvent->key()) {
case Qt::Key_Up:
case Qt::Key_Down: