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

Remove null window checks in restacking requests

Browse source 
Restacking null windows make no sense. If a window can be null, it
should be guarded by the user. However, in practice, it shouldn't
matter.
This commit is contained in:
Vlad Zahorodnii 2023-05-26 17:18:50 +03:00
parent 3ccf560252
commit 8b4afa0ee5
2 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/layers.cpp
View file

@ -273,7 +273,7 @@ Window *Workspace::findDesktop(bool topmost, VirtualDesktop *desktop) const
void Workspace::raiseOrLowerWindow(Window *window) void Workspace::raiseOrLowerWindow(Window *window)
{ {
if (!window || !window->isOnCurrentDesktop()) { if (!window->isOnCurrentDesktop()) {
return; return;
} }
@ -290,9 +290,6 @@ void Workspace::raiseOrLowerWindow(Window *window)
void Workspace::lowerWindow(Window *window, bool nogroup) void Workspace::lowerWindow(Window *window, bool nogroup)
{ {
if (!window) {
return;
}
if (window->isDeleted()) { if (window->isDeleted()) {
qCWarning(KWIN_CORE) << "Workspace::lowerWindow: closed window" << window << "cannot be restacked"; qCWarning(KWIN_CORE) << "Workspace::lowerWindow: closed window" << window << "cannot be restacked";
return; return;
@ -320,9 +317,6 @@ void Workspace::lowerWindow(Window *window, bool nogroup)
void Workspace::lowerWindowWithinApplication(Window *window) void Workspace::lowerWindowWithinApplication(Window *window)
{ {
if (!window) {
return;
}
if (window->isDeleted()) { if (window->isDeleted()) {
qCWarning(KWIN_CORE) << "Workspace::lowerWindowWithinApplication: closed window" << window << "cannot be restacked"; qCWarning(KWIN_CORE) << "Workspace::lowerWindowWithinApplication: closed window" << window << "cannot be restacked";
return; return;
@ -354,9 +348,6 @@ void Workspace::lowerWindowWithinApplication(Window *window)
void Workspace::raiseWindow(Window *window, bool nogroup) void Workspace::raiseWindow(Window *window, bool nogroup)
{ {
if (!window) {
return;
}
if (window->isDeleted()) { if (window->isDeleted()) {
qCWarning(KWIN_CORE) << "Workspace::raiseWindow: closed window" << window << "cannot be restacked"; qCWarning(KWIN_CORE) << "Workspace::raiseWindow: closed window" << window << "cannot be restacked";
return; return;
@ -383,9 +374,6 @@ void Workspace::raiseWindow(Window *window, bool nogroup)
void Workspace::raiseWindowWithinApplication(Window *window) void Workspace::raiseWindowWithinApplication(Window *window)
{ {
if (!window) {
return;
}
if (window->isDeleted()) { if (window->isDeleted()) {
qCWarning(KWIN_CORE) << "Workspace::raiseWindowWithinApplication: closed window" << window << "cannot be restacked"; qCWarning(KWIN_CORE) << "Workspace::raiseWindowWithinApplication: closed window" << window << "cannot be restacked";
return; return;

4
src/scripting/workspace_wrapper.cpp
View file

@ -287,7 +287,9 @@ QList<KWin::Window *> WorkspaceWrapper::stackingOrder() const
void WorkspaceWrapper::raiseWindow(KWin::Window *window) void WorkspaceWrapper::raiseWindow(KWin::Window *window)
{ {
KWin::Workspace::self()->raiseWindow(window); if (window) {
KWin::Workspace::self()->raiseWindow(window);
}
} }
Window *WorkspaceWrapper::getClient(qulonglong windowId) Window *WorkspaceWrapper::getClient(qulonglong windowId)