From da498987a70d3be26b644f87a3a76f02229a59f1 Mon Sep 17 00:00:00 2001 From: Ambroz Bizjak Date: Tue, 3 Feb 2009 23:03:25 +0000 Subject: [PATCH] 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 --- popupapplet.cpp | 9 --------- private/popupapplet_p.h | 1 - 2 files changed, 10 deletions(-) diff --git a/popupapplet.cpp b/popupapplet.cpp index 5325b561d..a5c9873d4 100644 --- a/popupapplet.cpp +++ b/popupapplet.cpp @@ -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) { diff --git a/private/popupapplet_p.h b/private/popupapplet_p.h index 2c0e6d3bc..e0bc44fe4 100644 --- a/private/popupapplet_p.h +++ b/private/popupapplet_p.h @@ -46,7 +46,6 @@ public: Plasma::AspectRatioMode savedAspectRatio; QTimer *timer; QPoint clicked; - bool startupComplete : 1; bool popupLostFocus : 1; bool passive : 1; };