noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-21 22:24:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

change around variables names to make things a bit more clear

Browse source
This commit is contained in:
Rasmus Karlsson 2018-03-05 22:49:19 +01:00
parent ab42a30108
commit ad12a818b2
3 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/singletons/helper/completionmodel.cpp
View file

@ -17,7 +17,7 @@ CompletionModel::CompletionModel(const QString &_channelName)
void CompletionModel::refresh() void CompletionModel::refresh()
{ {
// debug::Log("[CompletionModel:{}] Refreshing...]", this->channelName); debug::Log("[CompletionModel:{}] Refreshing...]", this->channelName);
auto &emoteManager = singletons::EmoteManager::getInstance(); auto &emoteManager = singletons::EmoteManager::getInstance();

9
src/widgets/helper/resizingtextedit.cpp
View file

@ -99,12 +99,11 @@ void ResizingTextEdit::keyPressEvent(QKeyEvent *event)
auto *completionModel = auto *completionModel =
static_cast<chatterino::singletons::CompletionModel *>(this->completer->model()); static_cast<chatterino::singletons::CompletionModel *>(this->completer->model());
if (!this->nextCompletion) { if (!this->completionInProgress) {
// First type pressing tab after modifying a message, we refresh our completion model
completionModel->refresh(); completionModel->refresh();
this->completer->setModel(completionModel); this->completionInProgress = true;
// first selection
this->completer->setCompletionPrefix(currentCompletionPrefix); this->completer->setCompletionPrefix(currentCompletionPrefix);
this->nextCompletion = true;
this->completer->complete(); this->completer->complete();
return; return;
} }
@ -122,7 +121,7 @@ void ResizingTextEdit::keyPressEvent(QKeyEvent *event)
// (hemirt) // (hemirt)
// this resets the selection in the completion list, it should probably only trigger on actual // this resets the selection in the completion list, it should probably only trigger on actual
// chat input (space, character) and not on every key input (pressing alt for example) // chat input (space, character) and not on every key input (pressing alt for example)
this->nextCompletion = false; this->completionInProgress = false;
if (!event->isAccepted()) { if (!event->isAccepted()) {
QTextEdit::keyPressEvent(event); QTextEdit::keyPressEvent(event);

3
src/widgets/helper/resizingtextedit.hpp
View file

@ -25,12 +25,11 @@ protected:
private: private:
QCompleter *completer = nullptr; QCompleter *completer = nullptr;
bool completionInProgress = false;
// hadSpace is set to true in case the "textUnderCursor" word was after a space // hadSpace is set to true in case the "textUnderCursor" word was after a space
QString textUnderCursor(bool *hadSpace = nullptr) const; QString textUnderCursor(bool *hadSpace = nullptr) const;
bool nextCompletion = false;
private slots: private slots:
void insertCompletion(const QString &completion); void insertCompletion(const QString &completion);
}; };