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

SVN_SILENT More whitespace fixes.

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=864246
This commit is contained in:
Lucas Murray 2008-09-24 10:28:49 +00:00
parent 14b2e97700
commit c98a9372fc
3 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
bridge.cpp
View file

@ -176,18 +176,18 @@ QRegion Bridge::unobscuredRegion( const QRegion& r ) const
continue; continue;
} }
/* the clients all have their mask-regions in local coords /* the clients all have their mask-regions in local coords
so we have to translate them to a shared coord system so we have to translate them to a shared coord system
we choose ours */ we choose ours */
int dx = stacking_order[ pos ]->x() - c->x(); int dx = stacking_order[ pos ]->x() - c->x();
int dy = stacking_order[ pos ]->y() - c->y(); int dy = stacking_order[ pos ]->y() - c->y();
QRegion creg = stacking_order[ pos ]->mask(); QRegion creg = stacking_order[ pos ]->mask();
creg.translate(dx, dy); creg.translate(dx, dy);
reg -= creg; reg -= creg;
if (reg.isEmpty()) if (reg.isEmpty())
{ {
// early out, we are completely obscured // early out, we are completely obscured
break; break;
} }
} }
return reg; return reg;
} }

6
kcmkwin/kwindecoration/preview.cpp
View file

@ -66,7 +66,7 @@ KDecorationPreview::~KDecorationPreview()
{ {
delete deco[i]; delete deco[i];
delete bridge[i]; delete bridge[i];
} }
delete options; delete options;
} }
@ -128,7 +128,7 @@ void KDecorationPreview::positionPreviews()
titleBarHeight = qMin( int( titleBarHeight * .9 ), 30 ); titleBarHeight = qMin( int( titleBarHeight * .9 ), 30 );
xoffset = qMin( qMax( 10, QApplication::isRightToLeft() xoffset = qMin( qMax( 10, QApplication::isRightToLeft()
? leftBorder : rightBorder ), 30 ); ? leftBorder : rightBorder ), 30 );
// Resize the active window // Resize the active window
size = QSize( width() - xoffset, height() - titleBarHeight ) size = QSize( width() - xoffset, height() - titleBarHeight )
@ -167,7 +167,7 @@ void KDecorationPreview::setPreviewMask( const QRegion& reg, int mode, bool acti
xrects[ i ].height = rects[ i ].height(); xrects[ i ].height = rects[ i ].height();
} }
XShapeCombineRectangles( QX11Info::display(), widget->winId(), ShapeBounding, 0, 0, XShapeCombineRectangles( QX11Info::display(), widget->winId(), ShapeBounding, 0, 0,
xrects, rects.count(), ShapeSet, mode ); xrects, rects.count(), ShapeSet, mode );
delete[] xrects; delete[] xrects;
} }
if( active ) if( active )

28
kcmkwin/kwindecoration/preview.h
View file

@ -70,11 +70,11 @@ class KDecorationPreviewBridge
{ {
public: public:
KDecorationPreviewBridge( KDecorationPreview* preview, bool active ); KDecorationPreviewBridge( KDecorationPreview* preview, bool active );
virtual bool isActive() const; virtual bool isActive() const;
virtual bool isCloseable() const; virtual bool isCloseable() const;
virtual bool isMaximizable() const; virtual bool isMaximizable() const;
virtual MaximizeMode maximizeMode() const; virtual MaximizeMode maximizeMode() const;
virtual bool isMinimizable() const; virtual bool isMinimizable() const;
virtual bool providesContextHelp() const; virtual bool providesContextHelp() const;
virtual int desktop() const; virtual int desktop() const;
virtual bool isModal() const; virtual bool isModal() const;
@ -86,21 +86,21 @@ class KDecorationPreviewBridge
virtual bool isMovable() const; virtual bool isMovable() const;
virtual bool isResizable() const; virtual bool isResizable() const;
virtual NET::WindowType windowType( unsigned long supported_types ) const; virtual NET::WindowType windowType( unsigned long supported_types ) const;
virtual QIcon icon() const; virtual QIcon icon() const;
virtual QString caption() const; virtual QString caption() const;
virtual void processMousePressEvent( QMouseEvent* ); virtual void processMousePressEvent( QMouseEvent* );
virtual void showWindowMenu( const QRect &); virtual void showWindowMenu( const QRect &);
virtual void showWindowMenu( const QPoint & ); virtual void showWindowMenu( const QPoint & );
virtual void performWindowOperation( WindowOperation ); virtual void performWindowOperation( WindowOperation );
virtual void setMask( const QRegion&, int ); virtual void setMask( const QRegion&, int );
virtual bool isPreview() const; virtual bool isPreview() const;
virtual QRect geometry() const; virtual QRect geometry() const;
virtual QRect iconGeometry() const; virtual QRect iconGeometry() const;
virtual QRegion unobscuredRegion( const QRegion& r ) const; virtual QRegion unobscuredRegion( const QRegion& r ) const;
virtual WId windowId() const; virtual WId windowId() const;
virtual void closeWindow(); virtual void closeWindow();
virtual void maximize( MaximizeMode mode ); virtual void maximize( MaximizeMode mode );
virtual void minimize(); virtual void minimize();
virtual void showContextHelp(); virtual void showContextHelp();
virtual void setDesktop( int desktop ); virtual void setDesktop( int desktop );
virtual void titlebarDblClickOperation(); virtual void titlebarDblClickOperation();