MrBesen
/
tdesktop
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't activate main window in case of visible call window. 

Fixes #27017.
This commit is contained in:
John Preston 2023-11-01 22:23:41 +04:00
parent 42f96f3c43
commit a8b959826c
7 changed files with 39 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Telegram/SourceFiles/calls/calls_instance.cpp
View File

@ -712,13 +712,24 @@ void Instance::destroyCurrentCall() {
} }
} }
bool Instance::hasActivePanel(not_null<Main::Session*> session) const { bool Instance::hasVisiblePanel(Main::Session *session) const {
if (inCall()) { if (inCall()) {
return (&_currentCall->user()->session() == session) return _currentCallPanel->isVisible()
&& _currentCallPanel->isActive(); && (!session || (&_currentCall->user()->session() == session));
} else if (inGroupCall()) { } else if (inGroupCall()) {
return (&_currentGroupCall->peer()->session() == session) return _currentGroupCallPanel->isVisible()
&& _currentGroupCallPanel->isActive(); && (!session || (&_currentGroupCall->peer()->session() == session));
}
return false;
}
bool Instance::hasActivePanel(Main::Session *session) const {
if (inCall()) {
return _currentCallPanel->isActive()
&& (!session || (&_currentCall->user()->session() == session));
} else if (inGroupCall()) {
return _currentGroupCallPanel->isActive()
&& (!session || (&_currentGroupCall->peer()->session() == session));
} }
return false; return false;
} }

4
Telegram/SourceFiles/calls/calls_instance.h
View File

@ -89,8 +89,10 @@ public:
[[nodiscard]] rpl::producer<GroupCall*> currentGroupCallValue() const; [[nodiscard]] rpl::producer<GroupCall*> currentGroupCallValue() const;
[[nodiscard]] bool inCall() const; [[nodiscard]] bool inCall() const;
[[nodiscard]] bool inGroupCall() const; [[nodiscard]] bool inGroupCall() const;
[[nodiscard]] bool hasVisiblePanel(
Main::Session *session = nullptr) const;
[[nodiscard]] bool hasActivePanel( [[nodiscard]] bool hasActivePanel(
not_null<Main::Session*> session) const; Main::Session *session = nullptr) const;
bool activateCurrentCall(const QString &joinHash = QString()); bool activateCurrentCall(const QString &joinHash = QString());
bool minimizeCurrentActiveCall(); bool minimizeCurrentActiveCall();
bool toggleFullScreenCurrentActiveCall(); bool toggleFullScreenCurrentActiveCall();

9
Telegram/SourceFiles/calls/calls_panel.cpp
View File

@ -106,12 +106,15 @@ Panel::Panel(not_null<Call*> call)
Panel::~Panel() = default; Panel::~Panel() = default;
bool Panel::isActive() const { bool Panel::isVisible() const {
return window()->isActiveWindow() return window()->isVisible()
&& window()->isVisible()
&& !(window()->windowState() & Qt::WindowMinimized); && !(window()->windowState() & Qt::WindowMinimized);
} }
bool Panel::isActive() const {
return window()->isActiveWindow() && isVisible();
}
void Panel::showAndActivate() { void Panel::showAndActivate() {
if (window()->isHidden()) { if (window()->isHidden()) {
window()->show(); window()->show();

1
Telegram/SourceFiles/calls/calls_panel.h
View File

@ -61,6 +61,7 @@ public:
Panel(not_null<Call*> call); Panel(not_null<Call*> call);
~Panel(); ~Panel();
[[nodiscard]] bool isVisible() const;
[[nodiscard]] bool isActive() const; [[nodiscard]] bool isActive() const;
void showAndActivate(); void showAndActivate();
void minimize(); void minimize();

9
Telegram/SourceFiles/calls/group/calls_group_panel.cpp
View File

@ -258,12 +258,15 @@ not_null<GroupCall*> Panel::call() const {
return _call; return _call;
} }
bool Panel::isActive() const { bool Panel::isVisible() const {
return window()->isActiveWindow() return window()->isVisible()
&& window()->isVisible()
&& !(window()->windowState() & Qt::WindowMinimized); && !(window()->windowState() & Qt::WindowMinimized);
} }
bool Panel::isActive() const {
return window()->isActiveWindow() && isVisible();
}
base::weak_ptr<Ui::Toast::Instance> Panel::showToast( base::weak_ptr<Ui::Toast::Instance> Panel::showToast(
const QString &text, const QString &text,
crl::time duration) { crl::time duration) {

1
Telegram/SourceFiles/calls/group/calls_group_panel.h
View File

@ -91,6 +91,7 @@ public:
[[nodiscard]] not_null<Ui::RpWidget*> widget() const; [[nodiscard]] not_null<Ui::RpWidget*> widget() const;
[[nodiscard]] not_null<GroupCall*> call() const; [[nodiscard]] not_null<GroupCall*> call() const;
[[nodiscard]] bool isVisible() const;
[[nodiscard]] bool isActive() const; [[nodiscard]] bool isActive() const;
base::weak_ptr<Ui::Toast::Instance> showToast( base::weak_ptr<Ui::Toast::Instance> showToast(

7
Telegram/SourceFiles/platform/mac/specific_mac_p.mm
View File

@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "mainwindow.h" #include "mainwindow.h"
#include "mainwidget.h" #include "mainwidget.h"
#include "calls/calls_instance.h"
#include "core/sandbox.h" #include "core/sandbox.h"
#include "core/application.h" #include "core/application.h"
#include "core/core_settings.h" #include "core/core_settings.h"
@ -175,7 +176,11 @@ ApplicationDelegate *_sharedDelegate = nil;
Core::App().handleAppActivated(); Core::App().handleAppActivated();
if (const auto window = Core::App().activeWindow()) { if (const auto window = Core::App().activeWindow()) {
if (window->widget()->isHidden()) { if (window->widget()->isHidden()) {
window->widget()->showFromTray(); if (Core::App().calls().hasVisiblePanel()) {
Core::App().calls().activateCurrentCall();
} else {
window->widget()->showFromTray();
}
} }
} }
} }