From 6813dd62a0b73e956f9caff09f376f93e4690551 Mon Sep 17 00:00:00 2001
From: Charles Gagnon <charlesg99@outlook.com>
Date: Sun, 24 Apr 2022 09:48:57 -0400
Subject: [PATCH] Adjust Desktop Icons NG

---
 panel.js        | 2 +-
 panelManager.js | 5 ++---
 utils.js        | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/panel.js b/panel.js
index b75c7ac..4e55b66 100644
--- a/panel.js
+++ b/panel.js
@@ -1234,7 +1234,7 @@ var Panel = GObject.registerClass({
         let time = Me.settings.get_int('show-showdesktop-time') * .001;
 
         workspace.list_windows().forEach(w => {
-            if (!w.minimized) {
+            if (!w.minimized && !w.skip_taskbar) {
                 let tweenOpts = {
                     opacity: hide ? 0 : 255,
                     time: time,
diff --git a/panelManager.js b/panelManager.js
index 5ea951a..4db92f7 100755
--- a/panelManager.js
+++ b/panelManager.js
@@ -65,9 +65,6 @@ var PanelManager = class {
     }
 
     enable(reset) {
-        if (!reset)
-            this._desktopIconsUsableArea = new DesktopIconsIntegration.DesktopIconsUsableAreaClass();
-
         let dtpPrimaryIndex = Me.settings.get_int('primary-monitor');
 
         this.dtpPrimaryMonitor = Main.layoutManager.monitors[dtpPrimaryIndex] || Main.layoutManager.primaryMonitor;
@@ -120,6 +117,8 @@ var PanelManager = class {
         
         if (reset) return;
 
+        this._desktopIconsUsableArea = new DesktopIconsIntegration.DesktopIconsUsableAreaClass();
+
         this._oldUpdatePanelBarrier = Main.layoutManager._updatePanelBarrier;
         Main.layoutManager._updatePanelBarrier = (panel) => {
             let panelUpdates = panel ? [panel] : this.allPanels;
diff --git a/utils.js b/utils.js
index 26258b3..d6dec3b 100644
--- a/utils.js
+++ b/utils.js
@@ -394,17 +394,17 @@ var animateWindowOpacity = function(window, tweenOpts) {
     //when the animation is complete
     let visible = tweenOpts.opacity > 0;
     let windowActor = window;
+    let initialOpacity = window.opacity;
 
     window = windowActor.get_first_child() || windowActor;
 
     if (!windowActor.visible && visible) {
         window.opacity = 0;
         windowActor.visible = visible;
+        tweenOpts.opacity = Math.min(initialOpacity, tweenOpts.opacity);
     }
     
     if (!visible) {
-        let initialOpacity = window.opacity;
-
         tweenOpts.onComplete = () => { 
             windowActor.visible = visible; 
             window.opacity = initialOpacity;