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

Simplify Workspace::clientArea()

Browse source 
We don't need to look up unrelated areas, for example looking up the
screen area when we are after the work area.
This commit is contained in:
Vlad Zahorodnii 2022-07-20 11:28:56 +03:00
parent 4220e7ac25
commit 1c25c7101d
1 changed files with 7 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/workspace.cpp
View file

@ -2197,35 +2197,22 @@ void Workspace::updateClientArea()
*/ */
QRectF Workspace::clientArea(clientAreaOption opt, const Output *output, const VirtualDesktop *desktop) const QRectF Workspace::clientArea(clientAreaOption opt, const Output *output, const VirtualDesktop *desktop) const
{ {
QRectF workArea;
QRectF screenArea;
if (auto desktopIt = m_screenAreas.constFind(desktop); desktopIt != m_screenAreas.constEnd()) {
if (auto outputIt = desktopIt->constFind(output); outputIt != desktopIt->constEnd()) {
screenArea = *outputIt;
}
}
if (screenArea.isNull()) { // screens may be missing during KWin initialization or screen config changes
screenArea = output->geometry();
}
workArea = m_workAreas.value(desktop);
if (workArea.isNull()) {
workArea = m_geometry;
}
switch (opt) { switch (opt) {
case MaximizeArea: case MaximizeArea:
case PlacementArea: case PlacementArea:
return screenArea; if (auto desktopIt = m_screenAreas.constFind(desktop); desktopIt != m_screenAreas.constEnd()) {
if (auto outputIt = desktopIt->constFind(output); outputIt != desktopIt->constEnd()) {
return *outputIt;
}
}
return output->geometry();
case MaximizeFullArea: case MaximizeFullArea:
case FullScreenArea: case FullScreenArea:
case MovementArea: case MovementArea:
case ScreenArea: case ScreenArea:
return output->geometry(); return output->geometry();
case WorkArea: case WorkArea:
return workArea; return m_workAreas.value(desktop, m_geometry);
case FullArea: case FullArea:
return m_geometry; return m_geometry;
default: default: