SVN_SILENT --warnings
svn path=/trunk/KDE/kdebase/workspace/; revision=1118827
This commit is contained in:
parent
7c42c041c1
commit
70acd11ecb
6 changed files with 12 additions and 9 deletions
4
tile.cpp
4
tile.cpp
|
@ -51,8 +51,8 @@ Tile::Tile( Client *c, const QRect& area)
|
|||
*/
|
||||
Tile::Tile( const Tile& orig )
|
||||
: m_client( orig.client() ),
|
||||
m_floating( orig.floating() ),
|
||||
m_prevGeom( orig.m_prevGeom )
|
||||
m_prevGeom( orig.m_prevGeom ),
|
||||
m_floating( orig.floating() )
|
||||
{
|
||||
setGeometry( orig.geometry() );
|
||||
}
|
||||
|
|
|
@ -270,7 +270,7 @@ void Workspace::notifyWindowActivated( Client *c )
|
|||
|
||||
foreach( Tile *t, tiles )
|
||||
{
|
||||
kDebug(1212) << t->client() << t->floating();
|
||||
kDebug(1212) << static_cast<Toplevel *>(t->client()) << t->floating();
|
||||
if( t->floating() == raise_floating && t != tile_to_raise )
|
||||
raiseClient( t->client() );
|
||||
}
|
||||
|
|
|
@ -38,9 +38,9 @@ TilingLayout::~TilingLayout()
|
|||
{
|
||||
}
|
||||
|
||||
unsigned int TilingLayout::findTilePos( Client *c ) const
|
||||
int TilingLayout::findTilePos( Client *c ) const
|
||||
{
|
||||
unsigned int i = 0;
|
||||
int i = 0;
|
||||
foreach( Tile *t, m_tiles )
|
||||
{
|
||||
if( t->client() == c )
|
||||
|
@ -52,7 +52,7 @@ unsigned int TilingLayout::findTilePos( Client *c ) const
|
|||
|
||||
Tile* TilingLayout::findTile( Client *c ) const
|
||||
{
|
||||
unsigned int i = findTilePos( c );
|
||||
int i = findTilePos( c );
|
||||
if( i != -1 )
|
||||
return m_tiles[ i ];
|
||||
return NULL;
|
||||
|
@ -138,6 +138,7 @@ void TilingLayout::addTile( Tile *t )
|
|||
|
||||
void TilingLayout::addTile( Client *c )
|
||||
{
|
||||
Q_UNUSED( c )
|
||||
}
|
||||
|
||||
void TilingLayout::removeTileNoArrange( Tile * t )
|
||||
|
|
|
@ -68,7 +68,7 @@ class TilingLayout
|
|||
virtual void preRemoveTile( Tile *t );
|
||||
|
||||
private:
|
||||
unsigned int findTilePos( Client *c ) const;
|
||||
int findTilePos( Client *c ) const;
|
||||
virtual void arrange( QRect wgeom ) = 0;
|
||||
|
||||
void addTileNoArrange( Tile *t );
|
||||
|
@ -107,10 +107,12 @@ inline Workspace* TilingLayout::workspace() const
|
|||
|
||||
inline void TilingLayout::postAddTile( Tile *t )
|
||||
{
|
||||
Q_UNUSED( t )
|
||||
}
|
||||
|
||||
inline void TilingLayout::preRemoveTile( Tile *t )
|
||||
{
|
||||
Q_UNUSED( t )
|
||||
}
|
||||
|
||||
} // end namespace
|
||||
|
|
|
@ -70,7 +70,7 @@ void Spiral::arrange( QRect wgeom )
|
|||
|
||||
if( i % 4 == 1 && i != 1 )
|
||||
wgeom.moveTop( wgeom.y() - wgeom.height() );
|
||||
else if( i % 2 == 1 && i != 1
|
||||
else if( ( i % 2 == 1 && i != 1 )
|
||||
|| ( i % 4 == 0 && i < n ) )
|
||||
wgeom.moveTop( wgeom.y() + wgeom.height() );
|
||||
|
||||
|
|
|
@ -96,6 +96,7 @@ Workspace::Workspace( bool restore )
|
|||
, desktopGrid_( new int[2] )
|
||||
, currentDesktop_( 0 )
|
||||
, desktopLayoutDynamicity_( false )
|
||||
, tilingMode_( false )
|
||||
// Unsorted
|
||||
, active_popup( NULL )
|
||||
, active_popup_client( NULL )
|
||||
|
@ -153,7 +154,6 @@ Workspace::Workspace( bool restore )
|
|||
, transSlider( NULL )
|
||||
, transButton( NULL )
|
||||
, forceUnredirectCheck( true )
|
||||
, tilingMode_( false )
|
||||
{
|
||||
(void) new KWinAdaptor( this );
|
||||
|
||||
|
|
Loading…
Reference in a new issue