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

widgets/wrapper: fix margin wrapper reactvity and margins

Browse source 
Fixed reactivity of the paren't actual size not working before child
had been assigned.

Fixed incorrect margins when actual size is less than implicit size.
This commit is contained in:
outfoxxed 2024-11-19 02:57:04 -08:00
parent 033e810871
commit ee93306312
Signed by untrusted user: outfoxxed
GPG key ID: 4C88A185FB89301E
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/widgets/marginwrapper.cpp
View file

@ -20,6 +20,8 @@ MarginWrapperManager::MarginWrapperManager(QObject* parent): WrapperManager(pare
} }
void MarginWrapperManager::componentComplete() { void MarginWrapperManager::componentComplete() {
this->WrapperManager::componentComplete();
if (this->mWrapper) { if (this->mWrapper) {
QObject::connect( QObject::connect(
this->mWrapper, this->mWrapper,
@ -36,8 +38,6 @@ void MarginWrapperManager::componentComplete() {
); );
} }
this->WrapperManager::componentComplete();
if (!this->mChild) this->updateGeometry(); if (!this->mChild) this->updateGeometry();
} }
@ -97,12 +97,19 @@ qreal MarginWrapperManager::targetChildHeight() const {
qreal MarginWrapperManager::targetChildX() const { qreal MarginWrapperManager::targetChildX() const {
if (this->mResizeChild) return this->mMargin; if (this->mResizeChild) return this->mMargin;
else return this->mWrapper->width() / 2 - this->mChild->implicitWidth() / 2; else {
return std::max(this->mMargin, this->mWrapper->width() / 2 - this->mChild->implicitWidth() / 2);
}
} }
qreal MarginWrapperManager::targetChildY() const { qreal MarginWrapperManager::targetChildY() const {
if (this->mResizeChild) return this->mMargin; if (this->mResizeChild) return this->mMargin;
else return this->mWrapper->height() / 2 - this->mChild->implicitHeight() / 2; else {
return std::max(
this->mMargin,
this->mWrapper->height() / 2 - this->mChild->implicitHeight() / 2
);
}
} }
void MarginWrapperManager::onWrapperWidthChanged() { void MarginWrapperManager::onWrapperWidthChanged() {