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

fix xrender scale+shadowed toplevel geometry

Browse source 
(cherry picked from commit 01ea7ad7f2a97924f4b6ee41adde01eef27b6e8b)

REVIEW: 102703
FIXED-IN: 4.7.3
This commit is contained in:
Thomas Lübking 2011-09-26 15:01:05 +02:00
parent 770df8c66b
commit 8f81339bca
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
scene_xrender.cpp
View file

@ -535,10 +535,11 @@ void SceneXrender::Window::performPaint(int mask, QRegion region, WindowPaintDat
Client *client = dynamic_cast<Client*>(toplevel); Client *client = dynamic_cast<Client*>(toplevel);
Deleted *deleted = dynamic_cast<Deleted*>(toplevel); Deleted *deleted = dynamic_cast<Deleted*>(toplevel);
const QRect decorationRect = toplevel->decorationRect();
if (client && Workspace::self()->decorationHasAlpha()) if (client && Workspace::self()->decorationHasAlpha())
transformed_shape = QRegion(client->decorationRect()); transformed_shape = decorationRect;
else if (deleted && Workspace::self()->decorationHasAlpha()) else if (deleted && Workspace::self()->decorationHasAlpha())
transformed_shape = QRegion(deleted->decorationRect()); transformed_shape = decorationRect;
else else
transformed_shape = shape(); transformed_shape = shape();
@ -552,7 +553,7 @@ void SceneXrender::Window::performPaint(int mask, QRegion region, WindowPaintDat
} }
}; };
XTransform identity = {{ static XTransform identity = {{
{ XDoubleToFixed(1), XDoubleToFixed(0), XDoubleToFixed(0) }, { XDoubleToFixed(1), XDoubleToFixed(0), XDoubleToFixed(0) },
{ XDoubleToFixed(0), XDoubleToFixed(1), XDoubleToFixed(0) }, { XDoubleToFixed(0), XDoubleToFixed(1), XDoubleToFixed(0) },
{ XDoubleToFixed(0), XDoubleToFixed(0), XDoubleToFixed(1) } { XDoubleToFixed(0), XDoubleToFixed(0), XDoubleToFixed(1) }
@ -627,12 +628,10 @@ void SceneXrender::Window::performPaint(int mask, QRegion region, WindowPaintDat
} }
//END OF STUPID RADEON HACK //END OF STUPID RADEON HACK
} }
#define MAP_RECT_TO_TARGET(_RECT_) \ #define MAP_RECT_TO_TARGET(_RECT_) \
if (blitInTempPixmap) _RECT_.translate(-decorationRect.topLeft()); else _RECT_ = mapToScreen(mask, data, _RECT_) if (blitInTempPixmap) _RECT_.translate(-decorationRect.topLeft()); else _RECT_ = mapToScreen(mask, data, _RECT_)
//BEGIN deco preparations //BEGIN deco preparations
QRect decorationRect;
bool noBorder = true; bool noBorder = true;
const QPixmap *left = NULL; const QPixmap *left = NULL;
const QPixmap *top = NULL; const QPixmap *top = NULL;
@ -648,7 +647,6 @@ void SceneXrender::Window::performPaint(int mask, QRegion region, WindowPaintDat
right = client->rightDecoPixmap(); right = client->rightDecoPixmap();
bottom = client->bottomDecoPixmap(); bottom = client->bottomDecoPixmap();
client->layoutDecorationRects(dlr, dtr, drr, dbr, Client::WindowRelative); client->layoutDecorationRects(dlr, dtr, drr, dbr, Client::WindowRelative);
decorationRect = client->decorationRect();
} }
if (deleted && !deleted->noBorder()) { if (deleted && !deleted->noBorder()) {
noBorder = deleted->noBorder(); noBorder = deleted->noBorder();
@ -657,7 +655,6 @@ void SceneXrender::Window::performPaint(int mask, QRegion region, WindowPaintDat
right = deleted->rightDecoPixmap(); right = deleted->rightDecoPixmap();
bottom = deleted->bottomDecoPixmap(); bottom = deleted->bottomDecoPixmap();
deleted->layoutDecorationRects(dlr, dtr, drr, dbr); deleted->layoutDecorationRects(dlr, dtr, drr, dbr);
decorationRect = deleted->decorationRect();
} }
if (!noBorder) { if (!noBorder) {
MAP_RECT_TO_TARGET(dtr); MAP_RECT_TO_TARGET(dtr);