noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #686 from 23rd/patch-8-fixed-down-arrow

Browse source 
Fixed down key in input field.
This commit is contained in:
pajlada 2018-08-29 10:24:47 +02:00 committed by GitHub
parent 873b0b3c67 bfe87b699a
commit 597a8eeb2b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/widgets/splits/SplitInput.cpp
View file

@ -189,8 +189,7 @@ void SplitInput::installKeyPressedEvent()
this->currMsg_ = QString(); this->currMsg_ = QString();
this->ui_.textEdit->setText(QString()); this->ui_.textEdit->setText(QString());
this->prevIndex_ = 0; this->prevIndex_ = 0;
} else if (this->ui_.textEdit->toPlainText() == } else if (message == this->prevMsg_.at(this->prevMsg_.size() - 1)) {
this->prevMsg_.at(this->prevMsg_.size() - 1)) {
this->prevMsg_.removeLast(); this->prevMsg_.removeLast();
} }
this->prevIndex_ = this->prevMsg_.size(); this->prevIndex_ = this->prevMsg_.size();
@ -230,6 +229,13 @@ void SplitInput::installKeyPressedEvent()
page->selectNextSplit(SplitContainer::Below); page->selectNextSplit(SplitContainer::Below);
} }
} else { } else {
// If user did not write anything before then just do nothing.
if (this->prevMsg_.isEmpty()) {
return;
}
bool cursorToEnd = true;
QString message = ui_.textEdit->toPlainText();
if (this->prevIndex_ != (this->prevMsg_.size() - 1) && if (this->prevIndex_ != (this->prevMsg_.size() - 1) &&
this->prevIndex_ != this->prevMsg_.size()) { this->prevIndex_ != this->prevMsg_.size()) {
this->prevIndex_++; this->prevIndex_++;
@ -237,13 +243,27 @@ void SplitInput::installKeyPressedEvent()
this->prevMsg_.at(this->prevIndex_)); this->prevMsg_.at(this->prevIndex_));
} else { } else {
this->prevIndex_ = this->prevMsg_.size(); this->prevIndex_ = this->prevMsg_.size();
if (message == this->prevMsg_.at(this->prevIndex_ - 1)) {
// If user has just come from a message history
// Then simply get currMsg_.
this->ui_.textEdit->setText(this->currMsg_); this->ui_.textEdit->setText(this->currMsg_);
} else if (message != this->currMsg_) {
// If user are already in current message
// And type something new
// Then replace currMsg_ with new one.
this->currMsg_ = message;
}
// If user is already in current message
// Then don't touch cursos.
cursorToEnd = (message == this->prevMsg_.at(this->prevIndex_ - 1));
} }
if (cursorToEnd) {
QTextCursor cursor = this->ui_.textEdit->textCursor(); QTextCursor cursor = this->ui_.textEdit->textCursor();
cursor.movePosition(QTextCursor::End); cursor.movePosition(QTextCursor::End);
this->ui_.textEdit->setTextCursor(cursor); this->ui_.textEdit->setTextCursor(cursor);
} }
}
} else if (event->key() == Qt::Key_Left) { } else if (event->key() == Qt::Key_Left) {
if (event->modifiers() == Qt::AltModifier) { if (event->modifiers() == Qt::AltModifier) {
SplitContainer *page = this->split_->getContainer(); SplitContainer *page = this->split_->getContainer();