re-implemented compositing-off dnd calculation properly.
parent
ba3b445231
commit
aab88cc10d
|
@ -1913,11 +1913,14 @@ namespace Oxygen
|
||||||
tileSet->render( geometry, &painter, TileSet::Ring);
|
tileSet->render( geometry, &painter, TileSet::Ring);
|
||||||
geometry.adjust( shadowSize, shadowSize, -shadowSize, -shadowSize );
|
geometry.adjust( shadowSize, shadowSize, -shadowSize, -shadowSize );
|
||||||
|
|
||||||
|
renderCorners( &painter, geometry, widget()->palette() );
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// render window background
|
// mask
|
||||||
renderCorners( &painter, geometry, widget()->palette() );
|
|
||||||
painter.setClipRegion( helper().roundedMask( geometry ), Qt::IntersectClip );
|
painter.setClipRegion( helper().roundedMask( geometry ), Qt::IntersectClip );
|
||||||
|
|
||||||
|
// render window background
|
||||||
renderWindowBackground( &painter, geometry, widget(), widget()->palette() );
|
renderWindowBackground( &painter, geometry, widget(), widget()->palette() );
|
||||||
|
|
||||||
// darken background if item is inactive
|
// darken background if item is inactive
|
||||||
|
@ -1948,10 +1951,14 @@ namespace Oxygen
|
||||||
titlebarTextColor( widget()->palette(), isActive() && itemActive ),
|
titlebarTextColor( widget()->palette(), isActive() && itemActive ),
|
||||||
titlebarContrastColor( widget()->palette() ) );
|
titlebarContrastColor( widget()->palette() ) );
|
||||||
|
|
||||||
|
// adjust geometry for floatFrame when compositing is on.
|
||||||
|
if( drawShadow )
|
||||||
|
{ geometry.adjusted(-1, -1, 1, 1 ); }
|
||||||
|
|
||||||
// floating frame
|
// floating frame
|
||||||
helper().drawFloatFrame(
|
helper().drawFloatFrame(
|
||||||
&painter, geometry.adjusted(-1, -1, 1, 1 ), widget()->palette().window().color(),
|
&painter, geometry, widget()->palette().window().color(),
|
||||||
false, false,
|
!drawShadow, false,
|
||||||
KDecoration::options()->color(ColorTitleBar)
|
KDecoration::options()->color(ColorTitleBar)
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue