yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Prevent present windows from storing data for a NULL window.

Browse source 
CCBUG: 171593

svn path=/trunk/KDE/kdebase/workspace/; revision=864365
This commit is contained in:
Lucas Murray 2008-09-24 15:53:08 +00:00
parent 388b8a9f9b
commit db8e8365da
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
effects/presentwindows.cpp
View file

@ -255,13 +255,13 @@ void PresentWindowsEffect::windowClosed( EffectWindow *w )
if( m_highlightedWindow == w ) if( m_highlightedWindow == w )
setHighlightedWindow( findFirstWindow() ); setHighlightedWindow( findFirstWindow() );
m_windowData[w].visible = false; // TODO: Fix this so they do actually fade out m_windowData[w].visible = false; // TODO: Fix this so they do actually fade out
m_motionManager.unmanage( w );
rearrangeWindows(); rearrangeWindows();
} }
void PresentWindowsEffect::windowDeleted( EffectWindow *w ) void PresentWindowsEffect::windowDeleted( EffectWindow *w )
{ {
m_windowData.remove( w ); m_windowData.remove( w );
m_motionManager.unmanage( w );
} }
bool PresentWindowsEffect::borderActivated( ElectricBorder border ) bool PresentWindowsEffect::borderActivated( ElectricBorder border )
@ -456,12 +456,17 @@ void PresentWindowsEffect::rearrangeWindows()
} }
if( windowlist.isEmpty() ) if( windowlist.isEmpty() )
{ {
setHighlightedWindow( NULL ); setHighlightedWindow( NULL ); // TODO: Having a NULL highlighted window isn't really safe
return; return;
} }
// We filtered out the highlighted window // We filtered out the highlighted window
if( m_windowData[m_highlightedWindow].visible == false ) if( m_highlightedWindow )
{
if( m_windowData[m_highlightedWindow].visible == false )
setHighlightedWindow( findFirstWindow() );
}
else
setHighlightedWindow( findFirstWindow() ); setHighlightedWindow( findFirstWindow() );
int screens = m_tabBoxEnabled ? 1 : effects->numScreens(); int screens = m_tabBoxEnabled ? 1 : effects->numScreens();
@ -949,10 +954,8 @@ void PresentWindowsEffect::assignSlots( EffectWindowList windowlist, const QRect
QVector< bool > taken; QVector< bool > taken;
taken.fill( false, columns * rows ); taken.fill( false, columns * rows );
foreach( EffectWindow* w, windowlist ) foreach( EffectWindow* w, windowlist )
{
if( m_windowData[w].slot != -1 ) if( m_windowData[w].slot != -1 )
taken[ m_windowData[w].slot ] = true; taken[ m_windowData[w].slot ] = true;
}
int slotWidth = area.width() / columns; int slotWidth = area.width() / columns;
int slotHeight = area.height() / rows; int slotHeight = area.height() / rows;
if( m_tabBoxEnabled ) if( m_tabBoxEnabled )