Fixes high DPI compatibility on Windows platform

native/cocos/platform/SDLHelper.cpp

@@ -315,20 +315,23 @@ void SDLHelper::dispatchSDLEvent(uint32_t windowId, const SDL_Event &sdlEvent) {
             const SDL_TouchFingerEvent &event = sdlEvent.tfinger;
             touch.type = TouchEvent::Type::ENDED;
             touch.touches = {TouchInfo(event.x, event.y, (int)event.fingerId)};
+            touch.windowId = event.windowID;
             events::Touch::broadcast(touch);
             break;
         }
         case SDL_FINGERDOWN: {
             const SDL_TouchFingerEvent &event = sdlEvent.tfinger;
             touch.type = TouchEvent::Type::BEGAN;
             touch.touches = {TouchInfo(event.x, event.y, (int)event.fingerId)};
+            touch.windowId = event.windowID;
             events::Touch::broadcast(touch);
             break;
         }
         case SDL_FINGERMOTION: {
             const SDL_TouchFingerEvent &event = sdlEvent.tfinger;
             touch.type = TouchEvent::Type::MOVED;
             touch.touches = {TouchInfo(event.x, event.y, (int)event.fingerId)};
+            touch.windowId = event.windowID;
             events::Touch::broadcast(touch);
             break;
         }

native/cocos/platform/win32/modules/Screen.cpp

@@ -31,19 +31,26 @@
 namespace cc {
 
 int Screen::getDPI() const {
+    // 参考：https://learn.microsoft.com/zh-cn/windows/win32/api/wingdi/nf-wingdi-getdevicecaps
     static int dpi = -1;
     if (dpi == -1) {
+
+        dpi = 96;
         HDC hScreenDC = GetDC(nullptr);
-        int PixelsX = GetDeviceCaps(hScreenDC, HORZRES);
-        int MMX = GetDeviceCaps(hScreenDC, HORZSIZE);
-        ReleaseDC(nullptr, hScreenDC);
-        dpi = static_cast<int>(254.0f * PixelsX / MMX / 10);
+        if (hScreenDC) {
+            // LOGPIXELSX 对应水平方向每逻辑英寸的像素点数
+            dpi = GetDeviceCaps(hScreenDC, LOGPIXELSX);
+            ReleaseDC(nullptr, hScreenDC);
+        }
+        // win10 1607 以上
+        // HWND hDesktop = GetDesktopWindow();
+        // dpi = GetDpiForWindow(hDesktop);
     }
     return dpi;
 }
 
 float Screen::getDevicePixelRatio() const {
-    return 1;
+    return getDPI() / 96.0f;
 }
 
 void Screen::setKeepScreenOn(bool value) {
@@ -73,4 +80,4 @@ void Screen::setDisplayStats(bool isShow) {
     se::ScriptEngine::getInstance()->evalString(commandBuf);
 }
 
-} // namespace cc
+} // namespace cc

native/cocos/platform/win32/modules/SystemWindow.cpp

@@ -29,6 +29,7 @@
 #include "engine/EngineEvents.h"
 #include "platform/SDLHelper.h"
 #include "platform/win32/WindowsPlatform.h"
