Merge pull request #1544 from BigHeadGeorge/ctrl-end-resumes-scrolling

Control + End scrolls to the bottom of chat
This commit is contained in:
fourtf 2020-02-14 10:04:37 +01:00 committed by GitHub
commit 14427fe5a9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -9,6 +9,7 @@
#include "singletons/Theme.hpp" #include "singletons/Theme.hpp"
#include "util/LayoutCreator.hpp" #include "util/LayoutCreator.hpp"
#include "widgets/Notebook.hpp" #include "widgets/Notebook.hpp"
#include "widgets/Scrollbar.hpp"
#include "widgets/dialogs/EmotePopup.hpp" #include "widgets/dialogs/EmotePopup.hpp"
#include "widgets/helper/ChannelView.hpp" #include "widgets/helper/ChannelView.hpp"
#include "widgets/helper/EffectLabel.hpp" #include "widgets/helper/EffectLabel.hpp"
@ -266,6 +267,13 @@ void SplitInput::installKeyPressedEvent()
event->accept(); event->accept();
} }
else if (event->key() == Qt::Key_End) else if (event->key() == Qt::Key_End)
{
if (event->modifiers() == Qt::ControlModifier)
{
this->split_->getChannelView().getScrollBar().scrollToBottom(
getSettings()->enableSmoothScrollingNewMessages.getValue());
}
else
{ {
QTextCursor cursor = this->ui_.textEdit->textCursor(); QTextCursor cursor = this->ui_.textEdit->textCursor();
cursor.movePosition( cursor.movePosition(
@ -274,7 +282,7 @@ void SplitInput::installKeyPressedEvent()
? QTextCursor::MoveMode::KeepAnchor ? QTextCursor::MoveMode::KeepAnchor
: QTextCursor::MoveMode::MoveAnchor); : QTextCursor::MoveMode::MoveAnchor);
this->ui_.textEdit->setTextCursor(cursor); this->ui_.textEdit->setTextCursor(cursor);
}
event->accept(); event->accept();
} }
else if (event->key() == Qt::Key_H && else if (event->key() == Qt::Key_H &&