[ros-diffs] [dquintana] 65804: [EXPLORER] * Improve an older change that I commited by mistake, with the improvbements based on a patch by Giannis. * In Windows, fixes the taskbar having a size grip with the t...

Author: dquintana
Date: Tue Dec 23 01:31:36 2014
New Revision: 65804

URL: http://svn.reactos.org/svn/reactos?rev=65804&view=rev
Log:
[EXPLORER]
* Improve an older change that I commited by mistake, with the improvbements based on a patch by Giannis.
* In Windows, fixes the taskbar having a size grip with the taskbar is themed and locked.
* In ReactOS, the size grip never seems to disappear, contrary to Giannis' concerns in the issue.
* Because of the above, I decided to commit the changes, and let the sizing edge inconsistency be a followup to the issue.
CORE-6966 #resolve #comment A modified version of the patch was commited in r65804. Thanks.

Modified:
    trunk/reactos/base/shell/explorer/traywnd.cpp

Modified: trunk/reactos/base/shell/explorer/traywnd.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traywnd...
==============================================================================
--- trunk/reactos/base/shell/explorer/traywnd.cpp	[iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer/traywnd.cpp	[iso-8859-1] Tue Dec 23 01:31:36 2014
@@ -1435,7 +1435,7 @@
         else
             m_Theme = NULL;

-        if (m_Theme)
+        if (Locked && m_Theme)
         {
             SetWindowStyle(m_hWnd, WS_THICKFRAME | WS_BORDER, 0);
         }
@@ -1443,6 +1443,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);

return TRUE;
     }
@@ -1787,9 +1788,8 @@

BOOL STDMETHODCALLTYPE Lock(IN BOOL bLock)
     {
-        BOOL bPrevLock;
-
-        bPrevLock = Locked;
+        BOOL bPrevLock = Locked;
+
         if (Locked != bLock)
         {
             Locked = bLock;
@@ -1800,8 +1800,20 @@
                 {
                     /* Reset?? */
                     Locked = bPrevLock;
+                    return bPrevLock;
                 }
             }
+
+            if (Locked && m_Theme)
+            {
+                SetWindowStyle(m_hWnd, WS_THICKFRAME | WS_BORDER, 0);
+            }
+            else
+            {
+                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);
+
         }

return bPrevLock;