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

more heuristics in finding out the formfactor when an applet is inside another:

Browse Source 
a popupapplet is alwais constrained if not directly in containment, an applet depends from the layout minimum size hint (and yes, is just to not break systemmonitor)

svn path=/trunk/KDE/kdelibs/; revision=1113811
This commit is contained in:
Marco Martin 2010-04-11 21:05:55 +00:00
parent d29ea0a926
commit 956b5a8cc2
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
applet.cpp
View File

@ -1401,14 +1401,23 @@ FormFactor Applet::formFactor() const
QGraphicsWidget *p = dynamic_cast<QGraphicsWidget *>(parentItem());
const PopupApplet *pa = dynamic_cast<const PopupApplet *>(this);
//if the applet is in a widget that isn't a containment
//try to retrieve the formFactor from the parent size
//we can't use our own sizeHint here because it needs formFactor, so endless recursion
if (p && p != c && c != this && layout()) {
if (p->size().width() < layout()->effectiveSizeHint(Qt::MinimumSize).width()) {
return Plasma::Vertical;
} else if (p->size().height() < layout()->effectiveSizeHint(Qt::MinimumSize).height()) {
//we can't use our own sizeHint here because it needs formFactor, so endless recursion.
// a popupapplet can always be constrained.
// a normal applet should to but
//FIXME: not always constrained to not break systemmonitor
if (p && p != c && c != this && (pa || layout())) {
if (pa || (p->size().height() < layout()->effectiveSizeHint(Qt::MinimumSize).height())) {
return Plasma::Horizontal;
} else if (p->size().width() < layout()->effectiveSizeHint(Qt::MinimumSize).width()) {
return Plasma::Vertical;
}
const Applet *a = qobject_cast<Applet *>(p);
if (a) {
return a->formFactor();
}
}