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

Close call panel instead of hiding.

Browse source
This commit is contained in:
John Preston 2020-08-14 19:59:24 +04:00
parent 34840766b2
commit a0eb073728
5 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Telegram/SourceFiles/calls/calls_instance.cpp
View file

@ -55,11 +55,15 @@ void Instance::startOutgoingCall(not_null<UserData*> user, bool video) {
} }
void Instance::callFinished(not_null<Call*> call) { void Instance::callFinished(not_null<Call*> call) {
destroyCall(call); crl::on_main(call, [=] {
destroyCall(call);
});
} }
void Instance::callFailed(not_null<Call*> call) { void Instance::callFailed(not_null<Call*> call) {
destroyCall(call); crl::on_main(call, [=] {
destroyCall(call);
});
} }
void Instance::callRedial(not_null<Call*> call) { void Instance::callRedial(not_null<Call*> call) {
@ -101,7 +105,9 @@ void Instance::playSound(Sound sound) {
void Instance::destroyCall(not_null<Call*> call) { void Instance::destroyCall(not_null<Call*> call) {
if (_currentCall.get() == call) { if (_currentCall.get() == call) {
destroyCurrentPanel(); _currentCallPanel->closeBeforeDestroy();
_currentCallPanel = nullptr;
auto taken = base::take(_currentCall); auto taken = base::take(_currentCall);
_currentCallChanges.fire(nullptr); _currentCallChanges.fire(nullptr);
taken.reset(); taken.reset();
@ -113,13 +119,6 @@ void Instance::destroyCall(not_null<Call*> call) {
} }
} }
void Instance::destroyCurrentPanel() {
_currentCallPanel->hideBeforeDestroy();
// Always queue the destruction.
crl::on_main([panel = std::move(_currentCallPanel)]{});
}
void Instance::createCall(not_null<UserData*> user, Call::Type type, bool video) { void Instance::createCall(not_null<UserData*> user, Call::Type type, bool video) {
auto call = std::make_unique<Call>(getCallDelegate(), user, type, video); auto call = std::make_unique<Call>(getCallDelegate(), user, type, video);
const auto raw = call.get(); const auto raw = call.get();

1
Telegram/SourceFiles/calls/calls_instance.h
View file

@ -60,7 +60,6 @@ private:
void playSound(Sound sound) override; void playSound(Sound sound) override;
void createCall(not_null<UserData*> user, Call::Type type, bool video); void createCall(not_null<UserData*> user, Call::Type type, bool video);
void destroyCall(not_null<Call*> call); void destroyCall(not_null<Call*> call);
void destroyCurrentPanel();
void requestPermissionsOrFail(Fn<void()> onSuccess) override; void requestPermissionsOrFail(Fn<void()> onSuccess) override;
void requestPermissionOrFail(Platform::PermissionType type, Fn<void()> onSuccess); void requestPermissionOrFail(Platform::PermissionType type, Fn<void()> onSuccess);

4
Telegram/SourceFiles/calls/calls_panel.cpp
View file

@ -691,8 +691,8 @@ void Panel::showControls() {
} }
} }
void Panel::hideBeforeDestroy() { void Panel::closeBeforeDestroy() {
_window->hide(); _window->close();
reinitWithCall(nullptr); reinitWithCall(nullptr);
} }

2
Telegram/SourceFiles/calls/calls_panel.h
View file

@ -52,7 +52,7 @@ public:
void showAndActivate(); void showAndActivate();
void replaceCall(not_null<Call*> call); void replaceCall(not_null<Call*> call);
void hideBeforeDestroy(); void closeBeforeDestroy();
private: private:
class Content; class Content;

2
Telegram/lib_ui

@ -1 +1 @@
Subproject commit f2f592be817edc289eaff0248f3e41c945b736bd Subproject commit a1dbca85783289d737ce0368f5ec3659b5745458