Bugfix 1

git-svn-id: https://svn.code.sf.net/p/kooldock/code@56 9f32970d-5c29-0410-a1d8-a3be4640426c
Signed-off-by: Alexander Golubev <fatzer2@gmail.com>

1 files changed, 12 insertions, 10 deletions

diff --git a/src/kooldock.cpp b/src/kooldock.cpp
index 6c2e8cb..ce77058 100644
--- a/src/kooldock.cpp
+++ b/src/kooldock.cpp
@@ -1634,7 +1634,7 @@ void KoolDock::windowAdded(WId id)
   if (initialization) {
     return;
   }
-  if (fShowNav) {
+  if (!fShowTaskbar && fShowNav) {
     addToTaskList(id);
   }
   if (!fShowTaskbar) {
@@ -1653,11 +1653,12 @@ void KoolDock::windowAdded(WId id)
 
   debug(TQString("windowAdded(%1)").arg(name));
 
-  if (addwTask (id)) {
+  if (addwTask(id) && fShowNav) {
     addToTaskList(id);
   }
   addTask(id);
   doUpdateGeometry();
+  debug(QString("windowAdded(%1)").arg(name));
 }
 
 void KoolDock::windowRemoved(WId id)
@@ -1699,7 +1700,7 @@ void KoolDock::windowChanged(WId id, unsigned int properties)
   if (initialization) {
     return;
   }
-  if (fShowNav) {
+  if (fShowNav && !fShowTaskbar) {
     rmFromTaskList(id);
     addToTaskList(id);
   }
@@ -1764,8 +1765,10 @@ void KoolDock::windowChanged(WId id, unsigned int properties)
             toRepaint |= rmTask(id, iFound);
           }
         }
-        rmFromTaskList(id);
-        addToTaskList(id);
+        if (fShowNav) {
+          rmFromTaskList(id);
+          addToTaskList(id);
+        }
       }
       if (toRepaint) {
         doUpdateGeometry();
@@ -3401,11 +3404,6 @@ void KoolDock::init1()
 
   // Show task bar
   if (fShowTaskbar) {
-    // Add the necesary windows
-    if (reloadIcons) {
-      firstTime = true;
-      addWindows();
-    }
     connect(wm, SIGNAL(activeWindowChanged(WId)), SLOT(activeWindowChanged(WId)));
   }
   connect(wm, SIGNAL(windowAdded(WId)), SLOT(windowAdded(WId)));
@@ -3523,6 +3521,10 @@ void KoolDock::init1()
   if (fHidden == 1) {
     move(0, rdh);
   }
+
+  //Lets add the necesary windows
+  if (reloadIcons && fShowTaskbar) {firstTime=true;addWindows();}
+
   debug("Kooldock has started");
 
   doUpdateGeometry();