+#include "platform/interfaces/modules/IScreen.h"
 
 namespace cc {
 SystemWindow::SystemWindow(uint32_t windowId, void *externalHandle)
@@ -45,27 +46,30 @@ SystemWindow::~SystemWindow() {
 
 bool SystemWindow::createWindow(const char *title,
                                 int w, int h, int flags) {
-    _window = SDLHelper::createWindow(title, w, h, flags);
+    float dpr = cc::BasePlatform::getPlatform()->getInterface<cc::IScreen>()->getDevicePixelRatio();
+    _width = w * dpr;
+    _height = h * dpr;
+    _window = SDLHelper::createWindow(title, _width, _height, flags);
     if (!_window) {
         return false;
     }
 
-    _width = w;
-    _height = h;
     _windowHandle = SDLHelper::getWindowHandle(_window);
     return true;
 }
 
 bool SystemWindow::createWindow(const char *title,
                                 int x, int y, int w,
                                 int h, int flags) {
-    _window = SDLHelper::createWindow(title, x, y, w, h, flags);
+    float dpr = cc::BasePlatform::getPlatform()->getInterface<cc::IScreen>()->getDevicePixelRatio();
+    _width = w * dpr;
+    _height = h * dpr;
+
+    _window = SDLHelper::createWindow(title, x, y, _width, _height, flags);
     if (!_window) {
         return false;
     }
 
-    _width = w;
-    _height = h;
     _windowHandle = SDLHelper::getWindowHandle(_window);
 
     return true;

native/tools/simulator/frameworks/runtime-src/CMakeLists.txt

@@ -152,6 +152,10 @@ else()
     add_executable(${LIB_NAME} ${PROJ_SOURCES} ${PROJ_EXTRA_SOURCE})
 endif()
 
+if(WINDOWS AND MSVC)
+    set_property(TARGET ${LIB_NAME} PROPERTY VS_DPI_AWARE "PerMonitor")
+endif()
+
 target_link_libraries(${LIB_NAME} ${ENGINE_NAME} simulator)
 target_include_directories(${LIB_NAME} PRIVATE
     Classes

pal/input/native/mouse-input.ts

@@ -116,7 +116,10 @@ export class MouseInputSource {
     private _getLocation (event: jsb.MouseEvent): Vec2 {
         const window = this._windowManager.getWindow(event.windowId);
         const windowSize = window.getViewSize();
-        const dpr = screenAdapter.devicePixelRatio;
+        let dpr = screenAdapter.devicePixelRatio;
+        if (systemInfo.os === OS.WINDOWS) { // 在windows下DPI变化时下发的是实际坐标
+            dpr = 1;
+        }
         const x = event.x * dpr;
         const y = windowSize.height - event.y * dpr;
         return new Vec2(x, y);
@@ -187,7 +190,10 @@ export class MouseInputSource {
         const eventMouse = new EventMouse(eventType, false, this._preMousePos, mouseEvent.windowId);
         eventMouse.setLocation(location.x, location.y);
         eventMouse.setButton(button);
-        const dpr = screenAdapter.devicePixelRatio;
+        let dpr = screenAdapter.devicePixelRatio;
+        if (systemInfo.os === OS.WINDOWS) { // 在windows下DPI变化时下发的是实际坐标
+            dpr = 1;
+        }
         eventMouse.movementX = typeof mouseEvent.xDelta === 'undefined' ? 0 : mouseEvent.xDelta * dpr;
         eventMouse.movementY = typeof mouseEvent.yDelta === 'undefined' ? 0 : mouseEvent.yDelta * dpr;
         // update previous mouse position.

pal/input/native/touch-input.ts

@@ -28,6 +28,8 @@
 import { EventTouch, Touch as CCTouch } from '../../../cocos/input/types';
 import { touchManager } from '../touch-manager';
 import { InputEventType } from '../../../cocos/input/types/event-enum';
+import { systemInfo } from 'pal/system-info';
+import { OS } from '../../system-info/enum-type';
 
 export type TouchCallback = (res: EventTouch) => void;
 
@@ -114,14 +116,19 @@
     private _dispatchEvent (eventType: InputEventType, changedTouches: Touch[], windowId: number): void {
         const handleTouches: CCTouch[] = [];
         const length = changedTouches.length;
-        const windowSize = this._windowManager.getWindow(windowId).getViewSize() as Size;
+        const window = this._windowManager.getWindow(windowId);
+        if (window === null) {
+            return;
+        }
+        const windowSize = window.getViewSize();        
+        // const windowSize = this._windowManager.getWindow(windowId).getViewSize() as Size;
         for (let i = 0; i < length; ++i) {
             const changedTouch = changedTouches[i];
             const touchID = changedTouch.identifier;
             if (touchID === null) {
                 continue;
             }
             const location = this._getLocation(changedTouch, windowSize);
             const touch = touchManager.getOrCreateTouch(touchID, location.x, location.y);
             if (!touch) {
                 continue;
@@ -144,7 +151,10 @@
     }
 
     private _getLocation (touch: globalThis.Touch, windowSize: Size): Vec2 {
-        const dpr = screenAdapter.devicePixelRatio;
+        let dpr = screenAdapter.devicePixelRatio;
+        if (systemInfo.os === OS.WINDOWS) { // 在windows下DPI变化时下发的是实际坐标
+            dpr = 1;
+        }
         const x = touch.clientX * dpr;
         const y = windowSize.height - touch.clientY * dpr;
         return new Vec2(x, y);

templates/compatibility-info.json

@@ -1,5 +1,5 @@
 {
     "native": {
-        "default": ">=3.6.0"
+        "default": ">=3.8.0"
     }
 }

templates/windows/CMakeLists.txt

@@ -14,4 +14,5 @@ cc_windows_before_target(${EXECUTABLE_NAME})
 add_executable(${EXECUTABLE_NAME}
     ${CC_ALL_SOURCES}
 )
+set_property(TARGET ${EXECUTABLE_NAME} PROPERTY VS_DPI_AWARE "PerMonitor")
 cc_windows_after_target(${EXECUTABLE_NAME})