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

List:       kde-commits
Subject:    kdebase/kdesktop/lock
From:       Chris Howells <howells () kde ! org>
Date:       2004-11-17 20:05:10
Message-ID: 20041117200510.B119E16D48 () office ! kde ! org
[Download RAW message or body]

CVS commit by howells: 

I guess we need to use the gamma stuff for fading :(


  M +2 -20     lockprocess.cc   1.48
  M +0 -3      lockprocess.h   1.25


--- kdebase/kdesktop/lock/lockprocess.cc  #1.47:1.48
@@ -102,6 +102,5 @@ LockProcess::LockProcess(bool child, boo
       mRestoreXF86Lock(false),
       mForbidden(false),
-      mAutoLogout(false),
-      mFadeValue(0)
+      mAutoLogout(false)
 {
     setupSignals();
@@ -638,6 +637,5 @@ bool LockProcess::startSaver()
     XSync(qt_xdisplay(), False);
     setVRoot( winId(), winId() );
-    mOriginal = QPixmap::grabWindow(winId());
-    QTimer::singleShot(1, this, SLOT(slotFade()));
+    startHack();
     return true;
 }
@@ -735,20 +733,4 @@ bool LockProcess::startLock()
 
 
-void  LockProcess::slotFade()
-{
-    mFadeValue = mFadeValue + 0.1;
-    if (mFadeValue > 0.5)
-    {
-        startHack();
-        return;
-    }
-    else
-    {
-        KPixmapEffect::fade(mOriginal, mFadeValue, Qt::black);
-        bitBlt(this, 0, 0, &mOriginal);
-        QTimer::singleShot(1, this, SLOT(slotFade()));
-    }
- }
-
 bool LockProcess::startHack()
 {

--- kdebase/kdesktop/lock/lockprocess.h  #1.24:1.25
@@ -72,5 +72,4 @@ private slots:
     void checkDPMSActive();
     void slotDeadTimePassed();
-    void slotFade();
 
 private:
@@ -127,6 +126,4 @@ private:
     int         mAutoLogoutTimeout;
     bool        mAutoLogout;
-    KPixmap     mOriginal;
-    double      mFadeValue; 
 };
 


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