From ef9aaf659c993ae3ed3f6b2044117ebc2c04e35e Mon Sep 17 00:00:00 2001 From: John Preston Date: Sun, 28 Jun 2015 18:41:13 +0300 Subject: [PATCH] fixed drag-n-drop in OS X for 0.8.34.dev version --- Telegram/SourceFiles/historywidget.cpp | 4 ++-- Telegram/SourceFiles/overviewwidget.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Telegram/SourceFiles/historywidget.cpp b/Telegram/SourceFiles/historywidget.cpp index 50f1dca0dc..4e4fe1813b 100644 --- a/Telegram/SourceFiles/historywidget.cpp +++ b/Telegram/SourceFiles/historywidget.cpp @@ -524,7 +524,7 @@ void HistoryList::onDragExec() { } else if (textlnkDown()) { sel = textlnkDown()->encoded(); if (!sel.isEmpty() && sel.at(0) != '/' && sel.at(0) != '@' && sel.at(0) != '#') { - urls.push_back(QUrl::fromEncoded(sel.toUtf8())); +// urls.push_back(QUrl::fromEncoded(sel.toUtf8())); // Google Chrome crashes in Mac OS X O_o } } if (!sel.isEmpty()) { @@ -540,7 +540,7 @@ void HistoryList::onDragExec() { mimeData->setData(qsl("application/x-td-forward-selected"), "1"); } drag->setMimeData(mimeData); - drag->exec(); + drag->exec(Qt::CopyAction); return; } else { HistoryItem *pressedLnkItem = App::pressedLinkItem(), *pressedItem = App::pressedItem(); diff --git a/Telegram/SourceFiles/overviewwidget.cpp b/Telegram/SourceFiles/overviewwidget.cpp index 84ef1a164e..e3801a826a 100644 --- a/Telegram/SourceFiles/overviewwidget.cpp +++ b/Telegram/SourceFiles/overviewwidget.cpp @@ -510,7 +510,7 @@ void OverviewInner::onDragExec() { } else if (textlnkDown()) { sel = textlnkDown()->encoded(); if (!sel.isEmpty() && sel.at(0) != '/' && sel.at(0) != '@' && sel.at(0) != '#') { - urls.push_back(QUrl::fromEncoded(sel.toUtf8())); +// urls.push_back(QUrl::fromEncoded(sel.toUtf8())); // Google Chrome crashes in Mac OS X O_o } } if (!sel.isEmpty() || forwardSelected) { @@ -526,7 +526,7 @@ void OverviewInner::onDragExec() { mimeData->setData(qsl("application/x-td-forward-selected"), "1"); } drag->setMimeData(mimeData); - drag->exec(); + drag->exec(Qt::CopyAction); return; } else { HistoryItem *pressedLnkItem = App::pressedLinkItem(), *pressedItem = App::pressedItem();