mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-31 06:26:18 +00:00
Code Issues Releases Wiki Activity

fixed os x 10.10 dragndrop

Browse Source
This commit is contained in:
John Preston
2014-10-17 23:14:42 +04:00
parent b35b3bcb87
commit ebe9b4f80f
9 changed files with 30 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Telegram/SourceFiles/historywidget.cpp
View File

@@ -2746,7 +2746,7 @@ void HistoryWidget::uploadConfirmImageUncompressed(bool ctrlShiftEnter) {
if (confirmWithText) {
onSend(ctrlShiftEnter);
}
imageLoader.append(confirmImage, peerId, ToPrepareDocument);
imageLoader.append(confirmImage, peerId, ToPrepareDocument, ctrlShiftEnter);
confirmImageId = 0;
confirmWithText = false;
confirmImage = QImage();
@@ -2774,7 +2774,7 @@ void HistoryWidget::onPhotoReady() {
if (i->id == confirmImageId) {
App::wnd()->showLayer(new PhotoSendBox(*i));
} else {
confirmSendImage(false, *i);
confirmSendImage(*i);
}
}
list.clear();
@@ -2798,10 +2798,10 @@ void HistoryWidget::confirmShareContact(bool ctrlShiftEnter, const QString &phon
shareContact(peerId, phone, fname, lname);
}
void HistoryWidget::confirmSendImage(bool ctrlShiftEnter, const ReadyLocalMedia &img) {
void HistoryWidget::confirmSendImage(const ReadyLocalMedia &img) {
if (img.id == confirmImageId) {
if (confirmWithText) {
onSend(ctrlShiftEnter);
onSend(img.ctrlShiftEnter);
}
confirmImageId = 0;
confirmWithText = false;