Always call raise() before activateWindow().

This commit is contained in:
John Preston 2021-06-07 11:25:19 +04:00
parent 1886a5c4ed
commit 303ad02c61
8 changed files with 9 additions and 1 deletions

View file

@ -283,6 +283,7 @@ void ChooseSourceProcess::activate() {
} else { } else {
_window->show(); _window->show();
} }
_window->raise();
_window->activateWindow(); _window->activateWindow();
} }

View file

@ -59,6 +59,7 @@ void PreLaunchWindow::activate() {
setWindowState(windowState() & ~Qt::WindowMinimized); setWindowState(windowState() & ~Qt::WindowMinimized);
setVisible(true); setVisible(true);
psActivateProcess(); psActivateProcess();
raise();
activateWindow(); activateWindow();
} }

View file

@ -1332,6 +1332,7 @@ void Widget::dropEvent(QDropEvent *e) {
controller()->content()->onFilesOrForwardDrop( controller()->content()->onFilesOrForwardDrop(
peer->id, peer->id,
e->mimeData()); e->mimeData());
controller()->widget()->raise();
controller()->widget()->activateWindow(); controller()->widget()->activateWindow();
} }
} }

View file

@ -2235,6 +2235,7 @@ void OverlayWidget::setFocus() {
} }
void OverlayWidget::activate() { void OverlayWidget::activate() {
_widget->raise();
_widget->activateWindow(); _widget->activateWindow();
QApplication::setActiveWindow(_widget); QApplication::setActiveWindow(_widget);
setFocus(); setFocus();

View file

@ -229,6 +229,7 @@ void MainWindow::psRefreshTaskbarIcon() {
palette.setColor(QPalette::Window, (isActiveWindow() ? st::titleBgActive : st::titleBg)->c); palette.setColor(QPalette::Window, (isActiveWindow() ? st::titleBgActive : st::titleBg)->c);
refresher->setPalette(palette); refresher->setPalette(palette);
refresher->show(); refresher->show();
refresher->raise();
refresher->activateWindow(); refresher->activateWindow();
updateIconCounters(); updateIconCounters();

View file

@ -916,6 +916,7 @@ void Notification::showReplyField() {
if (!_item) { if (!_item) {
return; return;
} }
raise();
activateWindow(); activateWindow();
if (_replyArea) { if (_replyArea) {
@ -1039,6 +1040,7 @@ bool Notification::eventFilter(QObject *o, QEvent *e) {
if (e->type() == QEvent::MouseButtonPress) { if (e->type() == QEvent::MouseButtonPress) {
if (auto receiver = qobject_cast<QWidget*>(o)) { if (auto receiver = qobject_cast<QWidget*>(o)) {
if (isAncestorOf(receiver)) { if (isAncestorOf(receiver)) {
raise();
activateWindow(); activateWindow();
} }
} }

View file

@ -67,6 +67,7 @@ constexpr auto kMaxChatEntryHistorySize = 50;
void ActivateWindow(not_null<SessionController*> controller) { void ActivateWindow(not_null<SessionController*> controller) {
const auto window = controller->widget(); const auto window = controller->widget();
window->raise();
window->activateWindow(); window->activateWindow();
Ui::ActivateWindowDelayed(window); Ui::ActivateWindowDelayed(window);
} }

@ -1 +1 @@
Subproject commit 02049aeaa8806ef5d23fbf050be7e341e2d5bbde Subproject commit b1d5ed4ab503635f9e0f9ee5d2a34e2975042014