alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "[Dialog] Don't apply margins with DiscardBackgroundMargins instead of reverse"

Browse Source 
This reverts commit 4f80d91ceb
This commit is contained in:
Mikel Johnson 2020-11-20 15:21:06 +00:00
parent 717e2ab7b0
commit d56ca431c2
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/plasmaquick/dialog.cpp
View File

@ -487,13 +487,13 @@ void DialogPrivate::updateLayoutParameters()
} }
if (q->backgroundHints().testFlag(Dialog::DiscardBackgroundMargins)) { if (q->backgroundHints().testFlag(Dialog::DiscardBackgroundMargins)) {
mainItem->setPosition(QPointF(0, 0));
mainItem->setSize(QSizeF(q->width(), q->height()));
} else {
mainItem->setPosition(QPointF(margin->left(), mainItem->setPosition(QPointF(margin->left(),
margin->top())); margin->top()));
mainItem->setSize(QSizeF(q->width() - margin->left() - margin->right(), mainItem->setSize(QSizeF(q->width() - margin->left() - margin->right(),
q->height() - margin->top() - margin->bottom())); q->height() - margin->top() - margin->bottom()));
} else {
mainItem->setPosition(QPointF(0, 0));
mainItem->setSize(QSizeF(q->width(), q->height()));
} }
frameSvgItem->setSize(QSizeF(q->width(), frameSvgItem->setSize(QSizeF(q->width(),
@ -643,10 +643,10 @@ void DialogPrivate::syncToMainItemSize()
} }
if (q->backgroundHints().testFlag(Dialog::DiscardBackgroundMargins)) { if (q->backgroundHints().testFlag(Dialog::DiscardBackgroundMargins)) {
mainItem->setPosition(QPointF(0, 0));
} else {
mainItem->setPosition(QPointF(frameSvgItem->fixedMargins()->left(), mainItem->setPosition(QPointF(frameSvgItem->fixedMargins()->left(),
frameSvgItem->fixedMargins()->top())); frameSvgItem->fixedMargins()->top()));
} else {
mainItem->setPosition(QPointF(0, 0));
} }
updateTheme(); updateTheme();
@ -666,13 +666,13 @@ void DialogPrivate::slotWindowPositionChanged()
if (mainItem) { if (mainItem) {
auto margin = frameSvgItem->fixedMargins(); auto margin = frameSvgItem->fixedMargins();
if (q->backgroundHints().testFlag(Dialog::DiscardBackgroundMargins)) { if (q->backgroundHints().testFlag(Dialog::DiscardBackgroundMargins)) {
mainItem->setPosition(QPointF(0, 0));
mainItem->setSize(QSizeF(q->width(), q->height()));
} else {
mainItem->setPosition(QPointF(margin->left(), mainItem->setPosition(QPointF(margin->left(),
margin->top())); margin->top()));
mainItem->setSize(QSizeF(q->width() - margin->left() - margin->right(), mainItem->setSize(QSizeF(q->width() - margin->left() - margin->right(),
q->height() - margin->top() - margin->bottom())); q->height() - margin->top() - margin->bottom()));
} else {
mainItem->setPosition(QPointF(0, 0));
mainItem->setSize(QSizeF(q->width(), q->height()));
} }
} }
} }
@ -1133,13 +1133,13 @@ void Dialog::resizeEvent(QResizeEvent* re)
re->size().height())); re->size().height()));
auto margin = d->frameSvgItem->fixedMargins(); auto margin = d->frameSvgItem->fixedMargins();
if (backgroundHints().testFlag(Dialog::DiscardBackgroundMargins)) { if (backgroundHints().testFlag(Dialog::DiscardBackgroundMargins)) {
d->mainItem->setPosition(QPointF(0, 0));
d->mainItem->setSize(QSizeF(re->size().width(), re->size().height()));
} else {
d->mainItem->setPosition(QPointF(margin->left(), d->mainItem->setPosition(QPointF(margin->left(),
margin->top())); margin->top()));
d->mainItem->setSize(QSizeF(re->size().width() - margin->left() - margin->right(), d->mainItem->setSize(QSizeF(re->size().width() - margin->left() - margin->right(),
re->size().height() - margin->top() - margin->bottom())); re->size().height() - margin->top() - margin->bottom()));
} else {
d->mainItem->setPosition(QPointF(0, 0));
d->mainItem->setSize(QSizeF(re->size().width(), re->size().height()));
} }
QObject::connect(d->mainItem, SIGNAL(widthChanged()), this, SLOT(slotMainItemSizeChanged())); QObject::connect(d->mainItem, SIGNAL(widthChanged()), this, SLOT(slotMainItemSizeChanged()));