kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Allow destroying Ui::Window on close.

Browse source
This commit is contained in:
John Preston 2021-03-23 16:32:21 +04:00
parent 91e1979da5
commit 52ac632bc4
3 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ui/integration.cpp
View file

@ -79,6 +79,10 @@ const Emoji::One *Integration::defaultEmojiVariant(const Emoji::One *emoji) {
return emoji; return emoji;
} }
QWidget *Integration::modalWindowParent() {
return nullptr;
}
rpl::producer<> Integration::forcePopupMenuHideRequests() { rpl::producer<> Integration::forcePopupMenuHideRequests() {
return rpl::never<rpl::empty_value>(); return rpl::never<rpl::empty_value>();
} }

2
ui/integration.h
View file

@ -56,6 +56,8 @@ public:
[[nodiscard]] virtual const Emoji::One *defaultEmojiVariant( [[nodiscard]] virtual const Emoji::One *defaultEmojiVariant(
const Emoji::One *emoji); const Emoji::One *emoji);
[[nodiscard]] virtual QWidget *modalWindowParent();
[[nodiscard]] virtual rpl::producer<> forcePopupMenuHideRequests(); [[nodiscard]] virtual rpl::producer<> forcePopupMenuHideRequests();
[[nodiscard]] virtual QString phraseContextCopyText(); [[nodiscard]] virtual QString phraseContextCopyText();

15
ui/platform/ui_platform_window_title.cpp
View file

@ -90,12 +90,16 @@ not_null<QWidget*> TitleControls::window() const {
void TitleControls::init(Fn<void(bool maximized)> maximize) { void TitleControls::init(Fn<void(bool maximized)> maximize) {
_minimize->setClickedCallback([=] { _minimize->setClickedCallback([=] {
const auto weak = MakeWeak(_minimize.data());
window()->setWindowState( window()->setWindowState(
window()->windowState() | Qt::WindowMinimized); window()->windowState() | Qt::WindowMinimized);
_minimize->clearState(); if (weak) {
_minimize->clearState();
}
}); });
_minimize->setPointerCursor(false); _minimize->setPointerCursor(false);
_maximizeRestore->setClickedCallback([=] { _maximizeRestore->setClickedCallback([=] {
const auto weak = MakeWeak(_maximizeRestore.data());
if (maximize) { if (maximize) {
maximize(!_maximizedState); maximize(!_maximizedState);
} else { } else {
@ -103,12 +107,17 @@ void TitleControls::init(Fn<void(bool maximized)> maximize) {
? Qt::WindowNoState ? Qt::WindowNoState
: Qt::WindowMaximized); : Qt::WindowMaximized);
} }
_maximizeRestore->clearState(); if (weak) {
_maximizeRestore->clearState();
}
}); });
_maximizeRestore->setPointerCursor(false); _maximizeRestore->setPointerCursor(false);
_close->setClickedCallback([=] { _close->setClickedCallback([=] {
const auto weak = MakeWeak(_close.data());
window()->close(); window()->close();
_close->clearState(); if (weak) {
_close->clearState();
}
}); });
_close->setPointerCursor(false); _close->setPointerCursor(false);