aland/quickshell
1
0
Fork 0
mirror of https://git.outfoxxed.me/quickshell/quickshell.git synced 2026-02-25 03:43:58 +11:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

core/popupwindow: clean up popup lifecycle and window init

Browse source 
- Makes popup lifecycle less complex
- Creates all QWindows lazily
- May break live reloading of open popups to some degree
This commit is contained in:
outfoxxed 2026-01-13 00:42:35 -08:00
parent db37dc580a
commit de1bfe028d
No known key found for this signature in database
GPG key ID: 4C88A185FB89301E
8 changed files with 127 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/window/proxywindow.cpp
View file

@ -57,9 +57,10 @@ ProxyWindowBase::ProxyWindowBase(QObject* parent)
ProxyWindowBase::~ProxyWindowBase() { this->deleteWindow(true); }
void ProxyWindowBase::onReload(QObject* oldInstance) {
this->window = this->retrieveWindow(oldInstance);
if (this->mVisible) this->window = this->retrieveWindow(oldInstance);
auto wasVisible = this->window != nullptr && this->window->isVisible();
this->ensureQWindow();
if (this->mVisible) this->ensureQWindow();
// The qml engine will leave the WindowInterface as owner of everything
// nested in an item, so we have to make sure the interface's children
@ -76,17 +77,21 @@ void ProxyWindowBase::onReload(QObject* oldInstance) {
Reloadable::reloadChildrenRecursive(this, oldInstance);
this->connectWindow();
this->completeWindow();
if (this->mVisible) {
this->connectWindow();
this->completeWindow();
}
this->reloadComplete = true;
emit this->windowConnected();
this->postCompleteWindow();
if (this->mVisible) {
emit this->windowConnected();
this->postCompleteWindow();
if (wasVisible && this->isVisibleDirect()) {
emit this->backerVisibilityChanged();
this->onExposed();
if (wasVisible && this->isVisibleDirect()) {
this->bBackerVisibility = true;
this->onExposed();
}
}
}
@ -272,24 +277,21 @@ void ProxyWindowBase::setVisible(bool visible) {
void ProxyWindowBase::setVisibleDirect(bool visible) {
if (this->deleteOnInvisible()) {
if (visible == this->isVisibleDirect()) return;
if (visible) {
if (visible == this->isVisibleDirect()) return;
this->createWindow();
this->polishItems();
this->window->setVisible(true);
emit this->backerVisibilityChanged();
this->bBackerVisibility = true;
} else {
if (this->window != nullptr) {
this->window->setVisible(false);
emit this->backerVisibilityChanged();
this->deleteWindow();
}
if (this->window != nullptr) this->window->setVisible(false);
this->bBackerVisibility = false;
this->deleteWindow();
}
} else if (this->window != nullptr) {
if (visible) this->polishItems();
this->window->setVisible(visible);
emit this->backerVisibilityChanged();
this->bBackerVisibility = visible;
}
}