[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/kicker/libkicker
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2005-07-11 6:27:36
Message-ID: 1121063256.380892.28103.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 433548 by aseigo:

i'd noticed this before and had taken a stab at it once, but someone actually
eporting a bug made me fix it for sure. damn bug reports. ;)
BUG:108901


 M  +10 -8     kickertip.cpp  


--- trunk/KDE/kdebase/kicker/libkicker/kickertip.cpp #433547:433548
@@ -36,7 +36,7 @@
 #include "kickertip.h"
 #include "kickerSettings.h"
 
-static const int DEFAULT_FRAMES = 30;
+static const int DEFAULT_FRAMES_PER_SECOND = 30;
 
 KickerTip* KickerTip::m_self = 0;
 int KickerTip::m_tippingEnabled = 1;
@@ -94,9 +94,6 @@
 
     // Declare interchange object and define defaults.
     Data data;
-    data.message = QString();
-    data.subtext = QString();
-    data.icon = QPixmap();
     data.maskEffect = Dissolve;
     data.duration = 4000;
     data.direction = KPanelApplet::Up;
@@ -134,7 +131,8 @@
 
     displayInternal();
 
-    m_frameTimer.start(KickerSettings::mouseOversSpeed() / DEFAULT_FRAMES);
+    m_frameTimer.start(KickerSettings::mouseOversSpeed() /
+                       (DEFAULT_FRAMES_PER_SECOND * (KickerSettings::mouseOversSpeed() / 1000.0)));
 
     // close the message window after given mS
     if (data.duration > 0)
@@ -253,9 +251,13 @@
     int textY = (height - textRect.height()) / 2;
 
     // resize pixmap, mask and widget
-    m_mask.resize(width, height);
-    m_pixmap.resize(width, height);
-    resize(width, height);
+    bool firstTime = m_dissolveSize == 24;
+    if (firstTime)
+    {
+        m_mask.resize(width, height);
+        m_pixmap.resize(width, height);
+        resize(width, height);
+    }
 
     // create and set transparency mask
     switch(m_maskEffect)
[prev in list] [next in list] [prev in thread] [next in thread]