MrBesen/tdesktop
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't copy empty selected text.

Browse Source
This commit is contained in:
John Preston 2023-06-27 20:26:43 +04:00
parent b46659eb22
commit fda2f56fd8
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Telegram/SourceFiles/history/history_inner_widget.cpp
View File

@ -2341,7 +2341,8 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
const auto item = _dragStateItem; const auto item = _dragStateItem;
const auto itemId = item ? item->fullId() : FullMsgId(); const auto itemId = item ? item->fullId() : FullMsgId();
if (isUponSelected > 0) { if (isUponSelected > 0) {
if (!hasCopyRestrictionForSelected()) { if (!hasCopyRestrictionForSelected()
&& !getSelectedText().empty()) {
_menu->addAction( _menu->addAction(
(isUponSelected > 1 (isUponSelected > 1
? tr::lng_context_copy_selected_items(tr::now) ? tr::lng_context_copy_selected_items(tr::now)
@ -2442,7 +2443,8 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
: QString(); : QString();
if (isUponSelected > 0) { if (isUponSelected > 0) {
if (!hasCopyRestrictionForSelected()) { if (!hasCopyRestrictionForSelected()
&& !getSelectedText().empty()) {
_menu->addAction( _menu->addAction(
((isUponSelected > 1) ((isUponSelected > 1)
? tr::lng_context_copy_selected_items(tr::now) ? tr::lng_context_copy_selected_items(tr::now)

4
Telegram/SourceFiles/history/view/history_view_context_menu.cpp
View File

@ -995,7 +995,9 @@ base::unique_qptr<Ui::PopupMenu> FillContextMenu(
list, list,
st::popupMenuWithIcons); st::popupMenuWithIcons);
if (request.overSelection && !list->hasCopyRestrictionForSelected()) { if (request.overSelection
&& !list->hasCopyRestrictionForSelected()
&& !list->getSelectedText().empty()) {
const auto text = request.selectedItems.empty() const auto text = request.selectedItems.empty()
? tr::lng_context_copy_selected(tr::now) ? tr::lng_context_copy_selected(tr::now)
: tr::lng_context_copy_selected_items(tr::now); : tr::lng_context_copy_selected_items(tr::now);