From kde-commits  Fri Aug 31 13:50:32 2018
From: Michail Vourlakos <null () kde ! org>
Date: Fri, 31 Aug 2018 13:50:32 +0000
To: kde-commits
Subject: [latte-dock] app: simplify dodge(s) code and comment it
Message-Id: <E1fvjom-0004aV-Rh () code ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=153572344419684

Git commit cc0e0e7c47e4f5aefe7524e72e94d1e827c9e6ea by Michail Vourlakos.
Committed on 31/08/2018 at 13:49.
Pushed by mvourlakos into branch 'master'.

simplify dodge(s) code and comment it

M  +7    -11   app/dock/visibilitymanager.cpp
M  +5    -0    app/waylandinterface.cpp

https://commits.kde.org/latte-dock/cc0e0e7c47e4f5aefe7524e72e94d1e827c9e6ea

diff --git a/app/dock/visibilitymanager.cpp b/app/dock/visibilitymanager.cpp
index 74396048..a9282ca4 100644
--- a/app/dock/visibilitymanager.cpp
+++ b/app/dock/visibilitymanager.cpp
@@ -444,10 +444,6 @@ void VisibilityManagerPrivate::dodgeActive(WindowId wi=
d)
         return;
 =

     if (!winfo.isActive()) {
-        if (winfo.isPlasmaDesktop()) {
-            raiseDock(true);
-        }
-
         winfo =3D wm->requestInfo(wm->activeWindow());
 =

         if (!winfo.isValid()) {
@@ -457,8 +453,9 @@ void VisibilityManagerPrivate::dodgeActive(WindowId wid)
         }
     }
 =

-    //!don't send false raiseDock signal when containing mouse
-    if (wm->isOnCurrentDesktop(wid) && wm->isOnCurrentActivity(wid)) {
+    //! don't send false raiseDock signal when containing mouse, // Johan =
comment
+    //! I dont know why that wasnt winfo.wid() //active window, but just w=
id//the window that made the call
+    if (wm->isOnCurrentDesktop(winfo.wid()) && wm->isOnCurrentActivity(win=
fo.wid())) {
         raiseDock(!intersects(winfo));
     }
 }
@@ -480,9 +477,6 @@ void VisibilityManagerPrivate::dodgeMaximized(WindowId =
wid)
         return;
 =

     if (!winfo.isActive()) {
-        if (winfo.isPlasmaDesktop())
-            raiseDock(true);
-
         winfo =3D wm->requestInfo(wm->activeWindow());
 =

         if (!winfo.isValid()) {
@@ -504,10 +498,12 @@ void VisibilityManagerPrivate::dodgeMaximized(WindowI=
d wid)
                 && intersects(winfo));
     };
 =

-    //!don't send false raiseDock signal when containing mouse
-    if (wm->isOnCurrentDesktop(wid) && wm->isOnCurrentActivity(wid))
+    //! don't send false raiseDock signal when containing mouse, // Johan =
comment
+    //! I dont know why that wasnt winfo.wid() //active window, but just w=
id//the window that made the call
+    if (wm->isOnCurrentDesktop(winfo.wid()) && wm->isOnCurrentActivity(win=
fo.wid())) {
         raiseDock(view->formFactor() =3D=3D Plasma::Types::Vertical
                   ? !isMaxHoriz() : !isMaxVert());
+    }
 }
 =

 void VisibilityManagerPrivate::dodgeWindows(WindowId wid)
diff --git a/app/waylandinterface.cpp b/app/waylandinterface.cpp
index bcecd1c6..7b233691 100644
--- a/app/waylandinterface.cpp
+++ b/app/waylandinterface.cpp
@@ -349,6 +349,11 @@ WindowInfoWrap WaylandInterface::requestInfo(WindowId =
wid) const
 =

 inline bool WaylandInterface::isValidWindow(const KWayland::Client::Plasma=
Window *w) const
 {
+    //! because wayland does not have any way yet to identify the window t=
ype
+    //! a trick is to just consider windows as valid when they can be show=
n in the
+    //! taskbar. Of course that creates issues with plasma native dialogs
+    //! e.g. widgets explorer, Activities etc. that are not used to hide
+    //! the dodge docks/panels appropriately
     return w->isValid() && !w->skipTaskbar();
 }
=20