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

core/popupanchor: add item-relative anchor rect support

Browse source
This commit is contained in:
outfoxxed 2025-05-29 19:26:02 -07:00
parent adcef7fc30
commit 6d42d26c79
No known key found for this signature in database
GPG key ID: 4C88A185FB89301E
6 changed files with 124 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

91
src/core/popupanchor.cpp
View file

@ -4,6 +4,7 @@
#include <qcontainerfwd.h>
#include <qlogging.h>
#include <qobject.h>
#include <qquickitem.h>
#include <qsize.h>
#include <qtmetamacros.h>
#include <qwindow.h>
@ -25,14 +26,11 @@ bool PopupAnchor::isDirty() const {
void PopupAnchor::markClean() { this->lastState = this->state; }
void PopupAnchor::markDirty() { this->lastState.reset(); }
QObject* PopupAnchor::window() const { return this->mWindow; }
ProxyWindowBase* PopupAnchor::proxyWindow() const { return this->mProxyWindow; }
QWindow* PopupAnchor::backingWindow() const {
return this->mProxyWindow ? this->mProxyWindow->backingWindow() : nullptr;
}
void PopupAnchor::setWindow(QObject* window) {
void PopupAnchor::setWindowInternal(QObject* window) {
if (window == this->mWindow) return;
if (this->mWindow) {
@ -78,6 +76,27 @@ setnull:
}
}
void PopupAnchor::setWindow(QObject* window) {
this->setItem(nullptr);
this->setWindowInternal(window);
}
void PopupAnchor::setItem(QQuickItem* item) {
if (item == this->mItem) return;
if (this->mItem) {
QObject::disconnect(this->mItem, nullptr, this, nullptr);
}
this->mItem = item;
this->onItemWindowChanged();
if (item) {
QObject::connect(item, &QObject::destroyed, this, &PopupAnchor::onItemDestroyed);
QObject::connect(item, &QQuickItem::windowChanged, this, &PopupAnchor::onItemWindowChanged);
}
}
void PopupAnchor::onWindowDestroyed() {
this->mWindow = nullptr;
this->mProxyWindow = nullptr;
@ -85,18 +104,41 @@ void PopupAnchor::onWindowDestroyed() {
emit this->backingWindowVisibilityChanged();
}
Box PopupAnchor::rect() const { return this->state.rect; }
void PopupAnchor::setRect(Box rect) {
if (rect == this->state.rect) return;
if (rect.w <= 0) rect.w = 1;
if (rect.h <= 0) rect.h = 1;
this->state.rect = rect;
emit this->rectChanged();
void PopupAnchor::onItemDestroyed() {
this->mItem = nullptr;
emit this->itemChanged();
this->setWindowInternal(nullptr);
}
Edges::Flags PopupAnchor::edges() const { return this->state.edges; }
void PopupAnchor::onItemWindowChanged() {
if (auto* window = qobject_cast<ProxiedWindow*>(this->mItem->window())) {
this->setWindowInternal(window->proxy());
} else {
this->setWindowInternal(nullptr);
}
}
void PopupAnchor::setRect(Box rect) {
if (rect.w <= 0) rect.w = 1;
if (rect.h <= 0) rect.h = 1;
if (rect == this->mUserRect) return;
this->mUserRect = rect;
emit this->rectChanged();
this->setWindowRect(rect);
}
void PopupAnchor::setWindowRect(Box rect) {
if (rect.w <= 0) rect.w = 1;
if (rect.h <= 0) rect.h = 1;
if (rect == this->state.rect) return;
this->state.rect = rect;
emit this->windowRectChanged();
}
void PopupAnchor::resetRect() { this->mUserRect = Box(); }
void PopupAnchor::setEdges(Edges::Flags edges) {
if (edges == this->state.edges) return;
@ -110,8 +152,6 @@ void PopupAnchor::setEdges(Edges::Flags edges) {
emit this->edgesChanged();
}
Edges::Flags PopupAnchor::gravity() const { return this->state.gravity; }
void PopupAnchor::setGravity(Edges::Flags gravity) {
if (gravity == this->state.gravity) return;
@ -124,8 +164,6 @@ void PopupAnchor::setGravity(Edges::Flags gravity) {
emit this->gravityChanged();
}
PopupAdjustment::Flags PopupAnchor::adjustment() const { return this->state.adjustment; }
void PopupAnchor::setAdjustment(PopupAdjustment::Flags adjustment) {
if (adjustment == this->state.adjustment) return;
this->state.adjustment = adjustment;
@ -137,6 +175,19 @@ void PopupAnchor::updatePlacement(const QPoint& anchorpoint, const QSize& size)
this->state.size = size;
}
void PopupAnchor::updateAnchor() {
if (this->mItem && this->mProxyWindow) {
auto rect = this->mProxyWindow->contentItem()->mapRectFromItem(
this->mItem,
this->mUserRect.isEmpty() ? this->mItem->boundingRect() : this->mUserRect.qrect()
);
this->setWindowRect(rect);
}
emit this->anchoring();
}
static PopupPositioner* POSITIONER = nullptr; // NOLINT
void PopupPositioner::reposition(PopupAnchor* anchor, QWindow* window, bool onlyIfDirty) {
@ -148,7 +199,7 @@ void PopupPositioner::reposition(PopupAnchor* anchor, QWindow* window, bool only
auto parentGeometry = parentWindow->geometry();
auto windowGeometry = window->geometry();
emit anchor->anchoring();
anchor->updateAnchor();
anchor->updatePlacement(parentGeometry.topLeft(), windowGeometry.size());
if (onlyIfDirty && !anchor->isDirty()) return;
@ -156,7 +207,7 @@ void PopupPositioner::reposition(PopupAnchor* anchor, QWindow* window, bool only
auto adjustment = anchor->adjustment();
auto screenGeometry = parentWindow->screen()->geometry();
auto anchorRectGeometry = anchor->rect().qrect().translated(parentGeometry.topLeft());
auto anchorRectGeometry = anchor->windowRect().qrect().translated(parentGeometry.topLeft());
auto anchorEdges = anchor->edges();
auto anchorGravity = anchor->gravity();