Merge pull request #502 from adobe/HiDPI

Hi dpi support in windows.

appshell.exe.manifest

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" manifestVersion="1.0">
 
   <!--The compatibility section will be merged from build/win/compatibility.manifest -->
 
@@ -17,4 +17,10 @@
     </security>
   </trustInfo>
 
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <ms_windowsSettings:dpiAware xmlns:ms_windowsSettings="http://schemas.microsoft.com/SMI/2005/WindowsSettings" xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</ms_windowsSettings:dpiAware>
+    </windowsSettings>
+  </application>
+
 </assembly>

appshell/cef_dark_window.cpp

@@ -30,6 +30,46 @@
 #define OS_WIN
 #include "config.h"
 
+//win HiDPI - Macro for loading button resources for scale factors start 
+#define BUTTON_RESOURCES(scale)\
+    if (mSysCloseButton == NULL) {\
+	mSysCloseButton = ResourceImage::FromResource(MAKEINTRESOURCE(IDB_CLOSE_BUTTON_ ## scale));\
+    }\
+    if (mSysMaximizeButton == NULL) {\
+        mSysMaximizeButton = ResourceImage::FromResource(MAKEINTRESOURCE(IDB_MAX_BUTTON_ ## scale));\
+    }\
+    if (mSysMinimizeButton == NULL) {\
+        mSysMinimizeButton = ResourceImage::FromResource(MAKEINTRESOURCE(IDB_MIN_BUTTON_ ## scale));\
+    }\
+    if (mSysRestoreButton == NULL) {\
+        mSysRestoreButton = ResourceImage::FromResource(MAKEINTRESOURCE(IDB_RESTORE_BUTTON_ ## scale));\
+    }\
+    if (mHoverSysCloseButton == NULL) {\
+        mHoverSysCloseButton = ResourceImage::FromResource(MAKEINTRESOURCE(IDB_CLOSE_HOVER_BUTTON_ ## scale));\
+    }\
+    if (mHoverSysRestoreButton == NULL) {\
+        mHoverSysRestoreButton = ResourceImage::FromResource(MAKEINTRESOURCE(IDB_RESTORE_HOVER_BUTTON_ ## scale));\
+    }\
+    if (mHoverSysMinimizeButton == NULL) {\
+        mHoverSysMinimizeButton = ResourceImage::FromResource(MAKEINTRESOURCE(IDB_MIN_HOVER_BUTTON_ ## scale));\
+    }\
+    if (mHoverSysMaximizeButton == NULL) {\
+        mHoverSysMaximizeButton = ResourceImage::FromResource(MAKEINTRESOURCE(IDB_MAX_HOVER_BUTTON_ ## scale));\
+    }\
+    if (mPressedSysCloseButton == NULL) {\
+        mPressedSysCloseButton = ResourceImage::FromResource(MAKEINTRESOURCE(IDB_CLOSE_PRESSED_BUTTON_ ## scale));\
+    }\
+    if (mPressedSysRestoreButton == NULL) {\
+        mPressedSysRestoreButton = ResourceImage::FromResource(MAKEINTRESOURCE(IDB_RESTORE_PRESSED_BUTTON_ ## scale));\
+    }\
+    if (mPressedSysMinimizeButton == NULL) {\
+        mPressedSysMinimizeButton = ResourceImage::FromResource(MAKEINTRESOURCE(IDB_MIN_PRESSED_BUTTON_ ## scale));\
+    }\
+    if (mPressedSysMaximizeButton == NULL) {\
+        mPressedSysMaximizeButton = ResourceImage::FromResource(MAKEINTRESOURCE(IDB_MAX_PRESSED_BUTTON_ ## scale));\
+    }
+//Macro for loading button resources end
+
 // Libraries
 #pragma comment(lib, "gdiplus")
 #pragma comment(lib, "UxTheme")
@@ -190,41 +230,27 @@ void cef_dark_window::InitMenuFont()
  */
 void cef_dark_window::LoadSysButtonImages()
 {
-    if (mSysCloseButton == NULL) {
-        mSysCloseButton = ResourceImage::FromResource(MAKEINTRESOURCE(IDB_CLOSE_BUTTON));
-    }
-    if (mSysMaximizeButton == NULL) {
-        mSysMaximizeButton = ResourceImage::FromResource(MAKEINTRESOURCE(IDB_MAX_BUTTON));
-    }
-    if (mSysMinimizeButton == NULL) {
-        mSysMinimizeButton = ResourceImage::FromResource(MAKEINTRESOURCE(IDB_MIN_BUTTON));
-    }
-    if (mSysRestoreButton == NULL) {
-        mSysRestoreButton = ResourceImage::FromResource(MAKEINTRESOURCE(IDB_RESTORE_BUTTON));
-    }
-    if (mHoverSysCloseButton == NULL) {
-        mHoverSysCloseButton = ResourceImage::FromResource(MAKEINTRESOURCE(IDB_CLOSE_HOVER_BUTTON));
-    }
-    if (mHoverSysRestoreButton == NULL) {
-        mHoverSysRestoreButton = ResourceImage::FromResource(MAKEINTRESOURCE(IDB_RESTORE_HOVER_BUTTON));
-    }
-    if (mHoverSysMinimizeButton == NULL) {
-        mHoverSysMinimizeButton = ResourceImage::FromResource(MAKEINTRESOURCE(IDB_MIN_HOVER_BUTTON));
-    }
-    if (mHoverSysMaximizeButton == NULL) {
-        mHoverSysMaximizeButton = ResourceImage::FromResource(MAKEINTRESOURCE(IDB_MAX_HOVER_BUTTON));
+	UINT scaleFactor = GetDPIScalingX();
+
+    if(scaleFactor>=250)
+    {
+        BUTTON_RESOURCES(2_5X)
     }
-    if (mPressedSysCloseButton == NULL) {
-        mPressedSysCloseButton = ResourceImage::FromResource(MAKEINTRESOURCE(IDB_CLOSE_PRESSED_BUTTON));
+    else if(scaleFactor>=200)
+    {
+        BUTTON_RESOURCES(2X)
     }
-    if (mPressedSysRestoreButton == NULL) {
-        mPressedSysRestoreButton = ResourceImage::FromResource(MAKEINTRESOURCE(IDB_RESTORE_PRESSED_BUTTON));
+    else if(scaleFactor>=150)
+    {
+        BUTTON_RESOURCES(1_5X)
     }
-    if (mPressedSysMinimizeButton == NULL) {
-        mPressedSysMinimizeButton = ResourceImage::FromResource(MAKEINTRESOURCE(IDB_MIN_PRESSED_BUTTON));
+    else if(scaleFactor>=125)
+    {
+        BUTTON_RESOURCES(1_25X)
     }
-    if (mPressedSysMaximizeButton == NULL) {
-        mPressedSysMaximizeButton = ResourceImage::FromResource(MAKEINTRESOURCE(IDB_MAX_PRESSED_BUTTON));
+    else
+    {
+        BUTTON_RESOURCES(1X)
     }
 }
 

appshell/cef_window.cpp

@@ -21,6 +21,10 @@
  */
 #include "cef_window.h"
 
+//DEFINES
+//HiDPI The default logical DPI when scaling is applied in windows. see. https://msdn.microsoft.com/en-us/library/ms701681(v=vs.85).aspx
+#define DEFAULT_WINDOWS_DPI 96  
+
 // Externals
 extern HINSTANCE hInst;   
 
@@ -347,3 +351,13 @@ BOOL cef_window::TrackNonClientMouseEvents(bool track/*=true*/)
 
     return ::TrackMouseEvent (&tme);
 }
+
+//Get the Horizontal DPI scaling factor. 
+UINT cef_window::GetDPIScalingX() const
+{
+    HDC dc = GetDC();
+    float lpx = dc ? GetDeviceCaps(dc,LOGPIXELSX):DEFAULT_WINDOWS_DPI ;
+    //scale factor as it would look in a default(96dpi) screen. the default will be always 96 logical DPI when scaling is applied in windows.
+    //see. https://msdn.microsoft.com/en-us/library/ms701681(v=vs.85).aspx 
+    return (lpx/DEFAULT_WINDOWS_DPI)*100; 
+}

appshell/cef_window.h

@@ -74,6 +74,7 @@ static __inline int RectHeight(const RECT &rIn)
 #define DCX_USESTYLE 0x00010000
 #endif
 
+
 // cef_window is a basic HWND wrapper
 //  that can be used to wrap any HWND 
 class cef_window
@@ -169,7 +170,7 @@ class cef_window
     HDC GetWindowDC()
     { return ::GetWindowDC(mWnd); }
 
-    HDC GetDC()
+    HDC GetDC() const
     { return ::GetDC(mWnd); }
 
     int ReleaseDC(HDC dc)
@@ -229,6 +230,8 @@ class cef_window
     HWND GetWindow(UINT uCmd) 
     { return ::GetWindow(mWnd, uCmd); }
 
+	UINT GetDPIScalingX() const;
+
 protected:
     // Attributes - Protected Members
     HWND mWnd;

appshell/cefclient.rc

@@ -46,19 +46,70 @@ IDI_CEFCLIENT                   ICON            "res\\appshell.ico"
 //
 // PNG
 //
-IDB_CLOSE_BUTTON                PNG             "res\\close.png"
-IDB_CLOSE_HOVER_BUTTON          PNG             "res\\close-hover.png"
-IDB_CLOSE_PRESSED_BUTTON        PNG             "res\\close-pressed.png"
-IDB_MAX_BUTTON                  PNG             "res\\max.png"
-IDB_MAX_HOVER_BUTTON            PNG             "res\\max-hover.png"
-IDB_MAX_PRESSED_BUTTON          PNG             "res\\max-pressed.png"
-IDB_MIN_BUTTON                  PNG             "res\\min.png"
-IDB_MIN_HOVER_BUTTON            PNG             "res\\min-hover.png"
-IDB_MIN_PRESSED_BUTTON          PNG             "res\\min-pressed.png"
-IDB_RESTORE_BUTTON              PNG             "res\\restore.png"
-IDB_RESTORE_HOVER_BUTTON        PNG             "res\\restore-hover.png"
-IDB_RESTORE_PRESSED_BUTTON      PNG             "res\\restore-pressed.png"
-
+IDB_CLOSE_BUTTON_1X                     PNG                     "res\\close.png"
+IDB_CLOSE_HOVER_BUTTON_1X               PNG                     "res\\close-hover.png"
+IDB_CLOSE_PRESSED_BUTTON_1X             PNG                     "res\\close-pressed.png"
+IDB_MAX_BUTTON_1X                       PNG                     "res\\max.png"
+IDB_MAX_HOVER_BUTTON_1X                 PNG                     "res\\max-hover.png"
+IDB_MAX_PRESSED_BUTTON_1X               PNG                     "res\\max-pressed.png"
+IDB_MIN_BUTTON_1X                       PNG                     "res\\min.png"
+IDB_MIN_HOVER_BUTTON_1X                 PNG                     "res\\min-hover.png"
+IDB_MIN_PRESSED_BUTTON_1X               PNG                     "res\\min-pressed.png"
+IDB_RESTORE_BUTTON_1X                   PNG                     "res\\restore.png"
+IDB_RESTORE_HOVER_BUTTON_1X             PNG                     "res\\restore-hover.png"
+IDB_RESTORE_PRESSED_BUTTON_1X           PNG                     "res\\restore-pressed.png"
+
+IDB_CLOSE_BUTTON_1_25X                  PNG                     "res\\1.25x\\close.png"
+IDB_CLOSE_HOVER_BUTTON_1_25X            PNG                     "res\\1.25x\\close-hover.png"
+IDB_CLOSE_PRESSED_BUTTON_1_25X          PNG                     "res\\1.25x\\close-pressed.png"
+IDB_MAX_BUTTON_1_25X                    PNG                     "res\\1.25x\\max.png"
+IDB_MAX_HOVER_BUTTON_1_25X              PNG                     "res\\1.25x\\max-hover.png"
+IDB_MAX_PRESSED_BUTTON_1_25X            PNG                     "res\\1.25x\\max-pressed.png"
+IDB_MIN_BUTTON_1_25X                    PNG                     "res\\1.25x\\min.png"
+IDB_MIN_HOVER_BUTTON_1_25X              PNG                     "res\\1.25x\\min-hover.png"
+IDB_MIN_PRESSED_BUTTON_1_25X            PNG                     "res\\1.25x\\min-pressed.png"
+IDB_RESTORE_BUTTON_1_25X                PNG                     "res\\1.25x\\restore.png"
+IDB_RESTORE_HOVER_BUTTON_1_25X          PNG                     "res\\1.25x\\restore-hover.png"
+IDB_RESTORE_PRESSED_BUTTON_1_25X        PNG                     "res\\1.25x\\restore-pressed.png"
+
+IDB_CLOSE_BUTTON_1_5X                   PNG                     "res\\1.5x\\close.png"
+IDB_CLOSE_HOVER_BUTTON_1_5X             PNG                     "res\\1.5x\\close-hover.png"
+IDB_CLOSE_PRESSED_BUTTON_1_5X           PNG                     "res\\1.5x\\close-pressed.png"
+IDB_MAX_BUTTON_1_5X                     PNG                     "res\\1.5x\\max.png"
+IDB_MAX_HOVER_BUTTON_1_5X               PNG                     "res\\1.5x\\max-hover.png"
+IDB_MAX_PRESSED_BUTTON_1_5X             PNG                     "res\\1.5x\\max-pressed.png"
+IDB_MIN_BUTTON_1_5X                     PNG                     "res\\1.5x\\min.png"
+IDB_MIN_HOVER_BUTTON_1_5X               PNG                     "res\\1.5x\\min-hover.png"
+IDB_MIN_PRESSED_BUTTON_1_5X             PNG                     "res\\1.5x\\min-pressed.png"
+IDB_RESTORE_BUTTON_1_5X                 PNG                     "res\\1.5x\\restore.png"
+IDB_RESTORE_HOVER_BUTTON_1_5X           PNG                     "res\\1.5x\\restore-hover.png"
+IDB_RESTORE_PRESSED_BUTTON_1_5X         PNG                     "res\\1.5x\\restore-pressed.png"
+
+IDB_CLOSE_BUTTON_2X                     PNG                     "res\\2x\\close.png"
+IDB_CLOSE_HOVER_BUTTON_2X               PNG                     "res\\2x\\close-hover.png"
+IDB_CLOSE_PRESSED_BUTTON_2X             PNG                     "res\\2x\\close-pressed.png"
+IDB_MAX_BUTTON_2X                       PNG                     "res\\2x\\max.png"
+IDB_MAX_HOVER_BUTTON_2X                 PNG                     "res\\2x\\max-hover.png"
+IDB_MAX_PRESSED_BUTTON_2X               PNG                     "res\\2x\\max-pressed.png"
+IDB_MIN_BUTTON_2X                       PNG                     "res\\2x\\min.png"
+IDB_MIN_HOVER_BUTTON_2X                 PNG                     "res\\2x\\min-hover.png"
+IDB_MIN_PRESSED_BUTTON_2X               PNG                     "res\\2x\\min-pressed.png"
+IDB_RESTORE_BUTTON_2X                   PNG                     "res\\2x\\restore.png"
+IDB_RESTORE_HOVER_BUTTON_2X             PNG                     "res\\2x\\restore-hover.png"
+IDB_RESTORE_PRESSED_BUTTON_2X           PNG                     "res\\2x\\restore-pressed.png"
+
+IDB_CLOSE_BUTTON_2_5X                   PNG                     "res\\2.5x\\close.png"
+IDB_CLOSE_HOVER_BUTTON_2_5X             PNG                     "res\\2.5x\\close-hover.png"
+IDB_CLOSE_PRESSED_BUTTON_2_5X           PNG                     "res\\2.5x\\close-pressed.png"
+IDB_MAX_BUTTON_2_5X                     PNG                     "res\\2.5x\\max.png"
+IDB_MAX_HOVER_BUTTON_2_5X               PNG                     "res\\2.5x\\max-hover.png"
+IDB_MAX_PRESSED_BUTTON_2_5X             PNG                     "res\\2.5x\\max-pressed.png"
+IDB_MIN_BUTTON_2_5X                     PNG                     "res\\2.5x\\min.png"
+IDB_MIN_HOVER_BUTTON_2_5X               PNG                     "res\\2.5x\\min-hover.png"
+IDB_MIN_PRESSED_BUTTON_2_5X             PNG                     "res\\2.5x\\min-pressed.png"
+IDB_RESTORE_BUTTON_2_5X                 PNG                     "res\\2.5x\\restore.png"
+IDB_RESTORE_HOVER_BUTTON_2_5X           PNG                     "res\\2.5x\\restore-hover.png"
+IDB_RESTORE_PRESSED_BUTTON_2_5X         PNG                     "res\\2.5x\\restore-pressed.png"
 
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////

appshell/resource.h

@@ -25,18 +25,70 @@
 #define IDC_NAV_RELOAD                  202
 #define IDC_NAV_STOP                    203
 
-#define IDB_CLOSE_BUTTON                300
-#define IDB_CLOSE_HOVER_BUTTON          301
-#define IDB_CLOSE_PRESSED_BUTTON        302
-#define IDB_MAX_BUTTON                  303
-#define IDB_MAX_HOVER_BUTTON            304
-#define IDB_MAX_PRESSED_BUTTON          305
-#define IDB_MIN_BUTTON                  306
-#define IDB_MIN_HOVER_BUTTON            307
-#define IDB_MIN_PRESSED_BUTTON          308
-#define IDB_RESTORE_BUTTON              309
-#define IDB_RESTORE_HOVER_BUTTON        310
-#define IDB_RESTORE_PRESSED_BUTTON      311
+#define IDB_CLOSE_BUTTON_1X                300
+#define IDB_CLOSE_HOVER_BUTTON_1X          301
+#define IDB_CLOSE_PRESSED_BUTTON_1X        302
+#define IDB_MAX_BUTTON_1X                  303
+#define IDB_MAX_HOVER_BUTTON_1X            304
+#define IDB_MAX_PRESSED_BUTTON_1X          305
+#define IDB_MIN_BUTTON_1X                  306
+#define IDB_MIN_HOVER_BUTTON_1X            307
+#define IDB_MIN_PRESSED_BUTTON_1X          308
+#define IDB_RESTORE_BUTTON_1X              309
+#define IDB_RESTORE_HOVER_BUTTON_1X        310
+#define IDB_RESTORE_PRESSED_BUTTON_1X      311
+
+#define IDB_CLOSE_BUTTON_1_25X             312
+#define IDB_CLOSE_HOVER_BUTTON_1_25X       313
+#define IDB_CLOSE_PRESSED_BUTTON_1_25X     314
+#define IDB_MAX_BUTTON_1_25X               315
+#define IDB_MAX_HOVER_BUTTON_1_25X         316
+#define IDB_MAX_PRESSED_BUTTON_1_25X       317
+#define IDB_MIN_BUTTON_1_25X               318
+#define IDB_MIN_HOVER_BUTTON_1_25X         319
+#define IDB_MIN_PRESSED_BUTTON_1_25X       320
+#define IDB_RESTORE_BUTTON_1_25X           321
+#define IDB_RESTORE_HOVER_BUTTON_1_25X     322
+#define IDB_RESTORE_PRESSED_BUTTON_1_25X   323
+
+#define IDB_CLOSE_BUTTON_1_5X              324
+#define IDB_CLOSE_HOVER_BUTTON_1_5X        325
+#define IDB_CLOSE_PRESSED_BUTTON_1_5X      326
+#define IDB_MAX_BUTTON_1_5X                327
+#define IDB_MAX_HOVER_BUTTON_1_5X          328
+#define IDB_MAX_PRESSED_BUTTON_1_5X        329
+#define IDB_MIN_BUTTON_1_5X                330
+#define IDB_MIN_HOVER_BUTTON_1_5X          331
+#define IDB_MIN_PRESSED_BUTTON_1_5X        332
+#define IDB_RESTORE_BUTTON_1_5X            333
+#define IDB_RESTORE_HOVER_BUTTON_1_5X      334
+#define IDB_RESTORE_PRESSED_BUTTON_1_5X    335
+
+#define IDB_CLOSE_BUTTON_2X                336
+#define IDB_CLOSE_HOVER_BUTTON_2X          337
+#define IDB_CLOSE_PRESSED_BUTTON_2X        338
+#define IDB_MAX_BUTTON_2X                  339
+#define IDB_MAX_PRESSED_BUTTON_2X          340
+#define IDB_MIN_BUTTON_2X                  341
+#define IDB_MIN_HOVER_BUTTON_2X            342
+#define IDB_MIN_PRESSED_BUTTON_2X          343
+#define IDB_RESTORE_BUTTON_2X              344
+#define IDB_RESTORE_HOVER_BUTTON_2X        345
+#define IDB_RESTORE_PRESSED_BUTTON_2X      346
+#define IDB_MAX_HOVER_BUTTON_2X            347
+
+#define IDB_CLOSE_BUTTON_2_5X              348
+#define IDB_CLOSE_HOVER_BUTTON_2_5X        349
+#define IDB_CLOSE_PRESSED_BUTTON_2_5X      350
+#define IDB_MAX_BUTTON_2_5X                351
+#define IDB_MAX_HOVER_BUTTON_2_5X          352
+#define IDB_MAX_PRESSED_BUTTON_2_5X        353
+#define IDB_MIN_BUTTON_2_5X                354
+#define IDB_MIN_HOVER_BUTTON_2_5X          355
+#define IDB_MIN_PRESSED_BUTTON_2_5X        356
+#define IDB_RESTORE_BUTTON_2_5X            357
+#define IDB_RESTORE_HOVER_BUTTON_2_5X      358
+#define IDB_RESTORE_PRESSED_BUTTON_2_5X    359
 
 #define IDS_BINDING                     1000
 #define IDS_DIALOGS                     1001