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

backport 916941

Browse Source 
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:
Ambroz Bizjak 2009-02-03 23:03:25 +00:00
parent 2bbae9fb2d
commit da498987a7
2 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
popupapplet.cpp
View File

@ -131,14 +131,6 @@ void PopupAppletPrivate::checkExtenderAppearance(Plasma::FormFactor f)
void PopupAppletPrivate::popupConstraintsEvent(Plasma::Constraints constraints) void PopupAppletPrivate::popupConstraintsEvent(Plasma::Constraints constraints)
{ {
if (constraints & Plasma::StartupCompletedConstraint) {
startupComplete = true;
}
if (!startupComplete) {
return;
}
Plasma::FormFactor f = q->formFactor(); Plasma::FormFactor f = q->formFactor();
if (constraints & Plasma::LocationConstraint) { if (constraints & Plasma::LocationConstraint) {
@ -446,7 +438,6 @@ PopupAppletPrivate::PopupAppletPrivate(PopupApplet *applet)
popupPlacement(Plasma::FloatingPopup), popupPlacement(Plasma::FloatingPopup),
savedAspectRatio(Plasma::InvalidAspectRatioMode), savedAspectRatio(Plasma::InvalidAspectRatioMode),
timer(0), timer(0),
startupComplete(false),
popupLostFocus(false), popupLostFocus(false),
passive(false) passive(false)
{ {

1
private/popupapplet_p.h
View File

@ -46,7 +46,6 @@ public:
Plasma::AspectRatioMode savedAspectRatio; Plasma::AspectRatioMode savedAspectRatio;
QTimer *timer; QTimer *timer;
QPoint clicked; QPoint clicked;
bool startupComplete : 1;
bool popupLostFocus : 1; bool popupLostFocus : 1;
bool passive : 1; bool passive : 1;
}; };