[ros-diffs] [hbelusca] 70719: [UXTHEME] Temporarily disable the WS_EX_DLGMODALFRAME test whose presence broke opening the system menu when the user clicks on the window caption icon. This half-broken DefWndNCH...

Author: hbelusca
Date: Fri Feb 12 22:12:51 2016
New Revision: 70719

URL: http://svn.reactos.org/svn/reactos?rev=70719&view=rev
Log:
[UXTHEME]
Temporarily disable the WS_EX_DLGMODALFRAME test whose presence broke opening the system menu when the user clicks on the window caption icon.
This half-broken DefWndNCHitTest comes from user32; see r70718 for more details.

Modified:
    trunk/reactos/dll/win32/uxtheme/nonclient.c

Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/nonclient...
==============================================================================
--- trunk/reactos/dll/win32/uxtheme/nonclient.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/uxtheme/nonclient.c	[iso-8859-1] Fri Feb 12 22:12:51 2016
@@ -950,7 +950,7 @@
                 ButtonWidth = GetSystemMetrics(SM_CXSIZE);

ButtonWidth -= 4;
-            ButtonWidth+= BUTTON_GAP_SIZE;
+            ButtonWidth += BUTTON_GAP_SIZE;

if (wi.dwStyle & WS_SYSMENU)
             {
@@ -960,7 +960,13 @@
                 }
                 else
                 {
-                    if(!(wi.dwExStyle & WS_EX_DLGMODALFRAME))
+                    // if(!(wi.dwExStyle & WS_EX_DLGMODALFRAME))
+                    // FIXME: The real test should check whether there is
+                    // an icon for the system window, and if so, do the
+                    // rect.left increase.
+                    // See win32ss/user/user32/windows/nonclient.c!DefWndNCHitTest
+                    // and win32ss/user/ntuser/nonclient.c!GetNCHitEx which does
+                    // the test better.
                         WindowRect.left += ButtonWidth;
                     WindowRect.right -= ButtonWidth;
                 }