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

List:       kde-commits
Subject:    branches/work/kwin_scripting (merge)
From:       Rohan Ramdas Prabhu <rohan () rohanprabhu ! com>
Date:       2010-08-08 10:18:13
Message-ID: 20100808101813.F15A8AC73B () svn ! kde ! org
[Download RAW message or body]

SVN commit 1160559 by rohanp:

Merged revisions 1160514,1160534,1160557 via svnmerge from 
svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdebase/workspace/kwin
SVN_MERGE
........
  r1160514 | scripty | 2010-08-08 12:33:06 +0530 (Sun, 08 Aug 2010) | 1 line
  
  SVN_SILENT made messages (.desktop file)
........
  r1160534 | graesslin | 2010-08-08 14:02:09 +0530 (Sun, 08 Aug 2010) | 1 line
  
  Enable new EffectFrame cross fading in FlipSwitch
........
  r1160557 | graesslin | 2010-08-08 15:29:03 +0530 (Sun, 08 Aug 2010) | 1 line
  
  Don't crop away the decoration shadows in the lanczos filter.
........


 _M            . (directory)  
 M  +5 -0      effects/flipswitch/flipswitch.cpp  
 M  +2 -0      effects/screenshot/screenshot.desktop  
 M  +1 -0      kcmkwin/kwindesktop/desktop.desktop  
 M  +22 -8     lanczosfilter.cpp  


--- branches/work/kwin_scripting/effects/flipswitch/flipswitch.cpp #1160558:1160559
@@ -52,6 +52,7 @@
     m_captionFont.setBold( true );
     m_captionFont.setPointSize( m_captionFont.pointSize() * 2 );
     m_captionFrame->setFont( m_captionFont );
+    m_captionFrame->enableCrossFade( true );
 
     KActionCollection* actionCollection = new KActionCollection( this );
     KAction* a = ( KAction* )actionCollection->addAction( "FlipSwitchCurrent" );
@@ -408,6 +409,10 @@
         if( m_windowTitle )
             {
             // Render the caption frame
+            if( m_animation )
+                {
+                m_captionFrame->setCrossFadeProgress( m_timeLine.value() );
+                }
             m_captionFrame->render( region, m_startStopTimeLine.value() );
             }
         }
--- branches/work/kwin_scripting/effects/screenshot/screenshot.desktop #1160558:1160559
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=Screenshot
 Name[en_GB]=Screenshot
+Name[eu]=Pantaila-argazkia
 Name[ia]=Instantanee de schermo
 Name[lt]=Nuotrauka
 Name[nds]=Schirmfoto
@@ -12,6 +13,7 @@
 Icon=preferences-system-windows-effect-screenshot
 Comment=Saves screenshot of active window into the home directory
 Comment[en_GB]=Saves screenshot of active window into the home directory
+Comment[eu]=Leiho aktiboaren pantaila argazkia etxeko karpetan gordetzen du
 Comment[ia]=Il salva instantanee de schermo del fenestra active in le directorio domo
 Comment[lt]=Įrašo aktyvaus lango nuotrauką namų kataloge
 Comment[pt]=Captura uma imagem da janela activa para a pasta pessoal
--- branches/work/kwin_scripting/kcmkwin/kwindesktop/desktop.desktop #1160558:1160559
@@ -21,6 +21,7 @@
 Name[en_GB]=Virtual Desktops
 Name[es]=Escritorios virtuales
 Name[et]=Virtuaalsed töölauad
+Name[eu]=Alegiazko mahaigaina
 Name[fi]=Virtuaalityöpöydät
 Name[fr]=Bureaux virtuels
 Name[ga]=Deasca Fíorúla
--- branches/work/kwin_scripting/lanczosfilter.cpp #1160558:1160559
@@ -184,19 +184,33 @@
             init();
         if ( m_shader )
             {
-            int tx = data.xTranslate + w->x();
-            int ty = data.yTranslate + w->y();
-            int tw = w->width()*data.xScale;
-            int th = w->height()*data.yScale;
+            double left = 0;
+            double top = 0;
+            double right = w->width();
+            double bottom = w->height();
+            foreach( const WindowQuad& quad, data.quads )
+                {
+                // we need this loop to include the decoration padding
+                left   = qMin(left, quad.left());
+                top    = qMin(top, quad.top());
+                right  = qMax(right, quad.right());
+                bottom = qMax(bottom, quad.bottom());
+                }
+            double width = right - left;
+            double height = bottom - top;
+            int tx = data.xTranslate + w->x() + left*data.xScale;
+            int ty = data.yTranslate + w->y() + top*data.yScale;
+            int tw = width*data.xScale;
+            int th = height*data.yScale;
 
-            int sw = w->width();
-            int sh = w->height();
+            int sw = width;
+            int sh = height;
 
             WindowPaintData thumbData = data;
             thumbData.xScale = 1.0;
             thumbData.yScale = 1.0;
-            thumbData.xTranslate = -w->x();
-            thumbData.yTranslate = -w->y();
+            thumbData.xTranslate = -w->x() - left;
+            thumbData.yTranslate = -w->y() - top;
 
             // Bind the offscreen FBO and draw the window on it unscaled
             updateOffscreenSurfaces();
[prev in list] [next in list] [prev in thread] [next in thread]