[akhaldi] 71323: [0.4.1] Merge the explorer fix by Thomas in r71318. CORE-11217

Author: akhaldi
Date: Thu May 12 19:40:49 2016
New Revision: 71323

URL: http://svn.reactos.org/svn/reactos?rev=71323&view=rev
Log:
[0.4.1] Merge the explorer fix by Thomas in r71318. CORE-11217

Modified:
    branches/ros-branch-0_4_1/   (props changed)
    branches/ros-branch-0_4_1/reactos/   (props changed)
    branches/ros-branch-0_4_1/reactos/base/shell/explorer/traywnd.cpp

Propchange: branches/ros-branch-0_4_1/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Thu May 12 19:40:49 2016
@@ -1 +1 @@
-/trunk:71217,71231,71245,71252,71255,71296,71309
+/trunk:71217,71231,71245,71252,71255,71296,71309,71318

Propchange: branches/ros-branch-0_4_1/reactos/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Thu May 12 19:40:49 2016
@@ -20,4 +20,4 @@

/branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859
 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567
 /branches/wlan-bringup:54809-54998
-/trunk/reactos:71217,71231-71232,71245,71252,71262,71279,71296,71309
+/trunk/reactos:71217,71231-71232,71245,71252,71262,71279,71296,71309,71318

Modified: branches/ros-branch-0_4_1/reactos/base/shell/explorer/traywnd.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_1/reactos/base/s…
==============================================================================
--- branches/ros-branch-0_4_1/reactos/base/shell/explorer/traywnd.cpp	[iso-8859-1]
(original)
+++ branches/ros-branch-0_4_1/reactos/base/shell/explorer/traywnd.cpp	[iso-8859-1] Thu May
12 19:40:49 2016
@@ -1052,7 +1052,7 @@
                      rcTray.top,
                      rcTray.right - rcTray.left,
                      rcTray.bottom - rcTray.top,
-                     SWP_NOZORDER);
+                     SWP_NOZORDER | SWP_NOACTIVATE);
 
         ResizeWorkArea();
 
@@ -1146,7 +1146,7 @@
             0,
             0,
             0,
-            SWP_NOMOVE | SWP_NOSIZE);
+            SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
 
         /* Determine a minimum tray window rectangle. The "client" height is
            zero here since we cannot determine an optimal minimum width when
@@ -1456,7 +1456,7 @@
         {
             SetWindowStyle(m_hWnd, WS_THICKFRAME | WS_BORDER, WS_THICKFRAME |
WS_BORDER);
         }
-        SetWindowPos(NULL, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOSIZE |
SWP_NOZORDER | SWP_NOOWNERZORDER);
+        SetWindowPos(NULL, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOMOVE |
SWP_NOSIZE | SWP_NOZORDER | SWP_NOOWNERZORDER);
 
         return TRUE;
     }
@@ -1825,7 +1825,7 @@
             {
                 SetWindowStyle(m_hWnd, WS_THICKFRAME | WS_BORDER, WS_THICKFRAME |
WS_BORDER);
             }
-            SetWindowPos(NULL, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOSIZE |
SWP_NOZORDER | SWP_NOOWNERZORDER);
+            SetWindowPos(NULL, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOMOVE
| SWP_NOSIZE | SWP_NOZORDER | SWP_NOOWNERZORDER);
 
         }