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

desktop grid: allow desktop to cross screens

Browse source 
While the main plasma desktop containment does one
desktop per screen, that does not necessarily hold
for other containments, let alone other desktop shells
This commit is contained in:
Thomas Lübking 2015-09-14 20:33:20 +02:00
parent c2acb5ad63
commit 3b71411112
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
effects/desktopgrid/desktopgrid.cpp
View file

@ -296,9 +296,6 @@ void DesktopGridEffect::paintWindow(EffectWindow* w, int mask, QRegion region, W
data.multiplyBrightness(1.0 - (0.3 * (1.0 - hoverTimeline[paintingDesktop - 1]->currentValue()))); data.multiplyBrightness(1.0 - (0.3 * (1.0 - hoverTimeline[paintingDesktop - 1]->currentValue())));
for (int screen = 0; screen < effects->numScreens(); screen++) { for (int screen = 0; screen < effects->numScreens(); screen++) {
// Assume desktop windows can never be on two screens at once (Plasma makes one window per screen)
if (w->isDesktop())
screen = w->screen();
QRect screenGeom = effects->clientArea(ScreenArea, screen, 0); QRect screenGeom = effects->clientArea(ScreenArea, screen, 0);
QRectF transformedGeo = w->geometry(); QRectF transformedGeo = w->geometry();
@ -316,6 +313,8 @@ void DesktopGridEffect::paintWindow(EffectWindow* w, int mask, QRegion region, W
mask |= PAINT_WINDOW_LANCZOS; mask |= PAINT_WINDOW_LANCZOS;
} else if (w->screen() != screen) } else if (w->screen() != screen)
quadsAdded = true; // we don't want parts of overlapping windows on the other screen quadsAdded = true; // we don't want parts of overlapping windows on the other screen
if (w->isDesktop())
quadsAdded = false;
} }
if (zoom) { if (zoom) {
transformedGeo.translate(-0.025f*transformedGeo.width(), transformedGeo.translate(-0.025f*transformedGeo.width(),
@ -371,9 +370,6 @@ void DesktopGridEffect::paintWindow(EffectWindow* w, int mask, QRegion region, W
} }
effects->paintWindow(w, mask, effects->clientArea(ScreenArea, screen, 0), d); effects->paintWindow(w, mask, effects->clientArea(ScreenArea, screen, 0), d);
} }
// Assume desktop windows can never be on two screens at once (Plasma makes one window per screen)
if (w->isDesktop())
break;
} }
} else } else
effects->paintWindow(w, mask, region, data); effects->paintWindow(w, mask, region, data);