[ros-diffs] [gadamopoulos] 74247: [UXTHEME] -Implement painting windows with WS_MINIMIZE. Such windows are minimized mdi windows.

Author: gadamopoulos
Date: Fri Mar 31 11:26:20 2017
New Revision: 74247

URL: http://svn.reactos.org/svn/reactos?rev=74247&view=rev
Log:
[UXTHEME] -Implement painting windows with WS_MINIMIZE. Such windows are minimized mdi
windows.

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

Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/nonclien…
==============================================================================
--- trunk/reactos/dll/win32/uxtheme/nonclient.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/uxtheme/nonclient.c	[iso-8859-1] Fri Mar 31 11:26:20 2017
@@ -245,7 +245,7 @@
                 iStateId = BUTTON_DISABLED;
         }
  
-        iPartId = WP_MINBUTTON;
+        iPartId = pcontext->wi.dwStyle & WS_MINIMIZE ? WP_RESTOREBUTTON :
WP_MINBUTTON;
         break;
 
     default:
@@ -329,7 +329,9 @@
     CaptionText = UserGetWindowCaption(pcontext->hWnd);
 
     /* Get the caption part and state id */
-    if (pcontext->wi.dwExStyle & WS_EX_TOOLWINDOW)
+    if (pcontext->wi.dwStyle & WS_MINIMIZE)
+        iPart = WP_MINCAPTION;
+    else if (pcontext->wi.dwExStyle & WS_EX_TOOLWINDOW)
         iPart = WP_SMALLCAPTION;
     else if (pcontext->wi.dwStyle & WS_MAXIMIZE)
         iPart = WP_MAXCAPTION;
@@ -630,12 +632,6 @@
     if(!(pcontext->wi.dwStyle & WS_VISIBLE))
         return;
 
-    if(pcontext->wi.dwStyle & WS_MINIMIZE)
-    {
-        ThemeDrawTitle(pcontext, prcCurrent);
-        return;
-    }
-
     if((pcontext->wi.dwStyle & WS_CAPTION)==WS_CAPTION)
     {
         if (bDoDoubleBuffering)
@@ -649,6 +645,9 @@
     {
         DrawClassicFrame(pcontext, prcCurrent);
     }
+
+    if(pcontext->wi.dwStyle & WS_MINIMIZE)
+        return;
 
     if(HAS_MENU(pcontext->hWnd, pcontext->wi.dwStyle))
         ThemeDrawMenuBar(pcontext, prcCurrent);

Modified: trunk/reactos/dll/win32/uxtheme/themehooks.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/themehoo…
==============================================================================
--- trunk/reactos/dll/win32/uxtheme/themehooks.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/uxtheme/themehooks.c	[iso-8859-1] Fri Mar 31 11:26:20 2017
@@ -97,7 +97,9 @@
     GetWindowInfo(hWnd, &wi);
 
     /* Get the caption part id */
-    if (wi.dwExStyle & WS_EX_TOOLWINDOW)
+    if (wi.dwStyle & WS_MINIMIZE)
+        iPart = WP_MINCAPTION;
+    else if (wi.dwExStyle & WS_EX_TOOLWINDOW)
         iPart = WP_SMALLCAPTION;
     else if (wi.dwStyle & WS_MAXIMIZE)
         iPart = WP_MAXCAPTION;