From ef78f27f8634058c206e5c474229f7f1fad39be7 Mon Sep 17 00:00:00 2001 From: RadRussianRus Date: Sun, 11 Sep 2022 05:46:53 +0300 Subject: [PATCH] [Improvement] Allow to mention by name from autocomplete --- .../chat_helpers/field_autocomplete.cpp | 26 ++++++++++++++++--- .../chat_helpers/field_autocomplete.h | 3 +++ .../SourceFiles/history/history_widget.cpp | 11 +++++--- .../history_view_compose_controls.cpp | 5 +++- Telegram/SourceFiles/mainwidget.cpp | 2 +- 5 files changed, 38 insertions(+), 9 deletions(-) diff --git a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp index 382d850e3..33b2d1003 100644 --- a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp +++ b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp @@ -837,6 +837,10 @@ bool FieldAutocomplete::eventFilter(QObject *obj, QEvent *e) { ? _moderateKeyActivateCallback(key) : false; } + } else if (ev->modifiers() & Qt::ControlModifier) { + if (ev->key() == Qt::Key_Enter || ev->key() == Qt::Key_Return) { + return _inner->chooseSelected(ChooseMethod::ByCtrlEnter); + } } } return QWidget::eventFilter(obj, e); @@ -1260,7 +1264,7 @@ void FieldAutocomplete::Inner::setRecentInlineBotsInRows(int32 bots) { void FieldAutocomplete::Inner::mousePressEvent(QMouseEvent *e) { selectByMouse(e->globalPos()); - if (e->button() == Qt::LeftButton) { + if (e->button() == Qt::LeftButton || e->button() == Qt::RightButton) { if (_overDelete && _sel >= 0 && _sel < (_mrows->empty() ? _hrows->size() : _recentInlineBotsInRows)) { bool removed = false; if (_mrows->empty()) { @@ -1290,7 +1294,15 @@ void FieldAutocomplete::Inner::mousePressEvent(QMouseEvent *e) { selectByMouse(e->globalPos()); } else if (_srows->empty()) { - chooseSelected(FieldAutocomplete::ChooseMethod::ByClick); + if (e->button() == Qt::LeftButton) { + if (e->modifiers() & Qt::ControlModifier) { + chooseSelected(FieldAutocomplete::ChooseMethod::ByCtrlClick); + } else { + chooseSelected(FieldAutocomplete::ChooseMethod::ByClick); + } + } else if (e->button() == Qt::RightButton) { + chooseSelected(FieldAutocomplete::ChooseMethod::ByRightClick); + } } else { _down = _sel; _previewTimer.callOnce(QApplication::startDragTime()); @@ -1313,7 +1325,15 @@ void FieldAutocomplete::Inner::mouseReleaseEvent(QMouseEvent *e) { if (_sel < 0 || _sel != pressed || _srows->empty()) return; - chooseSelected(FieldAutocomplete::ChooseMethod::ByClick); + if (e->button() == Qt::LeftButton) { + if (e->modifiers() & Qt::ControlModifier) { + chooseSelected(FieldAutocomplete::ChooseMethod::ByCtrlClick); + } else { + chooseSelected(FieldAutocomplete::ChooseMethod::ByClick); + } + } else if (e->button() == Qt::RightButton) { + chooseSelected(FieldAutocomplete::ChooseMethod::ByRightClick); + } } void FieldAutocomplete::Inner::contextMenuEvent(QContextMenuEvent *e) { diff --git a/Telegram/SourceFiles/chat_helpers/field_autocomplete.h b/Telegram/SourceFiles/chat_helpers/field_autocomplete.h index 2606dc1f2..f323b9e8e 100644 --- a/Telegram/SourceFiles/chat_helpers/field_autocomplete.h +++ b/Telegram/SourceFiles/chat_helpers/field_autocomplete.h @@ -85,6 +85,9 @@ public: ByEnter, ByTab, ByClick, + ByRightClick, + ByCtrlEnter, + ByCtrlClick, }; struct MentionChosen { not_null user; diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp index 1687424b2..b7c28d1ab 100644 --- a/Telegram/SourceFiles/history/history_widget.cpp +++ b/Telegram/SourceFiles/history/history_widget.cpp @@ -411,7 +411,10 @@ HistoryWidget::HistoryWidget( ) | rpl::start_with_next([=](FieldAutocomplete::MentionChosen data) { auto replacement = QString(); auto entityTag = QString(); - if (data.mention.isEmpty()) { + if (data.mention.isEmpty() + || data.method == FieldAutocomplete::ChooseMethod::ByRightClick + || data.method == FieldAutocomplete::ChooseMethod::ByCtrlEnter + || data.method == FieldAutocomplete::ChooseMethod::ByCtrlClick) { replacement = data.user->firstName; if (replacement.isEmpty()) { replacement = data.user->name(); @@ -7509,14 +7512,14 @@ void HistoryWidget::mentionUser(PeerData *peer) { const auto user = peer->asUser(); QString replacement, entityTag; - if (user->username.isEmpty()) { + if (user->username().isEmpty()) { replacement = user->firstName; if (replacement.isEmpty()) { - replacement = user->name; + replacement = user->name(); } entityTag = PrepareMentionTag(user); } else { - replacement = '@' + user->username; + replacement = '@' + user->username(); } _field->insertTag(replacement, entityTag); } diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp index 8ee1d781d..91fa06b0a 100644 --- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp +++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp @@ -1630,7 +1630,10 @@ void ComposeControls::initAutocomplete() { _autocomplete->mentionChosen( ) | rpl::start_with_next([=](FieldAutocomplete::MentionChosen data) { const auto user = data.user; - if (data.mention.isEmpty()) { + if (data.mention.isEmpty() + || data.method == FieldAutocomplete::ChooseMethod::ByRightClick + || data.method == FieldAutocomplete::ChooseMethod::ByCtrlEnter + || data.method == FieldAutocomplete::ChooseMethod::ByCtrlClick) { _field->insertTag( user->firstName.isEmpty() ? user->name() : user->firstName, PrepareMentionTag(user)); diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp index 5f021978a..bdf26eab6 100644 --- a/Telegram/SourceFiles/mainwidget.cpp +++ b/Telegram/SourceFiles/mainwidget.cpp @@ -2698,7 +2698,7 @@ int MainWidget::backgroundFromY() const { } void MainWidget::mentionUser(PeerData *peer) { - if (!_history->peer() || !_history->peer()->canWrite()) { + if (!_history->peer() || !Data::CanSendTexts(_history->peer())) { return; }