Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Don't use QCompleter prefix filter #4855

Merged
merged 5 commits into from
Oct 13, 2023
Merged

fix: Don't use QCompleter prefix filter #4855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cd02a42
Invalidate tab completion model when settings change
dnsge Oct 1, 2023
6b82e67
Remove true culprit
dnsge Oct 1, 2023
464e515
Update CHANGELOG.md
dnsge Oct 1, 2023
c90fd71
Remove QCompleter setFilterMode call
dnsge Oct 13, 2023
e87a5f3
Merge branch 'master' into fix/toggle-emote-setting-completion-thing
Felanbird Oct 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
- Bugfix: Fixed input in reply thread popup losing focus when dragging. (#4815)
- Bugfix: Fixed the Quick Switcher (CTRL+K) from sometimes showing up on the wrong window. (#4819)
- Bugfix: Fixed too much text being copied when copying chat messages. (#4812, #4830, #4839)
- Bugfix: Fixed an issue where the setting `Only search for emote autocompletion at the start of emote names` wouldn't disable if it was enabled when the client started. (#4855)
- Bugfix: Fixed empty page being added when showing out of bounds dialog. (#4849)
- Bugfix: Fixed issue on Windows preventing the title bar from being dragged in the top left corner. (#4873)
- Bugfix: Fixed an issue where reply context didn't render correctly if an emoji was touching text. (#4875)
Expand Down
16 changes: 3 additions & 13 deletions src/widgets/helper/ResizingTextEdit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,10 +152,10 @@ void ResizingTextEdit::keyPressEvent(QKeyEvent *event)
return;
}

QString currentCompletionPrefix = this->textUnderCursor();
QString currentCompletion = this->textUnderCursor();
Felanbird marked this conversation as resolved.
Show resolved Hide resolved

// check if there is something to complete
if (currentCompletionPrefix.size() <= 1)
if (currentCompletion.size() <= 1)
{
return;
}
Expand All @@ -170,13 +170,12 @@ void ResizingTextEdit::keyPressEvent(QKeyEvent *event)
// First type pressing tab after modifying a message, we refresh our
// completion model
this->completer_->setModel(completionModel);
completionModel->updateResults(currentCompletionPrefix,
completionModel->updateResults(currentCompletion,
this->isFirstWord());
this->completionInProgress_ = true;
{
// this blocks cursor movement events from resetting tab completion
QSignalBlocker dontTriggerCursorMovement(this);
this->completer_->setCompletionPrefix(currentCompletionPrefix);
this->completer_->complete();
}
return;
Expand Down Expand Up @@ -260,15 +259,6 @@ void ResizingTextEdit::setCompleter(QCompleter *c)
this->completer_->setCompletionMode(QCompleter::InlineCompletion);
this->completer_->setCaseSensitivity(Qt::CaseInsensitive);

if (getSettings()->prefixOnlyEmoteCompletion)
{
this->completer_->setFilterMode(Qt::MatchStartsWith);
}
else
{
this->completer_->setFilterMode(Qt::MatchContains);
}

QObject::connect(completer_,
static_cast<void (QCompleter::*)(const QString &)>(
&QCompleter::highlighted),
Expand Down
Loading