aland/quickshell
1
0
Fork 0
mirror of https://git.outfoxxed.me/quickshell/quickshell.git synced 2026-04-10 06:11:54 +10:00
Code Issues Projects Releases Packages Wiki Activity Actions

core/window: add parentWindow property to FloatingWindow

Browse source
This commit is contained in:
bbedward 2025-11-26 10:29:51 -05:00 • committed by outfoxxed
parent ceac3c6cfa
commit b4e71cb2c0
No known key found for this signature in database
GPG key ID: 4C88A185FB89301E
5 changed files with 161 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

85
src/window/floatingwindow.cpp
View file

@ -3,7 +3,7 @@
#include <qnamespace.h>
#include <qobject.h>
#include <qqmlengine.h>
#include <qqmllist.h>
#include <qqmlinfo.h>
#include <qtmetamacros.h>
#include <qtypes.h>
#include <qwindow.h>
@ -11,6 +11,27 @@
#include "proxywindow.hpp"
#include "windowinterface.hpp"
ProxyFloatingWindow::ProxyFloatingWindow(QObject* parent): ProxyWindowBase(parent) {
this->bTargetVisible.setBinding([this] {
if (!this->bWantsVisible) return false;
auto* parent = this->bParentProxyWindow.value();
if (!parent) return true;
return parent->bindableBackerVisibility().value();
});
}
void ProxyFloatingWindow::targetVisibleChanged() {
if (this->window && this->bParentProxyWindow) {
auto* bw = this->bParentProxyWindow.value()->backingWindow();
if (bw != this->window->transientParent()) {
this->window->setTransientParent(bw);
}
}
this->ProxyWindowBase::setVisible(this->bTargetVisible);
}
void ProxyFloatingWindow::connectWindow() {
this->ProxyWindowBase::connectWindow();
@ -19,6 +40,25 @@ void ProxyFloatingWindow::connectWindow() {
this->window->setMaximumSize(this->bMaximumSize);
}
void ProxyFloatingWindow::completeWindow() {
this->ProxyWindowBase::completeWindow();
auto* parent = this->bParentProxyWindow.value();
this->window->setTransientParent(parent ? parent->backingWindow() : nullptr);
}
void ProxyFloatingWindow::postCompleteWindow() {
this->ProxyWindowBase::setVisible(this->bTargetVisible);
}
void ProxyFloatingWindow::onParentDestroyed() {
this->mParentWindow = nullptr;
this->bParentProxyWindow = nullptr;
emit this->parentWindowChanged();
}
void ProxyFloatingWindow::setVisible(bool visible) { this->bWantsVisible = visible; }
void ProxyFloatingWindow::trySetWidth(qint32 implicitWidth) {
if (!this->window->isVisible()) {
this->ProxyWindowBase::trySetWidth(implicitWidth);
@ -46,6 +86,42 @@ void ProxyFloatingWindow::onMaximumSizeChanged() {
emit this->maximumSizeChanged();
}
QObject* ProxyFloatingWindow::parentWindow() const { return this->mParentWindow; }
void ProxyFloatingWindow::setParentWindow(QObject* window) {
if (window == this->mParentWindow) return;
if (this->window && this->window->isVisible()) {
qmlWarning(this) << "parentWindow cannot be changed after the window is visible.";
return;
}
if (this->bParentProxyWindow) {
QObject::disconnect(this->bParentProxyWindow, nullptr, this, nullptr);
}
if (this->mParentWindow) {
QObject::disconnect(this->mParentWindow, nullptr, this, nullptr);
}
this->mParentWindow = nullptr;
this->bParentProxyWindow = nullptr;
if (auto* proxy = ProxyWindowBase::forObject(window)) {
this->mParentWindow = window;
this->bParentProxyWindow = proxy;
QObject::connect(
this->mParentWindow,
&QObject::destroyed,
this,
&ProxyFloatingWindow::onParentDestroyed
);
}
emit this->parentWindowChanged();
}
// FloatingWindowInterface
FloatingWindowInterface::FloatingWindowInterface(QObject* parent)
@ -57,6 +133,7 @@ FloatingWindowInterface::FloatingWindowInterface(QObject* parent)
QObject::connect(this->window, &ProxyFloatingWindow::titleChanged, this, &FloatingWindowInterface::titleChanged);
QObject::connect(this->window, &ProxyFloatingWindow::minimumSizeChanged, this, &FloatingWindowInterface::minimumSizeChanged);
QObject::connect(this->window, &ProxyFloatingWindow::maximumSizeChanged, this, &FloatingWindowInterface::maximumSizeChanged);
QObject::connect(this->window, &ProxyFloatingWindow::parentWindowChanged, this, &FloatingWindowInterface::parentWindowChanged);
QObject::connect(this->window, &ProxyWindowBase::windowConnected, this, &FloatingWindowInterface::onWindowConnected);
// clang-format on
}
@ -169,3 +246,9 @@ bool FloatingWindowInterface::startSystemResize(Qt::Edges edges) const {
if (!qw) return false;
return qw->startSystemResize(edges);
}
QObject* FloatingWindowInterface::parentWindow() const { return this->window->parentWindow(); }
void FloatingWindowInterface::setParentWindow(QObject* window) {
this->window->setParentWindow(window);
}