By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] Updated patch to add secondary fadeaway control

tdebase-fadeaway.diff (text/plain), 15.09 KB, created by Darrell on 2014-03-10 17:20:34 CDT

(hide)

Description: Updated patch to add secondary fadeaway control

Filename:

MIME Type:

Creator: Darrell

Created: 2014-03-10 17:20:34 CDT

Size: 15.09 KB

patch

obsolete

>diff -urN tdebase/kcontrol/smserver/kcmsmserver.cpp tdebase.new/kcontrol/smserver/kcmsmserver.cpp >--- tdebase/kcontrol/smserver/kcmsmserver.cpp 2013-03-03 21:06:57.000000000 -0600 >+++ tdebase.new/kcontrol/smserver/kcmsmserver.cpp 2014-03-10 17:07:57.321084180 -0500 >@@ -94,7 +94,9 @@ > > c->setGroup("Logout"); > dialog->showLogoutStatusDialog->setChecked(c->readBoolEntry("showLogoutStatusDlg", true)); >+ dialog->showFadeAway->setChecked(c->readBoolEntry("doFadeaway", true)); > dialog->showFancyFadeAway->setChecked(c->readBoolEntry("doFancyLogout", true)); >+ dialog->showFancyFadeAway->setEnabled(dialog->showLogoutStatusDialog->isChecked() && dialog->showFadeAway->isChecked()), > > delete c; > >@@ -124,6 +126,7 @@ > c->writeEntry("excludeApps", dialog->excludeLineedit->text()); > c->setGroup("Logout"); > c->writeEntry( "showLogoutStatusDlg", dialog->showLogoutStatusDialog->isChecked()); >+ c->writeEntry( "doFadeaway", dialog->showFadeAway->isChecked()); > c->writeEntry( "doFancyLogout", dialog->showFancyFadeAway->isChecked()); > c->sync(); > delete c; >diff -urN tdebase/kcontrol/smserver/smserverconfigdlg.ui tdebase.new/kcontrol/smserver/smserverconfigdlg.ui >--- tdebase/kcontrol/smserver/smserverconfigdlg.ui 2013-03-03 21:06:57.000000000 -0600 >+++ tdebase.new/kcontrol/smserver/smserverconfigdlg.ui 2014-03-09 17:35:38.659945208 -0500 >@@ -55,18 +55,32 @@ > </property> > </widget> > <widget class="TQCheckBox"> >- <property name="name"> >- <cstring>showFancyFadeAway</cstring> >- </property> >- <property name="enabled"> >- <bool>false</bool> >- </property> >- <property name="text"> >- <string>Show fancy &amp;logout fadeaway</string> >- </property> >- <property name="whatsThis" stdset="0"> >- <string>Check this option if you want to see a fancy fadeaway when displaying a logout confirmation dialog box.</string> >- </property> >+ <property name="name"> >+ <cstring>showFadeAway</cstring> >+ </property> >+ <property name="enabled"> >+ <bool>false</bool> >+ </property> >+ <property name="text"> >+ <string>Show &amp;logout fadeaway</string> >+ </property> >+ <property name="whatsThis" stdset="0"> >+ <string>Check this option if you want to see a fadeaway when displaying a logout confirmation dialog box.</string> >+ </property> >+ </widget> >+ <widget class="TQCheckBox"> >+ <property name="name"> >+ <cstring>showFancyFadeAway</cstring> >+ </property> >+ <property name="enabled"> >+ <bool>false</bool> >+ </property> >+ <property name="text"> >+ <string>Sho&amp;w fancy logout fadeaway</string> >+ </property> >+ <property name="whatsThis" stdset="0"> >+ <string>Check this option if you want to see a fancy fadeaway when displaying a logout confirmation dialog box.</string> >+ </property> > </widget> > <widget class="TQCheckBox"> > <property name="name"> >@@ -235,16 +249,34 @@ > <slot>configChanged()</slot> > </connection> > <connection> >- <sender>confirmLogoutCheck</sender> >- <signal>toggled(bool)</signal> >- <receiver>showFancyFadeAway</receiver> >- <slot>setEnabled(bool)</slot> >+ <sender>confirmLogoutCheck</sender> >+ <signal>toggled(bool)</signal> >+ <receiver>showFadeAway</receiver> >+ <slot>setEnabled(bool)</slot> > </connection> > <connection> >- <sender>showFancyFadeAway</sender> >- <signal>toggled(bool)</signal> >- <receiver>SMServerConfigDlg</receiver> >- <slot>configChanged()</slot> >+ <sender>confirmLogoutCheck</sender> >+ <signal>toggled(bool)</signal> >+ <receiver>showFancyFadeAway</receiver> >+ <slot>setEnabled(bool)</slot> >+ </connection> >+ <connection> >+ <sender>showFadeAway</sender> >+ <signal>toggled(bool)</signal> >+ <receiver>showFancyFadeAway</receiver> >+ <slot>setEnabled(bool)</slot> >+ </connection> >+ <connection> >+ <sender>showFadeAway</sender> >+ <signal>toggled(bool)</signal> >+ <receiver>SMServerConfigDlg</receiver> >+ <slot>configChanged()</slot> >+ </connection> >+ <connection> >+ <sender>showFancyFadeAway</sender> >+ <signal>toggled(bool)</signal> >+ <receiver>SMServerConfigDlg</receiver> >+ <slot>configChanged()</slot> > </connection> > <connection> > <sender>showLogoutStatusDialog</sender> >diff -urN tdebase/ksmserver/shutdowndlg.cpp tdebase.new/ksmserver/shutdowndlg.cpp >--- tdebase/ksmserver/shutdowndlg.cpp 2013-12-04 11:35:00.000000000 -0600 >+++ tdebase.new/ksmserver/shutdowndlg.cpp 2014-03-09 18:08:40.617837188 -0500 >@@ -113,7 +113,8 @@ > void KSMShutdownFeedback::slotPaintEffect() > { > // determine which fade to use >- if (TDEConfigGroup(TDEGlobal::config(), "Logout").readBoolEntry("doFancyLogout", true)) { >+ if ( (TDEConfigGroup(TDEGlobal::config(), "Logout").readBoolEntry("doFadeaway", true)) && >+ (TDEConfigGroup(TDEGlobal::config(), "Logout").readBoolEntry("doFancyLogout", true)) ) { > // fancy logout fade > float doFancyLogoutAdditionalDarkness = (float)TDEConfigGroup(TDEGlobal::config(), "Logout").readDoubleNumEntry("doFancyLogoutAdditionalDarkness", 0.6); > float doFancyLogoutFadeTime = (float)TDEConfigGroup(TDEGlobal::config(), "Logout").readDoubleNumEntry("doFancyLogoutFadeTime", 4000); >@@ -363,149 +364,151 @@ > } > } > else { >- // standard logout fade >- if (kapp->isX11CompositionAvailable()) { >- // We can do this in a different (simpler) manner because we have compositing support! >- // The end effect will be very similar to the old style logout >- float doFancyLogoutFadeTime = 1000; >- float doFancyLogoutFadeBackTime = 0; >- if ( m_greyImageCreated == false ) { >- m_greyImageCreated = true; >- >- // eliminate nasty flicker on first show >- m_root.resize( width(), height() ); >- TQImage blendedImage = m_grayImage; >- TQPainter p; >- p.begin( &m_root ); >- blendedImage.setAlphaBuffer(false); >- p.drawImage( 0, 0, blendedImage ); >- p.end(); >- >- setBackgroundPixmap( m_root ); >- setGeometry( TQApplication::desktop()->geometry() ); >- setBackgroundMode( TQWidget::NoBackground ); >- >- m_unfadedImage = m_grayImage.copy(); >- >- register uchar * r = m_grayImage.bits(); >- uchar * end = m_grayImage.bits() + m_grayImage.numBytes(); >- >- while ( r != end ) { >- *reinterpret_cast<TQRgb*>(r) = tqRgba(0, 0, 0, 107); >- r += 4; >+ if (TDEConfigGroup(TDEGlobal::config(), "Logout").readBoolEntry("doFadeaway", true)) { >+ // standard logout fade >+ if (kapp->isX11CompositionAvailable()) { >+ // We can do this in a different (simpler) manner because we have compositing support! >+ // The end effect will be very similar to the old style logout >+ float doFancyLogoutFadeTime = 1000; >+ float doFancyLogoutFadeBackTime = 0; >+ if ( m_greyImageCreated == false ) { >+ m_greyImageCreated = true; >+ >+ // eliminate nasty flicker on first show >+ m_root.resize( width(), height() ); >+ TQImage blendedImage = m_grayImage; >+ TQPainter p; >+ p.begin( &m_root ); >+ blendedImage.setAlphaBuffer(false); >+ p.drawImage( 0, 0, blendedImage ); >+ p.end(); >+ >+ setBackgroundPixmap( m_root ); >+ setGeometry( TQApplication::desktop()->geometry() ); >+ setBackgroundMode( TQWidget::NoBackground ); >+ >+ m_unfadedImage = m_grayImage.copy(); >+ >+ register uchar * r = m_grayImage.bits(); >+ uchar * end = m_grayImage.bits() + m_grayImage.numBytes(); >+ >+ while ( r != end ) { >+ *reinterpret_cast<TQRgb*>(r) = tqRgba(0, 0, 0, 107); >+ r += 4; >+ } >+ >+ // start timer which is used for cpu-speed-independent fading >+ m_fadeTime.start(); >+ m_rowsDone = 0; >+ } >+ >+ // return if fading is completely done... >+ if ( ( m_grayOpacity >= 1.0f && m_fadeBackwards == FALSE ) || ( m_grayOpacity <= 0.0f && m_fadeBackwards == TRUE ) ) { >+ return; >+ } >+ >+ if ( m_fadeBackwards == FALSE ) { >+ m_grayOpacity = m_fadeTime.elapsed() / doFancyLogoutFadeTime; >+ if ( m_grayOpacity > 1.0f ) >+ m_grayOpacity = 1.0f; >+ } >+ else { >+ m_grayOpacity = 1.0f - m_fadeTime.elapsed() / doFancyLogoutFadeBackTime - m_compensation; >+ if ( m_grayOpacity < 0.0f ) >+ m_grayOpacity = 0.0f; >+ } >+ >+ const int imgWidth = m_unfadedImage.width(); >+ int imgHeight = m_unfadedImage.height(); >+ int heightUnit = imgHeight / 3; >+ if( heightUnit < 1 ) >+ heightUnit = 1; >+ >+ int y1 = static_cast<int>( imgHeight*m_grayOpacity - heightUnit + m_grayOpacity*heightUnit*2.0f ); >+ if( y1 > imgHeight ) { >+ y1 = imgHeight; >+ } >+ >+ int y2 = y1+heightUnit; >+ if( y2 > imgHeight ) { >+ y2 = imgHeight; > } >- >- // start timer which is used for cpu-speed-independent fading >- m_fadeTime.start(); >- m_rowsDone = 0; >- } >- >- // return if fading is completely done... >- if ( ( m_grayOpacity >= 1.0f && m_fadeBackwards == FALSE ) || ( m_grayOpacity <= 0.0f && m_fadeBackwards == TRUE ) ) { >- return; >- } >- >- if ( m_fadeBackwards == FALSE ) { >- m_grayOpacity = m_fadeTime.elapsed() / doFancyLogoutFadeTime; >- if ( m_grayOpacity > 1.0f ) >- m_grayOpacity = 1.0f; >- } >- else { >- m_grayOpacity = 1.0f - m_fadeTime.elapsed() / doFancyLogoutFadeBackTime - m_compensation; >- if ( m_grayOpacity < 0.0f ) >- m_grayOpacity = 0.0f; >- } >- >- const int imgWidth = m_unfadedImage.width(); >- int imgHeight = m_unfadedImage.height(); >- int heightUnit = imgHeight / 3; >- if( heightUnit < 1 ) >- heightUnit = 1; >- >- int y1 = static_cast<int>( imgHeight*m_grayOpacity - heightUnit + m_grayOpacity*heightUnit*2.0f ); >- if( y1 > imgHeight ) { >- y1 = imgHeight; >- } >- >- int y2 = y1+heightUnit; >- if( y2 > imgHeight ) { >- y2 = imgHeight; >- } >- >- if( m_fadeBackwards == FALSE ) >- { >- if( y1 > 0 && y1 < imgHeight && y1-m_rowsDone > 0 && m_rowsDone < imgHeight ) >+ >+ if( m_fadeBackwards == FALSE ) > { >- TQImage img( imgWidth, y1-m_rowsDone, 32 ); >- memcpy( img.bits(), m_grayImage.scanLine( m_rowsDone ), imgWidth*(y1-m_rowsDone)*4 ); >- bitBlt( this, 0, m_rowsDone, &img ); >- m_rowsDone = y1; >+ if( y1 > 0 && y1 < imgHeight && y1-m_rowsDone > 0 && m_rowsDone < imgHeight ) >+ { >+ TQImage img( imgWidth, y1-m_rowsDone, 32 ); >+ memcpy( img.bits(), m_grayImage.scanLine( m_rowsDone ), imgWidth*(y1-m_rowsDone)*4 ); >+ bitBlt( this, 0, m_rowsDone, &img ); >+ m_rowsDone = y1; >+ } > } >- } >- else { >- // when fading back we have to blit area which isnt gray anymore to unfaded image >- if( y2 > 0 && y2 < imgHeight && m_rowsDone > y2 ) >- { >- TQImage img( imgWidth, m_rowsDone-y2, 32 ); >- memcpy( img.bits(), m_unfadedImage.scanLine( y2 ), imgWidth*(m_rowsDone-y2)*4 ); >- bitBlt( this, 0, y2, &img ); >- m_rowsDone = y2; >+ else { >+ // when fading back we have to blit area which isnt gray anymore to unfaded image >+ if( y2 > 0 && y2 < imgHeight && m_rowsDone > y2 ) >+ { >+ TQImage img( imgWidth, m_rowsDone-y2, 32 ); >+ memcpy( img.bits(), m_unfadedImage.scanLine( y2 ), imgWidth*(m_rowsDone-y2)*4 ); >+ bitBlt( this, 0, y2, &img ); >+ m_rowsDone = y2; >+ } > } >- } >- >- int start_y1 = y1; >- if( start_y1 < 0 ) { >- start_y1 = 0; >- } >- if( y2 > start_y1 ) { >- TQImage img( imgWidth, y2-start_y1, 32 ); >- memcpy( img.bits(), m_grayImage.scanLine( start_y1 ), ( y2-start_y1 ) * imgWidth * 4 ); >- register uchar * rs = m_unfadedImage.scanLine( start_y1 ); >- register uchar * rd = img.bits(); >- for( int y = start_y1; y < y2; ++y ) >- { >- // linear gradients look bad, so use cos-function >- for( short int x = 0; x < imgWidth; ++x ) >+ >+ int start_y1 = y1; >+ if( start_y1 < 0 ) { >+ start_y1 = 0; >+ } >+ if( y2 > start_y1 ) { >+ TQImage img( imgWidth, y2-start_y1, 32 ); >+ memcpy( img.bits(), m_grayImage.scanLine( start_y1 ), ( y2-start_y1 ) * imgWidth * 4 ); >+ register uchar * rs = m_unfadedImage.scanLine( start_y1 ); >+ register uchar * rd = img.bits(); >+ for( int y = start_y1; y < y2; ++y ) > { >- *reinterpret_cast<TQRgb*>(rd) = tqRgba(0, 0, 0, 107); >- rs += 4; rd += 4; >+ // linear gradients look bad, so use cos-function >+ for( short int x = 0; x < imgWidth; ++x ) >+ { >+ *reinterpret_cast<TQRgb*>(rd) = tqRgba(0, 0, 0, 107); >+ rs += 4; rd += 4; >+ } > } >+ bitBlt( this, 0, start_y1, &img ); > } >- bitBlt( this, 0, start_y1, &img ); >- } >- >- TQTimer::singleShot( 1, this, TQT_SLOT( slotPaintEffect() ) ); >- } >- else { >- if ( m_currentY >= height() ) { >- if ( backgroundMode() == TQWidget::NoBackground ) { >+ >+ TQTimer::singleShot( 1, this, TQT_SLOT( slotPaintEffect() ) ); >+ } >+ else { >+ if ( m_currentY >= height() ) { >+ if ( backgroundMode() == TQWidget::NoBackground ) { >+ setBackgroundMode( TQWidget::NoBackground ); >+ setBackgroundPixmap( m_root ); >+ } >+ return; >+ } >+ >+ if ( m_currentY == 0 ) { > setBackgroundMode( TQWidget::NoBackground ); >- setBackgroundPixmap( m_root ); >+ setGeometry( TQApplication::desktop()->geometry() ); >+ m_root.resize( width(), height() ); // for the default logout >+ >+ KPixmap pixmap; >+ pixmap = TQPixmap(TQPixmap::grabWindow( tqt_xrootwin(), 0, 0, width(), height() )); >+ bitBlt( this, 0, 0, &pixmap ); >+ bitBlt( &m_root, 0, 0, &pixmap ); > } >- return; >- } >- >- if ( m_currentY == 0 ) { >- setBackgroundMode( TQWidget::NoBackground ); >- setGeometry( TQApplication::desktop()->geometry() ); >- m_root.resize( width(), height() ); // for the default logout >- >+ > KPixmap pixmap; >- pixmap = TQPixmap(TQPixmap::grabWindow( tqt_xrootwin(), 0, 0, width(), height() )); >- bitBlt( this, 0, 0, &pixmap ); >- bitBlt( &m_root, 0, 0, &pixmap ); >+ pixmap = TQPixmap(TQPixmap::grabWindow( tqt_xrootwin(), 0, m_currentY, width(), 10 )); >+ TQImage image = pixmap.convertToImage(); >+ KImageEffect::blend( Qt::black, image, 0.4 ); >+ KImageEffect::toGray( image, true ); >+ pixmap.convertFromImage( image ); >+ bitBlt( this, 0, m_currentY, &pixmap ); >+ bitBlt( &m_root, 0, m_currentY, &pixmap ); >+ m_currentY += 10; >+ TQTimer::singleShot( 1, this, TQT_SLOT( slotPaintEffect() ) ); > } >- >- KPixmap pixmap; >- pixmap = TQPixmap(TQPixmap::grabWindow( tqt_xrootwin(), 0, m_currentY, width(), 10 )); >- TQImage image = pixmap.convertToImage(); >- KImageEffect::blend( Qt::black, image, 0.4 ); >- KImageEffect::toGray( image, true ); >- pixmap.convertFromImage( image ); >- bitBlt( this, 0, m_currentY, &pixmap ); >- bitBlt( &m_root, 0, m_currentY, &pixmap ); >- m_currentY += 10; >- TQTimer::singleShot( 1, this, TQT_SLOT( slotPaintEffect() ) ); > } > } > View Attachment As Diff View Attachment As Raw

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    [x]
  • | Forgot Password
    Login: [x]