void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove old window activation workaround for X11 systems

Browse source 
There seem to be no need in it anymore
This commit is contained in:
Ilya Fedin 2024-05-28 18:19:47 +04:00 • committed by John Preston
parent 2673e1df53
commit e4d88f829c
6 changed files with 0 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
View file

@ -2216,9 +2216,6 @@ void OverlayWidget::close() {
return; return;
} }
hide(); hide();
if (const auto window = Core::App().activeWindow()) {
window->reActivate();
}
_helper->clearState(); _helper->clearState();
} }

23
Telegram/SourceFiles/window/main_window.cpp
View file

@ -28,7 +28,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "main/main_session.h" #include "main/main_session.h"
#include "main/main_session_settings.h" #include "main/main_session_settings.h"
#include "base/options.h" #include "base/options.h"
#include "base/call_delayed.h"
#include "base/crc32hash.h" #include "base/crc32hash.h"
#include "ui/toast/toast.h" #include "ui/toast/toast.h"
#include "ui/widgets/shadow.h" #include "ui/widgets/shadow.h"
@ -951,28 +950,6 @@ bool MainWindow::minimizeToTray() {
return true; return true;
} }
void MainWindow::reActivateWindow() {
// X11 is the only platform with unreliable activate requests
if (!Platform::IsX11()) {
return;
}
const auto weak = Ui::MakeWeak(this);
const auto reActivate = [=] {
if (const auto w = weak.data()) {
if (auto f = QApplication::focusWidget()) {
f->clearFocus();
}
w->activate();
if (auto f = QApplication::focusWidget()) {
f->clearFocus();
}
w->setInnerFocus();
}
};
crl::on_main(this, reActivate);
base::call_delayed(200, this, reActivate);
}
void MainWindow::showRightColumn(object_ptr<TWidget> widget) { void MainWindow::showRightColumn(object_ptr<TWidget> widget) {
const auto wasWidth = width(); const auto wasWidth = width();
const auto wasRightWidth = _rightColumn ? _rightColumn->width() : 0; const auto wasRightWidth = _rightColumn ? _rightColumn->width() : 0;

2
Telegram/SourceFiles/window/main_window.h
View file

@ -98,8 +98,6 @@ public:
} }
void positionUpdated(); void positionUpdated();
void reActivateWindow();
void showRightColumn(object_ptr<TWidget> widget); void showRightColumn(object_ptr<TWidget> widget);
int maximalExtendBy() const; int maximalExtendBy() const;
bool canExtendNoMove(int extendBy) const; bool canExtendNoMove(int extendBy) const;

1
Telegram/SourceFiles/window/notifications_manager.cpp
View file

@ -1076,7 +1076,6 @@ void Manager::notificationActivated(
history->setLocalDraft(std::move(draft)); history->setLocalDraft(std::move(draft));
} }
window->widget()->showFromTray(); window->widget()->showFromTray();
window->widget()->reActivateWindow();
if (Core::App().passcodeLocked()) { if (Core::App().passcodeLocked()) {
window->widget()->setInnerFocus(); window->widget()->setInnerFocus();
system()->clearAll(); system()->clearAll();

4
Telegram/SourceFiles/window/window_controller.cpp
View file

@ -444,10 +444,6 @@ void Controller::activate() {
_widget.activate(); _widget.activate();
} }
void Controller::reActivate() {
_widget.reActivateWindow();
}
void Controller::updateIsActiveFocus() { void Controller::updateIsActiveFocus() {
_isActiveTimer.callOnce(sessionController() _isActiveTimer.callOnce(sessionController()
? sessionController()->session().serverConfig().onlineFocusTimeout ? sessionController()->session().serverConfig().onlineFocusTimeout

1
Telegram/SourceFiles/window/window_controller.h
View file

@ -119,7 +119,6 @@ public:
} }
void activate(); void activate();
void reActivate();
void updateIsActiveFocus(); void updateIsActiveFocus();
void updateIsActiveBlur(); void updateIsActiveBlur();
void updateIsActive(); void updateIsActive();