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

Replaced Application::appDeactivates with appDeactivatedValue.

Browse source
This commit is contained in:
23rd 2020-12-06 18:01:37 +03:00
parent 628a02d99c
commit 54567a4253
4 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Telegram/SourceFiles/calls/calls_group_members.cpp
View file

@ -521,7 +521,7 @@ MembersController::MembersController(
rpl::combine( rpl::combine(
rpl::single(anim::Disabled()) | rpl::then(anim::Disables()), rpl::single(anim::Disabled()) | rpl::then(anim::Disables()),
rpl::single(false) | rpl::then(Core::App().appDeactivates()) rpl::single(false) | rpl::then(Core::App().appDeactivatedValue())
) | rpl::start_with_next([=](bool animDisabled, bool deactivated) { ) | rpl::start_with_next([=](bool animDisabled, bool deactivated) {
const auto hide = !(!animDisabled && !deactivated); const auto hide = !(!animDisabled && !deactivated);

2
Telegram/SourceFiles/calls/calls_group_panel.cpp
View file

@ -223,7 +223,7 @@ GroupPanel::GroupPanel(not_null<GroupCall*> call)
, _settings(widget(), st::groupCallSettings) , _settings(widget(), st::groupCallSettings)
, _mute(std::make_unique<Ui::CallMuteButton>( , _mute(std::make_unique<Ui::CallMuteButton>(
widget(), widget(),
Core::App().appDeactivates(), Core::App().appDeactivatedValue(),
Ui::CallMuteButtonState{ Ui::CallMuteButtonState{
.text = tr::lng_group_call_connecting(tr::now), .text = tr::lng_group_call_connecting(tr::now),
.type = Ui::CallMuteButtonType::Connecting, .type = Ui::CallMuteButtonType::Connecting,

15
Telegram/SourceFiles/core/application.cpp
View file

@ -247,7 +247,7 @@ void Application::run() {
QCoreApplication::instance()->installEventFilter(this); QCoreApplication::instance()->installEventFilter(this);
appDeactivates( appDeactivatedValue(
) | rpl::start_with_next([=](bool deactivated) { ) | rpl::start_with_next([=](bool deactivated) {
if (deactivated) { if (deactivated) {
handleAppDeactivated(); handleAppDeactivated();
@ -652,11 +652,16 @@ void Application::handleAppDeactivated() {
Ui::Tooltip::Hide(); Ui::Tooltip::Hide();
} }
rpl::producer<bool> Application::appDeactivates() const { rpl::producer<bool> Application::appDeactivatedValue() const {
return base::qt_signal_producer( const auto &app =
static_cast<QGuiApplication*>(QCoreApplication::instance()), static_cast<QGuiApplication*>(QCoreApplication::instance());
return rpl::single(
app->applicationState()
) | rpl::then(
base::qt_signal_producer(
app,
&QGuiApplication::applicationStateChanged &QGuiApplication::applicationStateChanged
) | rpl::map([=](Qt::ApplicationState state) { )) | rpl::map([=](Qt::ApplicationState state) {
return (state != Qt::ApplicationActive); return (state != Qt::ApplicationActive);
}); });
} }

2
Telegram/SourceFiles/core/application.h
View file

@ -271,7 +271,7 @@ public:
void handleAppActivated(); void handleAppActivated();
void handleAppDeactivated(); void handleAppDeactivated();
[[nodiscard]] rpl::producer<bool> appDeactivates() const; [[nodiscard]] rpl::producer<bool> appDeactivatedValue() const;
void switchDebugMode(); void switchDebugMode();
void switchFreeType(); void switchFreeType();