RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use QClipboard::supportsSelection instead of ifdefs

This commit is contained in:
Ilya Fedin 2020-11-06 09:12:18 +04:00 committed by John Preston
parent 620639ef83
commit 5c8820d5d8
4 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
View File

@ -1503,13 +1503,13 @@ void InnerWidget::mouseActionFinish(const QPoint &screenPos, Qt::MouseButton but
_mouseSelectType = TextSelectType::Letters;
//_widget->noSelectingScroll(); // TODO
#if defined Q_OS_UNIX && !defined Q_OS_MAC
if (_selectedItem && _selectedText.from != _selectedText.to) {
if (QGuiApplication::clipboard()->supportsSelection()
&& _selectedItem
&& _selectedText.from != _selectedText.to) {
TextUtilities::SetClipboardText(
_selectedItem->selectedText(_selectedText),
QClipboard::Selection);
}
#endif // Q_OS_UNIX && !Q_OS_MAC
}
void InnerWidget::updateSelected() {

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

@ -1382,8 +1382,9 @@ void HistoryInner::mouseActionFinish(
_widget->noSelectingScroll();
_widget->updateTopBarSelection();
#if defined Q_OS_UNIX && !defined Q_OS_MAC
if (!_selected.empty() && _selected.cbegin()->second != FullSelection) {
if (QGuiApplication::clipboard()->supportsSelection()
&& !_selected.empty()
&& _selected.cbegin()->second != FullSelection) {
const auto [item, selection] = *_selected.cbegin();
if (const auto view = item->mainView()) {
TextUtilities::SetClipboardText(
@ -1391,7 +1392,6 @@ void HistoryInner::mouseActionFinish(
QClipboard::Selection);
}
}
#endif // Q_OS_UNIX && !Q_OS_MAC
}
void HistoryInner::mouseReleaseEvent(QMouseEvent *e) {

7
Telegram/SourceFiles/history/view/history_view_list_widget.cpp
View File

@ -2222,16 +2222,15 @@ void ListWidget::mouseActionFinish(
_mouseSelectType = TextSelectType::Letters;
//_widget->noSelectingScroll(); // #TODO select scroll
#if defined Q_OS_UNIX && !defined Q_OS_MAC
if (_selectedTextItem
if (QGuiApplication::clipboard()->supportsSelection()
&& _selectedTextItem
&& _selectedTextRange.from != _selectedTextRange.to) {
if (const auto view = viewForItem(_selectedTextItem)) {
TextUtilities::SetClipboardText(
view->selectedText(_selectedTextRange),
QClipboard::Selection);
}
}
}
#endif // Q_OS_UNIX && !Q_OS_MAC
}
void ListWidget::mouseActionUpdate() {

4
Telegram/SourceFiles/info/media/info_media_list_widget.cpp
View File

@ -2118,11 +2118,9 @@ void ListWidget::mouseActionFinish(
//_widget->noSelectingScroll(); // #TODO scroll by drag
//_widget->updateTopBarSelection();
#if defined Q_OS_UNIX && !defined Q_OS_MAC
//if (hasSelectedText()) { // #TODO linux clipboard
//if (QGuiApplication::clipboard()->supportsSelection() && hasSelectedText()) { // #TODO linux clipboard
// TextUtilities::SetClipboardText(_selected.cbegin()->first->selectedText(_selected.cbegin()->second), QClipboard::Selection);
//}
#endif // Q_OS_UNIX && !Q_OS_MAC
}
void ListWidget::applyDragSelection() {