chatterino2
Code Issues

Clean up/refactor InputCompletionPopup (#4242)

Browse Source 
Mainly flattening anon namespaces & respecting clang-tidy
This commit is contained in:
pajlada
2022-12-18 14:25:11 +01:00
committed by GitHub
parent 2de1437bdf
commit 8830b0e01c
5 changed files with 126 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/widgets/splits/SplitInput.cpp
+28 -12
View File
@@ -625,7 +625,7 @@ void SplitInput::installKeyPressedEvent()
{
this->ui_.textEdit->keyPressed.disconnectAll();
this->ui_.textEdit->keyPressed.connect([this](QKeyEvent *event) {
if (auto popup = this->inputCompletionPopup_.get())
if (auto *popup = this->inputCompletionPopup_.get())
{
if (popup->isVisible())
{
@@ -674,11 +674,11 @@ void SplitInput::onCursorPositionChanged()
void SplitInput::updateCompletionPopup()
{
auto channel = this->split_->getChannel().get();
auto tc = dynamic_cast<TwitchChannel *>(channel);
auto *channel = this->split_->getChannel().get();
auto *tc = dynamic_cast<TwitchChannel *>(channel);
bool showEmoteCompletion = getSettings()->emoteCompletionWithColon;
bool showUsernameCompletion =
tc && getSettings()->showUsernameCompletionMenu;
tc != nullptr && getSettings()->showUsernameCompletionMenu;
if (!showEmoteCompletion && !showUsernameCompletion)
{
this->hideCompletionPopup();
@@ -704,22 +704,32 @@ void SplitInput::updateCompletionPopup()
this->hideCompletionPopup();
return;
}
else if (text[i] == ':' && showEmoteCompletion)
if (text[i] == ':' && showEmoteCompletion)
{
if (i == 0 || text[i - 1].isSpace())
{
this->showCompletionPopup(text.mid(i, position - i + 1).mid(1),
true);
}
else
{
this->hideCompletionPopup();
}
return;
}
else if (text[i] == '@' && showUsernameCompletion)
if (text[i] == '@' && showUsernameCompletion)
{
if (i == 0 || text[i - 1].isSpace())
{
this->showCompletionPopup(text.mid(i, position - i + 1).mid(1),
false);
}
else
{
this->hideCompletionPopup();
}
return;
}
}
@@ -734,7 +744,7 @@ void SplitInput::showCompletionPopup(const QString &text, bool emoteCompletion)
this->inputCompletionPopup_ = new InputCompletionPopup(this);
this->inputCompletionPopup_->setInputAction(
[that = QObjectRef(this)](const QString &text) mutable {
if (auto this2 = that.get())
if (auto *this2 = that.get())
{
this2->insertCompletionText(text);
this2->hideCompletionPopup();
@@ -742,13 +752,17 @@ void SplitInput::showCompletionPopup(const QString &text, bool emoteCompletion)
});
}
auto popup = this->inputCompletionPopup_.get();
auto *popup = this->inputCompletionPopup_.get();
assert(popup);
if (emoteCompletion) // autocomplete emotes
if (emoteCompletion)
{
popup->updateEmotes(text, this->split_->getChannel());
else // autocomplete usernames
}
else
{
popup->updateUsers(text, this->split_->getChannel());
}
auto pos = this->mapToGlobal({0, 0}) - QPoint(0, popup->height()) +
QPoint((this->width() - popup->width()) / 2, 0);
@@ -759,11 +773,13 @@ void SplitInput::showCompletionPopup(const QString &text, bool emoteCompletion)
void SplitInput::hideCompletionPopup()
{
if (auto popup = this->inputCompletionPopup_.get())
if (auto *popup = this->inputCompletionPopup_.get())
{
popup->hide();
}
}
void SplitInput::insertCompletionText(const QString &input_)
void SplitInput::insertCompletionText(const QString &input_) const
{
auto &edit = *this->ui_.textEdit;
auto input = input_ + ' ';