vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ensure disjunct screenedges on overlapping screens 

If two or more screens overlap (partially or fully)
we must not create double edges since kwin would
trigger both - since they've the same actions bound
(for sure) the action will called twice (so either
eg. toggle or skip one VD etc.)

BUG: 338381
REVIEW: 120060
icc-effect-5.14.5
Thomas Lübking 2014-09-04 21:13:55 +02:00
parent 66df3eefdf
commit ec8f7e1fac
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
screenedge.cpp
View File

@ -872,23 +872,27 @@ void ScreenEdges::recreateEdges()
QList<Edge*> oldEdges(m_edges);
m_edges.clear();
const QRect fullArea(0, 0, displayWidth(), displayHeight());
QRegion processedRegion;
for (int i=0; i<screens()->count(); ++i) {
const QRect screen = screens()->geometry(i);
if (isLeftScreen(screen, fullArea)) {
// left most screen
createVerticalEdge(ElectricLeft, screen, fullArea);
}
if (isRightScreen(screen, fullArea)) {
// right most screen
createVerticalEdge(ElectricRight, screen, fullArea);
}
if (isTopScreen(screen, fullArea)) {
// top most screen
createHorizontalEdge(ElectricTop, screen, fullArea);
}
if (isBottomScreen(screen, fullArea)) {
// bottom most screen
createHorizontalEdge(ElectricBottom, screen, fullArea);
const QRegion screen = QRegion(screens()->geometry(i)).subtracted(processedRegion);
processedRegion += screen;
Q_FOREACH (const QRect &screenPart, screen.rects()) {
if (isLeftScreen(screenPart, fullArea)) {
// left most screen
createVerticalEdge(ElectricLeft, screenPart, fullArea);
}
if (isRightScreen(screenPart, fullArea)) {
// right most screen
createVerticalEdge(ElectricRight, screenPart, fullArea);
}
if (isTopScreen(screenPart, fullArea)) {
// top most screen
createHorizontalEdge(ElectricTop, screenPart, fullArea);
}
if (isBottomScreen(screenPart, fullArea)) {
// bottom most screen
createHorizontalEdge(ElectricBottom, screenPart, fullArea);
}
}
}
// copy over the effect/script reservations from the old edges