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

this could be dangerous so we must pay attention in the next days for eventual regressions, but had to be done.

Browse Source 
eliminate all the hardcoded minimum sizes and relay on size hints instead since now they work(ish)

svn path=/trunk/KDE/kdelibs/; revision=1066284
This commit is contained in:
Marco Martin 2009-12-26 16:48:45 +00:00
parent a69bcc4827
commit a75a8e101a
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
applet.cpp
View File

@ -383,7 +383,6 @@ void Applet::setFailedToLaunch(bool failed, const QString &reason)
setLayout(failureLayout); setLayout(failureLayout);
resize(300, 250); resize(300, 250);
setMinimumSize(failureLayout->minimumSize());
d->background->resizeFrame(geometry().size()); d->background->resizeFrame(geometry().size());
} }
@ -915,9 +914,6 @@ void Applet::setBackgroundHints(const BackgroundHints hints)
d->background->getMargins(left, top, right, bottom); d->background->getMargins(left, top, right, bottom);
setContentsMargins(left, right, top, bottom); setContentsMargins(left, right, top, bottom);
QSizeF fitSize(left + right, top + bottom); QSizeF fitSize(left + right, top + bottom);
if (minimumSize().expandedTo(fitSize) != minimumSize()) {
setMinimumSize(minimumSize().expandedTo(fitSize));
}
d->background->resizeFrame(boundingRect().size()); d->background->resizeFrame(boundingRect().size());
//if the background has an "overlay" element decide a random position for it and then save it so it's consistent across plasma starts //if the background has an "overlay" element decide a random position for it and then save it so it's consistent across plasma starts
@ -934,10 +930,6 @@ void Applet::setBackgroundHints(const BackgroundHints hints)
} else if (d->background) { } else if (d->background) {
qreal left, top, right, bottom; qreal left, top, right, bottom;
d->background->getMargins(left, top, right, bottom); d->background->getMargins(left, top, right, bottom);
//Setting a minimum size of 0,0 would result in the panel to be only
//on the first virtual desktop
setMinimumSize(qMax(minimumSize().width() - left - right, qreal(1.0)),
qMax(minimumSize().height() - top - bottom, qreal(1.0)));
delete d->background; delete d->background;
d->background = 0; d->background = 0;
@ -1229,7 +1221,6 @@ void Applet::flushPendingConstraintsEvents()
if (d->failed) { if (d->failed) {
if (f == Vertical || f == Horizontal) { if (f == Vertical || f == Horizontal) {
setMinimumSize(0, 0);
QGraphicsLayoutItem *item = layout()->itemAt(1); QGraphicsLayoutItem *item = layout()->itemAt(1);
layout()->removeAt(1); layout()->removeAt(1);
delete item; delete item;