backport 916941
Don't wait for startup complete, it makes the applet obtain proper geometry too late, which causes the desktop applet positioning algorithm to calculate a wrong initial position. BUG: 181854 svn path=/branches/KDE/4.2/kdelibs/; revision=920881
This commit is contained in:
parent
2bbae9fb2d
commit
da498987a7
@ -131,14 +131,6 @@ void PopupAppletPrivate::checkExtenderAppearance(Plasma::FormFactor f)
|
||||
|
||||
void PopupAppletPrivate::popupConstraintsEvent(Plasma::Constraints constraints)
|
||||
{
|
||||
if (constraints & Plasma::StartupCompletedConstraint) {
|
||||
startupComplete = true;
|
||||
}
|
||||
|
||||
if (!startupComplete) {
|
||||
return;
|
||||
}
|
||||
|
||||
Plasma::FormFactor f = q->formFactor();
|
||||
|
||||
if (constraints & Plasma::LocationConstraint) {
|
||||
@ -446,7 +438,6 @@ PopupAppletPrivate::PopupAppletPrivate(PopupApplet *applet)
|
||||
popupPlacement(Plasma::FloatingPopup),
|
||||
savedAspectRatio(Plasma::InvalidAspectRatioMode),
|
||||
timer(0),
|
||||
startupComplete(false),
|
||||
popupLostFocus(false),
|
||||
passive(false)
|
||||
{
|
||||
|
@ -46,7 +46,6 @@ public:
|
||||
Plasma::AspectRatioMode savedAspectRatio;
|
||||
QTimer *timer;
|
||||
QPoint clicked;
|
||||
bool startupComplete : 1;
|
||||
bool popupLostFocus : 1;
|
||||
bool passive : 1;
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user