[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [latte-dock] app: simplify dodge(s) code and comment it
From:       Michail Vourlakos <null () kde ! org>
Date:       2018-08-31 13:50:32
Message-ID: E1fvjom-0004aV-Rh () code ! kde ! org
[Download RAW message or body]

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 wid)
         return;
 
     if (!winfo.isActive()) {
-        if (winfo.isPlasmaDesktop()) {
-            raiseDock(true);
-        }
-
         winfo = 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 wid//the \
window that made the call +    if (wm->isOnCurrentDesktop(winfo.wid()) && \
wm->isOnCurrentActivity(winfo.wid())) {  raiseDock(!intersects(winfo));
     }
 }
@@ -480,9 +477,6 @@ void VisibilityManagerPrivate::dodgeMaximized(WindowId wid)
         return;
 
     if (!winfo.isActive()) {
-        if (winfo.isPlasmaDesktop())
-            raiseDock(true);
-
         winfo = wm->requestInfo(wm->activeWindow());
 
         if (!winfo.isValid()) {
@@ -504,10 +498,12 @@ void VisibilityManagerPrivate::dodgeMaximized(WindowId 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 wid//the \
window that made the call +    if (wm->isOnCurrentDesktop(winfo.wid()) && \
wm->isOnCurrentActivity(winfo.wid())) {  raiseDock(view->formFactor() == \
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::PlasmaWindow *w) \
const  {
+    //! because wayland does not have any way yet to identify the window type
+    //! a trick is to just consider windows as valid when they can be shown 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();
 }
 


[prev in list] [next in list] [prev in thread] [next in thread]