kotatogram/kotatogram-desktop
kotatogram/kotatogram-desktop
1
0
Fork 0
Code Issues Releases 45 Packages Wiki Activity

Fix crash in theme editor closing.

Browse source
This commit is contained in:
John Preston 2020-06-05 14:00:06 +04:00
parent 6c2a29b83f
commit 05df4f832b
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Telegram/SourceFiles/window/themes/window_theme_editor.cpp
View file

@ -702,20 +702,20 @@ void Editor::showMenu() {
if (_menu) { if (_menu) {
return; return;
} }
_menu.create(this); _menu = base::make_unique_q<Ui::DropdownMenu>(this);
_menu->setHiddenCallback([weak = Ui::MakeWeak(this), menu = _menu.data()]{ _menu->setHiddenCallback([weak = Ui::MakeWeak(this), menu = _menu.get()]{
menu->deleteLater(); menu->deleteLater();
if (weak && weak->_menu == menu) { if (weak && weak->_menu == menu) {
weak->_menu = nullptr; weak->_menu = nullptr;
weak->_menuToggle->setForceRippled(false); weak->_menuToggle->setForceRippled(false);
} }
}); });
_menu->setShowStartCallback(crl::guard(this, [this, menu = _menu.data()]{ _menu->setShowStartCallback(crl::guard(this, [this, menu = _menu.get()]{
if (_menu == menu) { if (_menu == menu) {
_menuToggle->setForceRippled(true); _menuToggle->setForceRippled(true);
} }
})); }));
_menu->setHideStartCallback(crl::guard(this, [this, menu = _menu.data()]{ _menu->setHideStartCallback(crl::guard(this, [this, menu = _menu.get()]{
if (_menu == menu) { if (_menu == menu) {
_menuToggle->setForceRippled(false); _menuToggle->setForceRippled(false);
} }

2
Telegram/SourceFiles/window/themes/window_theme_editor.h
View file

@ -80,7 +80,7 @@ private:
QPointer<Inner> _inner; QPointer<Inner> _inner;
object_ptr<Ui::CrossButton> _close; object_ptr<Ui::CrossButton> _close;
object_ptr<Ui::IconButton> _menuToggle; object_ptr<Ui::IconButton> _menuToggle;
object_ptr<Ui::DropdownMenu> _menu = { nullptr }; base::unique_qptr<Ui::DropdownMenu> _menu;
object_ptr<Ui::MultiSelect> _select; object_ptr<Ui::MultiSelect> _select;
object_ptr<Ui::PlainShadow> _leftShadow; object_ptr<Ui::PlainShadow> _leftShadow;
object_ptr<Ui::PlainShadow> _topShadow; object_ptr<Ui::PlainShadow> _topShadow;