From 5e46bcc2ef818e178dd49f838d994daf79461953 Mon Sep 17 00:00:00 2001 From: Ambroz Bizjak Date: Mon, 26 Jan 2009 14:29:55 +0000 Subject: [PATCH] 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. CCBUG: 181854 svn path=/trunk/KDE/kdelibs/; revision=916941 --- popupapplet.cpp | 9 --------- private/popupapplet_p.h | 1 - 2 files changed, 10 deletions(-) diff --git a/popupapplet.cpp b/popupapplet.cpp index e88a5e947..435abed66 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) { @@ -445,7 +437,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; };