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

Move the QGL resize hacks from extender to extenderapplet. The only applet atm for which this hack is necesarry is actually extenderapplet, in the future we will have better layouts, and it won't be necesarry at all, and for now it avoids breaking panel layouts when removing the last extenderitem from an extenderapplet.

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=908195
This commit is contained in:
Rob Scheepmaker 2009-01-09 13:13:57 +00:00
parent 60fad5ba0b
commit aea9e0e6d8
3 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
extender.cpp
View File

@ -475,17 +475,6 @@ void ExtenderPrivate::adjustSizeHints()
q->setMinimumSize(layout->preferredSize()); q->setMinimumSize(layout->preferredSize());
} }
if (applet->layout()) {
applet->layout()->updateGeometry();
qreal left, top, right, bottom;
applet->getContentsMargins(&left, &top, &right, &bottom);
QSizeF margins(left + right, top + bottom);
applet->setMinimumSize(applet->layout()->minimumSize() + margins);
applet->adjustSize();
}
q->adjustSize(); q->adjustSize();
emit q->geometryChanged(); emit q->geometryChanged();

19
private/extenderapplet.cpp
View File

@ -52,6 +52,8 @@ void ExtenderApplet::init()
connect(extender(), SIGNAL(itemDetached(Plasma::ExtenderItem*)), connect(extender(), SIGNAL(itemDetached(Plasma::ExtenderItem*)),
this, SLOT(itemDetached(Plasma::ExtenderItem*))); this, SLOT(itemDetached(Plasma::ExtenderItem*)));
connect(extender(), SIGNAL(geometryChanged()),
this, SLOT(extenderGeometryChanged()));
} }
void ExtenderApplet::itemDetached(Plasma::ExtenderItem *) void ExtenderApplet::itemDetached(Plasma::ExtenderItem *)
@ -61,6 +63,23 @@ void ExtenderApplet::itemDetached(Plasma::ExtenderItem *)
} }
} }
void ExtenderApplet::extenderGeometryChanged()
{
if (formFactor() != Plasma::Horizontal &&
formFactor() != Plasma::Vertical) {
qreal left, top, right, bottom;
getContentsMargins(&left, &top, &right, &bottom);
QSizeF margins(left + right, top + bottom);
setMinimumSize(extender()->minimumSize() + margins);
setMaximumSize(extender()->maximumSize() + margins);
setPreferredSize(extender()->preferredSize() + margins);
adjustSize();
}
}
} // namespace Plasma } // namespace Plasma
#include "extenderapplet_p.moc" #include "extenderapplet_p.moc"

1
private/extenderapplet_p.h
View File

@ -41,6 +41,7 @@ class ExtenderApplet : public Plasma::PopupApplet
public Q_SLOTS: public Q_SLOTS:
void itemDetached(Plasma::ExtenderItem *); void itemDetached(Plasma::ExtenderItem *);
void extenderGeometryChanged();
}; };
} // namespace Plasma } // namespace Plasma