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

Extract duplicate line in present in both if branches

Browse source 
Use more concise code to assign workArea
This commit is contained in:
Guenther Grau 2022-06-28 18:48:03 +02:00
parent 85e0d5ea55
commit 5998326374
1 changed files with 4 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/workspace.cpp
View file

@ -2260,16 +2260,9 @@ QRect Workspace::clientArea(clientAreaOption opt, const Output *output, const Vi
screenArea = effectiveOutput->geometry();
}
if (is_multihead) {
workArea = m_workAreas.value(desktop);
if (workArea.isNull()) {
workArea = effectiveOutput->geometry();
}
} else {
workArea = m_workAreas.value(desktop);
if (workArea.isNull()) {
workArea = QRect(QPoint(0, 0), m_geometry.size());
}
workArea = m_workAreas.value(desktop);
if (workArea.isNull()) {
workArea = is_multihead ? effectiveOutput->geometry() : QRect(QPoint(0, 0), m_geometry.size());
}
switch (opt) {
@ -2282,11 +2275,7 @@ QRect Workspace::clientArea(clientAreaOption opt, const Output *output, const Vi
case ScreenArea:
return effectiveOutput->geometry();
case WorkArea:
if (is_multihead) {
return screenArea;
} else {
return workArea;
}
return is_multihead ? screenArea : workArea;
case FullArea:
return QRect(QPoint(0, 0), m_geometry.size());