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

Make desktop grid follow present window layout settings.

Browse source 
BUG: 214722

svn path=/trunk/KDE/kdebase/workspace/; revision=1063405
This commit is contained in:
Lucas Murray 2009-12-18 03:34:28 +00:00
parent 43f261b6ed
commit 223f1f2f0b
3 changed files with 49 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
effects/presentwindows/presentwindows.cpp
View file

@ -896,12 +896,7 @@ void PresentWindowsEffect::rearrangeWindows()
if( !windows.count() )
continue;
if( m_layoutMode == LayoutRegularGrid || m_tabBoxEnabled ) // Force the grid for window switching
calculateWindowTransformationsClosest( windows, screen );
else if( m_layoutMode == LayoutFlexibleGrid )
calculateWindowTransformationsKompose( windows, screen );
else
calculateWindowTransformationsNatural( windows, screen, m_motionManager );
calculateWindowTransformations( windows, screen, m_motionManager );
}
// Resize text frames if required
@ -918,8 +913,28 @@ void PresentWindowsEffect::rearrangeWindows()
delete metrics;
}
void PresentWindowsEffect::calculateWindowTransformationsClosest( EffectWindowList windowlist, int screen )
void PresentWindowsEffect::calculateWindowTransformations( EffectWindowList windowlist, int screen,
WindowMotionManager& motionManager, bool external )
{
if( m_layoutMode == LayoutRegularGrid || m_tabBoxEnabled ) // Force the grid for window switching
calculateWindowTransformationsClosest( windowlist, screen, motionManager );
else if( m_layoutMode == LayoutFlexibleGrid )
calculateWindowTransformationsKompose( windowlist, screen, motionManager );
else
calculateWindowTransformationsNatural( windowlist, screen, motionManager );
// If called externally we don't need to remember this data
if( external )
m_windowData.clear();
}
void PresentWindowsEffect::calculateWindowTransformationsClosest( EffectWindowList windowlist, int screen,
WindowMotionManager& motionManager )
{
// This layout mode requires at least one window visible
if( windowlist.count() == 0 )
return;
QRect area = effects->clientArea( ScreenArea, screen, effects->currentDesktop() );
if( m_showPanel ) // reserve space for the panel
area = effects->clientArea( MaximizeArea, screen, effects->currentDesktop() );
@ -927,8 +942,12 @@ void PresentWindowsEffect::calculateWindowTransformationsClosest( EffectWindowLi
int rows = int( ceil( windowlist.count() / double( columns )));
// Remember the size for later
m_gridSizes[screen].columns = columns;
m_gridSizes[screen].rows = rows;
// If we are using this layout externally we don't need to remember m_gridSizes.
if( m_gridSizes.size() != 0 )
{
m_gridSizes[screen].columns = columns;
m_gridSizes[screen].rows = rows;
}
// Assign slots
foreach( EffectWindow *w, windowlist )
@ -997,12 +1016,17 @@ void PresentWindowsEffect::calculateWindowTransformationsClosest( EffectWindowLi
target.center().y() - int( w->height() * scale ) / 2,
scale * w->width(), scale * w->height() );
}
m_motionManager.moveWindow( w, target );
motionManager.moveWindow( w, target );
}
}
void PresentWindowsEffect::calculateWindowTransformationsKompose( EffectWindowList windowlist, int screen )
void PresentWindowsEffect::calculateWindowTransformationsKompose( EffectWindowList windowlist, int screen,
WindowMotionManager& motionManager )
{
// This layout mode requires at least one window visible
if( windowlist.count() == 0 )
return;
QRect availRect = effects->clientArea( ScreenArea, screen, effects->currentDesktop() );
if( m_showPanel ) // reserve space for the panel
availRect = effects->clientArea( MaximizeArea, screen, effects->currentDesktop() );
@ -1136,7 +1160,7 @@ void PresentWindowsEffect::calculateWindowTransformationsKompose( EffectWindowLi
QRect target = geometryRects[pos];
target.setY( target.y() + topOffset );
m_windowData[window].slot = pos;
m_motionManager.moveWindow( window, target );
motionManager.moveWindow( window, target );
//kDebug(1212) << "Window '" << window->caption() << "' gets moved to (" <<
// mWindowData[window].area.left() << "; " << mWindowData[window].area.right() <<
@ -1147,7 +1171,8 @@ void PresentWindowsEffect::calculateWindowTransformationsKompose( EffectWindowLi
}
}
void PresentWindowsEffect::calculateWindowTransformationsNatural( EffectWindowList windowlist, int screen, WindowMotionManager& motionManager )
void PresentWindowsEffect::calculateWindowTransformationsNatural( EffectWindowList windowlist, int screen,
WindowMotionManager& motionManager )
{
// If windows do not overlap they scale into nothingness, fix by resetting. To reproduce
// just have a single window on a Xinerama screen or have two windows that do not touch.

11
effects/presentwindows/presentwindows.h
View file

@ -134,9 +134,14 @@ class PresentWindowsEffect
protected:
// Window rearranging
void rearrangeWindows();
void calculateWindowTransformationsClosest( EffectWindowList windowlist, int screen );
void calculateWindowTransformationsKompose( EffectWindowList windowlist, int screen );
void calculateWindowTransformationsNatural( EffectWindowList windowlist, int screen, WindowMotionManager& motionManager );
void calculateWindowTransformations( EffectWindowList windowlist, int screen,
WindowMotionManager& motionManager, bool external = false );
void calculateWindowTransformationsClosest( EffectWindowList windowlist, int screen,
WindowMotionManager& motionManager );
void calculateWindowTransformationsKompose( EffectWindowList windowlist, int screen,
WindowMotionManager& motionManager );
void calculateWindowTransformationsNatural( EffectWindowList windowlist, int screen,
WindowMotionManager& motionManager );
// Helper functions for window rearranging
inline double aspectRatio( EffectWindow *w )

5
effects/presentwindows/presentwindows_proxy.cpp
View file

@ -33,9 +33,10 @@ PresentWindowsEffectProxy::~PresentWindowsEffectProxy()
{
}
void PresentWindowsEffectProxy::calculateWindowTransformations(EffectWindowList windows, int screen, WindowMotionManager& manager)
void PresentWindowsEffectProxy::calculateWindowTransformations(EffectWindowList windows, int screen,
WindowMotionManager& manager)
{
return m_effect->calculateWindowTransformationsNatural( windows, screen, manager );
return m_effect->calculateWindowTransformations( windows, screen, manager, true );
}
} // namespace