core/window: setTransientParent in postComplete for FloatingWindow

Author: bbedward

src/window/floatingwindow.cpp

@@ -15,9 +15,13 @@ void ProxyFloatingWindow::connectWindow() {
 	this->window->setTitle(this->bTitle);
 	this->window->setMinimumSize(this->bMinimumSize);
 	this->window->setMaximumSize(this->bMaximumSize);
+}
+
+void ProxyFloatingWindow::postCompleteWindow() {
+	auto* parentBacking =
+	    this->mParentProxyWindow ? this->mParentProxyWindow->backingWindow() : nullptr;
 
-	// Apply transient parent now that our backing window exists
-	this->updateTransientParent();
+	this->window->setTransientParent(parentBacking);
 }
 
 void ProxyFloatingWindow::trySetWidth(qint32 implicitWidth) {
@@ -75,37 +79,20 @@ void ProxyFloatingWindow::setParentWindow(QObject* window) {
 		    &ProxyFloatingWindow::onParentDestroyed
 		);
 
-		QObject::connect(
-		    this->mParentProxyWindow,
-		    &ProxyWindowBase::backerVisibilityChanged,
-		    this,
-		    &ProxyFloatingWindow::updateTransientParent
-		);
 	} else {
 		this->mParentWindow = nullptr;
 		this->mParentProxyWindow = nullptr;
 	}
 
-	this->updateTransientParent();
 	emit this->parentWindowChanged();
 }
 
 void ProxyFloatingWindow::onParentDestroyed() {
 	this->mParentWindow = nullptr;
 	this->mParentProxyWindow = nullptr;
-	this->updateTransientParent();
 	emit this->parentWindowChanged();
 }
 
-void ProxyFloatingWindow::updateTransientParent() {
-	if (!this->window) return;
-
-	auto* parentBacking =
-	    this->mParentProxyWindow ? this->mParentProxyWindow->backingWindow() : nullptr;
-
-	this->window->setTransientParent(parentBacking);
-}
-
 // FloatingWindowInterface
 
 FloatingWindowInterface::FloatingWindowInterface(QObject* parent)

src/window/floatingwindow.hpp

@@ -18,6 +18,7 @@ class ProxyFloatingWindow: public ProxyWindowBase {
 	explicit ProxyFloatingWindow(QObject* parent = nullptr): ProxyWindowBase(parent) {}
 
 	void connectWindow() override;
+	void postCompleteWindow() override;
 
 	[[nodiscard]] QObject* parentWindow() const;
 	void setParentWindow(QObject* window);
@@ -40,7 +41,6 @@ private slots:
 	void onMinimumSizeChanged();
 	void onMaximumSizeChanged();
 	void onTitleChanged();
-	void updateTransientParent();
 
 	QObject* mParentWindow = nullptr;
 	ProxyWindowBase* mParentProxyWindow = nullptr;

src/window/proxywindow.cpp

@@ -81,7 +81,6 @@ void ProxyWindowBase::onReload(QObject* oldInstance) {
 
 	this->reloadComplete = true;
 
-	emit this->backingWindowChanged();
 	emit this->windowConnected();
 	this->postCompleteWindow();
 
@@ -149,16 +148,11 @@ void ProxyWindowBase::createWindow() {
 	this->ensureQWindow();
 	this->connectWindow();
 	this->completeWindow();
-	emit this->backingWindowChanged();
 	emit this->windowConnected();
 }
 
 void ProxyWindowBase::deleteWindow(bool keepItemOwnership) {
-	if (this->window != nullptr) {
-		emit this->windowDestroyed();
-		emit this->backingWindowChanged();
-	}
-
+	if (this->window != nullptr) emit this->windowDestroyed();
 	if (auto* window = this->disownWindow(keepItemOwnership)) window->deleteLater();
 }
 

src/window/proxywindow.hpp

@@ -145,7 +145,6 @@ class ProxyWindowBase: public Reloadable {
 	void resourcesLost();
 	void windowConnected();
 	void windowDestroyed();
-	void backingWindowChanged();
 	void visibleChanged();
 	void backerVisibilityChanged();
 	void xChanged();