From 3f751bfbb07aea75d57ac91bf5de9578dc9d0b64 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 18 Dec 2017 20:25:24 +0400
Subject: [PATCH] Activate window on dropEvent.
---
Telegram/SourceFiles/dialogs/dialogs_widget.cpp | 1 +
Telegram/SourceFiles/history/history_widget.cpp | 10 ++++++++--
Telegram/SourceFiles/settings/settings_cover.cpp | 2 ++
3 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 3fefbea0a9..e75542f54e 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -811,6 +811,7 @@ void DialogsWidget::dropEvent(QDropEvent *e) {
if (auto peer = _inner->updateFromParentDrag(mapToGlobal(e->pos()))) {
e->acceptProposedAction();
App::main()->onFilesOrForwardDrop(peer->id, e->mimeData());
+ controller()->window()->activateWindow();
}
}
}
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 954460ef29..e7d46e853b 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -565,8 +565,14 @@ HistoryWidget::HistoryWidget(QWidget *parent, not_null<Window::Controller*> cont
_topShadow->hide();
- _attachDragDocument->setDroppedCallback([this](const QMimeData *data) { confirmSendingFiles(data, CompressConfirm::No); });
- _attachDragPhoto->setDroppedCallback([this](const QMimeData *data) { confirmSendingFiles(data, CompressConfirm::Yes); });
+ _attachDragDocument->setDroppedCallback([this](const QMimeData *data) {
+ confirmSendingFiles(data, CompressConfirm::No);
+ this->controller()->window()->activateWindow();
+ });
+ _attachDragPhoto->setDroppedCallback([this](const QMimeData *data) {
+ confirmSendingFiles(data, CompressConfirm::Yes);
+ this->controller()->window()->activateWindow();
+ });
connect(&_updateEditTimeLeftDisplay, SIGNAL(timeout()), this, SLOT(updateField()));
diff --git a/Telegram/SourceFiles/settings/settings_cover.cpp b/Telegram/SourceFiles/settings/settings_cover.cpp
index e292bb4846..a64d57341d 100644
--- a/Telegram/SourceFiles/settings/settings_cover.cpp
+++ b/Telegram/SourceFiles/settings/settings_cover.cpp
@@ -289,6 +289,8 @@ void CoverWidget::dropEvent(QDropEvent *e) {
e->acceptProposedAction();
showSetPhotoBox(img);
+
+ App::wnd()->activateWindow();
}
void CoverWidget::paintDivider(Painter &p) {