Skip to content

C
core
Kaydet (Commit) 17da3432 authored tarafından Luboš Luňák's avatar Luboš Luňák
Dosyalara gözat
Seçenekler

pClipRegion_ has been apparently renamed to mpClipRegion

üst da941336
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
vcl/unx/kde4/KDESalGraphics.cxx
Dosyayı görüntüle @ 17da3432
...@@ -626,12 +626,12 @@ sal_Bool KDESalGraphics::drawNativeControl( ControlType type, ControlPart part, ...@@ -626,12 +626,12 @@ sal_Bool KDESalGraphics::drawNativeControl( ControlType type, ControlPart part,
// See XRegionToQRegion() comment for a small catch (although not real hopefully). // See XRegionToQRegion() comment for a small catch (although not real hopefully).
QPixmap destPixmap = QPixmap::fromX11Pixmap( GetDrawable(), QPixmap::ExplicitlyShared ); QPixmap destPixmap = QPixmap::fromX11Pixmap( GetDrawable(), QPixmap::ExplicitlyShared );
QPainter paint( &destPixmap ); QPainter paint( &destPixmap );
if( clipRegion && pClipRegion_ ) if( clipRegion && mpClipRegion )
paint.setClipRegion( clipRegion->intersected( XRegionToQRegion( pClipRegion_ ))); paint.setClipRegion( clipRegion->intersected( XRegionToQRegion( mpClipRegion )));
else if( clipRegion ) else if( clipRegion )
paint.setClipRegion( *clipRegion ); paint.setClipRegion( *clipRegion );
else if( pClipRegion_ ) else if( mpClipRegion )
paint.setClipRegion( XRegionToQRegion( pClipRegion_ )); paint.setClipRegion( XRegionToQRegion( mpClipRegion ));
paint.drawImage( widgetRect.left(), widgetRect.top(), *m_image, paint.drawImage( widgetRect.left(), widgetRect.top(), *m_image,
0, 0, widgetRect.width(), widgetRect.height(), 0, 0, widgetRect.width(), widgetRect.height(),
Qt::ColorOnly | Qt::OrderedDither | Qt::OrderedAlphaDither ); Qt::ColorOnly | Qt::OrderedDither | Qt::OrderedAlphaDither );
...@@ -652,8 +652,8 @@ sal_Bool KDESalGraphics::drawNativeControl( ControlType type, ControlPart part, ...@@ -652,8 +652,8 @@ sal_Bool KDESalGraphics::drawNativeControl( ControlType type, ControlPart part,
xr.height = r.height(); xr.height = r.height();
XUnionRectWithRegion( &xr, pTempClipRegion, pTempClipRegion ); XUnionRectWithRegion( &xr, pTempClipRegion, pTempClipRegion );
} }
if( pClipRegion_ ) if( mpClipRegion )
XIntersectRegion( pTempClipRegion, pClipRegion_, pTempClipRegion ); XIntersectRegion( pTempClipRegion, mpClipRegion, pTempClipRegion );
XSetRegion( GetXDisplay(), gc, pTempClipRegion ); XSetRegion( GetXDisplay(), gc, pTempClipRegion );
} }
QPixmap pixmap = QPixmap::fromImage(*m_image, Qt::ColorOnly | Qt::OrderedDither | Qt::OrderedAlphaDither); QPixmap pixmap = QPixmap::fromImage(*m_image, Qt::ColorOnly | Qt::OrderedDither | Qt::OrderedAlphaDither);
...@@ -664,8 +664,8 @@ sal_Bool KDESalGraphics::drawNativeControl( ControlType type, ControlPart part, ...@@ -664,8 +664,8 @@ sal_Bool KDESalGraphics::drawNativeControl( ControlType type, ControlPart part,
if( pTempClipRegion ) if( pTempClipRegion )
{ {
if( pClipRegion_ ) if( mpClipRegion )
XSetRegion( GetXDisplay(), gc, pClipRegion_ ); XSetRegion( GetXDisplay(), gc, mpClipRegion );
else else
XSetClipMask( GetXDisplay(), gc, None ); XSetClipMask( GetXDisplay(), gc, None );
XDestroyRegion( pTempClipRegion ); XDestroyRegion( pTempClipRegion );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment