remove containment's geometry function
also remove from the config restore
This commit is contained in:
parent
a265ad7dbb
commit
68de44f1dd
@ -226,22 +226,6 @@ void Containment::restore(KConfigGroup &group)
|
||||
return;
|
||||
}
|
||||
|
||||
QRectF geo = group.readEntry("geometry", geometry());
|
||||
//override max/min
|
||||
//this ensures panels are set to their saved size even when they have max & min set to prevent
|
||||
//resizing
|
||||
if (geo.size() != geo.size().boundedTo(maximumSize())) {
|
||||
setMaximumSize(maximumSize().expandedTo(geo.size()));
|
||||
}
|
||||
|
||||
if (geo.size() != geo.size().expandedTo(minimumSize())) {
|
||||
setMinimumSize(minimumSize().boundedTo(geo.size()));
|
||||
}
|
||||
|
||||
|
||||
resize(geo.size());
|
||||
//FIXME: unbreak containments just for dashboard
|
||||
|
||||
setLocation((Plasma::Location)group.readEntry("location", (int)d->location));
|
||||
setFormFactor((Plasma::FormFactor)group.readEntry("formfactor", (int)d->formFactor));
|
||||
//kDebug() << "setScreen from restore";
|
||||
@ -1082,25 +1066,6 @@ bool Containment::acceptDrops() const
|
||||
return false;
|
||||
}
|
||||
|
||||
void Containment::setMaximumSize(QSizeF size)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
QSizeF Containment::maximumSize() const
|
||||
{
|
||||
return QSizeF();
|
||||
}
|
||||
|
||||
void Containment::setMinimumSize(QSizeF size)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
QSizeF Containment::minimumSize() const
|
||||
{
|
||||
return QSizeF();
|
||||
}
|
||||
|
||||
|
||||
} // Plasma namespace
|
||||
|
@ -521,11 +521,6 @@ Q_SIGNALS:
|
||||
*/
|
||||
void resizeEvent(QResizeEvent *event);
|
||||
|
||||
//FIXME: kill those
|
||||
QSizeF maximumSize() const;
|
||||
void setMaximumSize(QSizeF size);
|
||||
QSizeF minimumSize() const;
|
||||
void setMinimumSize(QSizeF size);
|
||||
|
||||
private:
|
||||
/**
|
||||
|
Loading…
Reference in New Issue
Block a user