[ros-diffs] [weiden] 41807: Simplify code, thx Ged

[weiden at svn.reactos.org]

Author: weiden
Date: Wed Jul  8 20:57:12 2009
New Revision: 41807

URL: http://svn.reactos.org/svn/reactos?rev=41807&view=rev
Log:
Simplify code, thx Ged

Modified:
    trunk/reactos/base/shell/explorer-new/taskswnd.c

Modified: trunk/reactos/base/shell/explorer-new/taskswnd.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/taskswnd.c?rev=41807&r1=41806&r2=41807&view=diff
==============================================================================
--- trunk/reactos/base/shell/explorer-new/taskswnd.c [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer-new/taskswnd.c [iso-8859-1] Wed Jul  8 20:57:12 2009
@@ -1030,7 +1030,7 @@
 
 static BOOL
 TaskSwitchWnd_ActivateTaskItem(IN OUT PTASK_SWITCH_WND This,
-                               IN OUT PTASK_ITEM TaskItem)
+                               IN OUT PTASK_ITEM TaskItem  OPTIONAL)
 {
     if (TaskItem != NULL)
     {
@@ -1647,29 +1647,32 @@
 TaskSwitchWnd_HandleTaskItemClick(IN OUT PTASK_SWITCH_WND This,
                                   IN OUT PTASK_ITEM TaskItem)
 {
-    BOOL bMinimize;
-    
+    BOOL bIsMinimized;
+    BOOL bIsActive;
+
     if (IsWindow(TaskItem->hWnd))
     {
-        bMinimize = !IsIconic(TaskItem->hWnd) &&
-                    TaskItem == This->ActiveTaskItem;
-        
-        if (!bMinimize && IsIconic(TaskItem->hWnd))
-        {
-             PostMessage(TaskItem->hWnd,
-                         WM_SYSCOMMAND,
-                         SC_RESTORE,
-                         0);
-        }
-
-        SetForegroundWindow(TaskItem->hWnd);
-        
-        if (bMinimize)
+        bIsMinimized = IsIconic(TaskItem->hWnd);
+        bIsActive = (TaskItem == This->ActiveTaskItem);
+
+        if (!bIsMinimized && bIsActive)
         {
             PostMessage(TaskItem->hWnd,
                         WM_SYSCOMMAND,
                         SC_MINIMIZE,
                         0);
+        }
+        else
+        {
+            if (bIsMinimized)
+            {
+                 PostMessage(TaskItem->hWnd,
+                             WM_SYSCOMMAND,
+                             SC_RESTORE,
+                             0);
+            }
+
+            SetForegroundWindow(TaskItem->hWnd);
         }
     }
 }