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

corrected a bug that led to 100% cpu usage in some cases (endless

Browse Source 
resizing loop) had to use maximum and minimum sizes, layouts seems to be
sooo stoopid :(

svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=813266
This commit is contained in:
Marco Martin 2008-05-27 10:04:52 +00:00
parent df6d7e06a5
commit 83a5c1ee6f
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
applet.cpp
View File

@ -720,14 +720,24 @@ void Applet::flushPendingConstraintsEvents()
} }
//enforce square size in panels //enforce square size in panels
if (aspectRatioMode() == Plasma::Square && (c & Plasma::SizeConstraint || c & Plasma::FormFactorConstraint)) { if (aspectRatioMode() == Plasma::Square && (c & Plasma::SizeConstraint || c & Plasma::FormFactorConstraint) &&
size().height() != size().width()) {
if (formFactor() == Horizontal) { if (formFactor() == Horizontal) {
setSizePolicy(QSizePolicy(QSizePolicy::Fixed,QSizePolicy::Expanding)); setSizePolicy(QSizePolicy(QSizePolicy::Maximum,QSizePolicy::Expanding));
resize(QSizeF(size().height(), size().height())); resize(QSizeF(size().height(), size().height()));
//FIXME: it shouldn't be used maximum and minimum sizes, layouts are weird
setMaximumWidth(size().height());
setMinimumWidth(size().height());
} else if (formFactor() == Vertical) { } else if (formFactor() == Vertical) {
setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Fixed)); setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Fixed));
resize(QSizeF(size().width(), size().width())); resize(QSizeF(size().width(), size().width()));
setMaximumHeight(size().width());
setMinimumHeight(size().width());
} }
//if we are on desktop again restore maximum size
} else if (aspectRatioMode() == Plasma::Square && (c & Plasma::FormFactorConstraint) && formFactor() != Horizontal && formFactor() != Vertical) {
setMaximumSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX);
setMinimumSize(0, 0);
} }
Containment* containment = qobject_cast<Plasma::Containment*>(this); Containment* containment = qobject_cast<Plasma::Containment*>(this);