kosslan/quickshell
1
0
Fork 0
forked from quickshell/quickshell
Code Pull requests Activity

feat: expose ProxyWindowBase contentItem

Browse source
This commit is contained in:
outfoxxed 2024-02-18 19:02:10 -08:00
parent 1ecc943eb3
commit 6ad4fffc17
Signed by: outfoxxed
GPG key ID: 4C88A185FB89301E
2 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/cpp/proxywindow.cpp
View file

@ -13,8 +13,8 @@
#include "reload.hpp" #include "reload.hpp"
ProxyWindowBase::ProxyWindowBase(QObject* parent): Reloadable(parent) { ProxyWindowBase::ProxyWindowBase(QObject* parent): Reloadable(parent) {
this->contentItem = new QQuickItem(); // NOLINT this->mContentItem = new QQuickItem(); // NOLINT
this->contentItem->setParent(this); this->mContentItem->setParent(this);
QObject::connect(this, &ProxyWindowBase::widthChanged, this, &ProxyWindowBase::onWidthChanged); QObject::connect(this, &ProxyWindowBase::widthChanged, this, &ProxyWindowBase::onWidthChanged);
QObject::connect(this, &ProxyWindowBase::heightChanged, this, &ProxyWindowBase::onHeightChanged); QObject::connect(this, &ProxyWindowBase::heightChanged, this, &ProxyWindowBase::onHeightChanged);
@ -37,12 +37,12 @@ void ProxyWindowBase::onReload(QObject* oldInstance) {
this->setupWindow(); this->setupWindow();
Reloadable::reloadRecursive(this->contentItem, oldInstance); Reloadable::reloadRecursive(this->mContentItem, oldInstance);
this->contentItem->setParentItem(this->window->contentItem()); this->mContentItem->setParentItem(this->window->contentItem());
this->contentItem->setWidth(this->width()); this->mContentItem->setWidth(this->width());
this->contentItem->setHeight(this->height()); this->mContentItem->setHeight(this->height());
emit this->windowConnected(); emit this->windowConnected();
this->window->setVisible(this->mVisible); this->window->setVisible(this->mVisible);
@ -69,7 +69,7 @@ void ProxyWindowBase::setupWindow() {
QQuickWindow* ProxyWindowBase::disownWindow() { QQuickWindow* ProxyWindowBase::disownWindow() {
QObject::disconnect(this->window, nullptr, this, nullptr); QObject::disconnect(this->window, nullptr, this, nullptr);
this->contentItem->setParentItem(nullptr); this->mContentItem->setParentItem(nullptr);
auto* window = this->window; auto* window = this->window;
this->window = nullptr; this->window = nullptr;
@ -77,6 +77,7 @@ QQuickWindow* ProxyWindowBase::disownWindow() {
} }
QQuickWindow* ProxyWindowBase::backingWindow() const { return this->window; } QQuickWindow* ProxyWindowBase::backingWindow() const { return this->window; }
QQuickItem* ProxyWindowBase::contentItem() const { return this->mContentItem; }
bool ProxyWindowBase::isVisible() const { bool ProxyWindowBase::isVisible() const {
if (this->window == nullptr) return this->mVisible; if (this->window == nullptr) return this->mVisible;
@ -161,12 +162,12 @@ void ProxyWindowBase::updateMask() {
} }
QQmlListProperty<QObject> ProxyWindowBase::data() { QQmlListProperty<QObject> ProxyWindowBase::data() {
return this->contentItem->property("data").value<QQmlListProperty<QObject>>(); return this->mContentItem->property("data").value<QQmlListProperty<QObject>>();
} }
void ProxyWindowBase::onWidthChanged() { this->contentItem->setWidth(this->width()); } void ProxyWindowBase::onWidthChanged() { this->mContentItem->setWidth(this->width()); }
void ProxyWindowBase::onHeightChanged() { this->contentItem->setHeight(this->height()); } void ProxyWindowBase::onHeightChanged() { this->mContentItem->setHeight(this->height()); }
void ProxyFloatingWindow::setWidth(qint32 width) { void ProxyFloatingWindow::setWidth(qint32 width) {
if (this->window == nullptr || !this->window->isVisible()) this->ProxyWindowBase::setWidth(width); if (this->window == nullptr || !this->window->isVisible()) this->ProxyWindowBase::setWidth(width);

4
src/cpp/proxywindow.hpp
View file

@ -33,6 +33,7 @@ class ProxyWindowBase: public Reloadable {
/// > /// >
/// > Use **only** if you know what you are doing. /// > Use **only** if you know what you are doing.
Q_PROPERTY(QQuickWindow* _backingWindow READ backingWindow); Q_PROPERTY(QQuickWindow* _backingWindow READ backingWindow);
Q_PROPERTY(QQuickItem* contentItem READ contentItem);
/// If the window is shown or hidden. Defaults to true. /// If the window is shown or hidden. Defaults to true.
Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleChanged); Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleChanged);
Q_PROPERTY(qint32 width READ width WRITE setWidth NOTIFY widthChanged); Q_PROPERTY(qint32 width READ width WRITE setWidth NOTIFY widthChanged);
@ -117,6 +118,7 @@ public:
virtual QQuickWindow* disownWindow(); virtual QQuickWindow* disownWindow();
[[nodiscard]] QQuickWindow* backingWindow() const; [[nodiscard]] QQuickWindow* backingWindow() const;
[[nodiscard]] QQuickItem* contentItem() const;
[[nodiscard]] virtual bool isVisible() const; [[nodiscard]] virtual bool isVisible() const;
virtual void setVisible(bool visible); virtual void setVisible(bool visible);
@ -155,7 +157,7 @@ protected:
QColor mColor = Qt::white; QColor mColor = Qt::white;
PendingRegion* mMask = nullptr; PendingRegion* mMask = nullptr;
QQuickWindow* window = nullptr; QQuickWindow* window = nullptr;
QQuickItem* contentItem = nullptr; QQuickItem* mContentItem = nullptr;
private: private:
void updateMask(); void updateMask();