Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 19:02:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge if with switch statement in QX11PaintEngine::updateClipRegion_dev()

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2020-10-12 10:34:24 +03:00
parent b75fe8a5fd
commit 10026b7ba5
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/gui/painting/qpaintengine_x11.cpp
View file

@ -1995,7 +1995,8 @@ void QX11PaintEngine::updateClipRegion_dev(const QRegion &clipRegion, Qt::ClipOp
{ {
Q_D(QX11PaintEngine); Q_D(QX11PaintEngine);
QRegion sysClip = systemClip(); QRegion sysClip = systemClip();
if (op == Qt::NoClip) { switch (op) {
case Qt::NoClip:
d->has_clipping = false; d->has_clipping = false;
d->crgn = sysClip; d->crgn = sysClip;
if (!sysClip.isEmpty()) { if (!sysClip.isEmpty()) {
@ -2004,9 +2005,6 @@ void QX11PaintEngine::updateClipRegion_dev(const QRegion &clipRegion, Qt::ClipOp
x11ClearClipRegion(d->dpy, d->gc, d->gc_brush, d->picture); x11ClearClipRegion(d->dpy, d->gc, d->gc_brush, d->picture);
} }
return; return;
}
switch (op) {
case Qt::IntersectClip: case Qt::IntersectClip:
if (d->has_clipping) { if (d->has_clipping) {
d->crgn &= clipRegion; d->crgn &= clipRegion;
@ -2024,8 +2022,6 @@ void QX11PaintEngine::updateClipRegion_dev(const QRegion &clipRegion, Qt::ClipOp
if (!sysClip.isEmpty()) if (!sysClip.isEmpty())
d->crgn = d->crgn.intersected(sysClip); d->crgn = d->crgn.intersected(sysClip);
break; break;
default:
break;
} }
d->has_clipping = true; d->has_clipping = true;
x11SetClipRegion(d->dpy, d->gc, d->gc_brush, d->picture, d->crgn); x11SetClipRegion(d->dpy, d->gc, d->gc_brush, d->picture, d->crgn);