修复多屏幕贴靠模式定位不准确的问题

XUANXUQAQ · XUANXUQAQ · commit 6d830f939661 · 2023-11-05T13:19:17.000+08:00
diff --git a/C++/getDpi/getDpi/getDpi.cpp b/C++/getDpi/getDpi/getDpi.cpp
@@ -4,22 +4,29 @@
 #pragma comment(lib, "User32.lib")
 #pragma comment(lib, "Shcore.lib")
 
-float get_dpi();
+void get_dpi();
 
 int main()
 {
-    const float dpi = get_dpi();
-    printf("%f", dpi);
+    get_dpi();
 }
 
 /**
  * 获取Windows缩放等级，适配高DPI
  */
-float get_dpi()
+void get_dpi()
 {
     const auto hwnd = FindWindowA(nullptr, "File-Engine-SearchBar");
     const auto h_monitor = MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST);
     UINT x, y; // x == y
     GetDpiForMonitor(h_monitor, MDT_EFFECTIVE_DPI, &x, &y);
-    return static_cast<float>(x) / 96;
+    printf("%f\n", static_cast<float>(x) / 96); // dpi
+
+    MONITORINFO info;
+    info.cbSize = sizeof(MONITORINFO);
+    GetMonitorInfo(h_monitor, &info);
+    const auto width = info.rcMonitor.right - info.rcMonitor.left;
+    const auto height = info.rcMonitor.bottom - info.rcMonitor.top;
+    printf("%ld\n", width);
+    printf("%ld\n", height);
 }
diff --git a/C++/getHandle/getHandle/dllmain.cpp b/C++/getHandle/getHandle/dllmain.cpp
@@ -504,6 +504,7 @@ void checkMouseThread()
 void checkTopWindowThread()
 {
     RECT window_rect;
+    SetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_UNAWARE);
     while (is_running)
     {
         HWND hwnd = GetForegroundWindow();
diff --git a/C++/getHandle/getHandle/getHandle.vcxproj b/C++/getHandle/getHandle/getHandle.vcxproj
@@ -132,6 +132,9 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableUAC>false</EnableUAC>
     </Link>
+    <Manifest>
+      <EnableDpiAwareness>PerMonitorHighDPIAware</EnableDpiAwareness>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
@@ -151,6 +154,9 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableUAC>false</EnableUAC>
     </Link>
+    <Manifest>
+      <EnableDpiAwareness>PerMonitorHighDPIAware</EnableDpiAwareness>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="checkHwnd.h" />
diff --git a/src/main/java/file/engine/frames/SearchBar.java b/src/main/java/file/engine/frames/SearchBar.java
@@ -3024,17 +3024,7 @@ private void switchSearchBarShowingMode() {
             EventManagement eventManagement = EventManagement.getInstance();
             GetHandle.INSTANCE.start();
             AllConfigs allConfigs = AllConfigs.getInstance();
-            var screenInfo = new Object() {
-                Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); // 获取屏幕大小
-                long screenSizeUpdateTime = System.currentTimeMillis();
-            };
-            final long updateScreenTimeLimit = 5000;
             while (eventManagement.notMainExit()) {
-                // 每隔5s更新一次屏幕大小
-                if (System.currentTimeMillis() - screenInfo.screenSizeUpdateTime > updateScreenTimeLimit) {
-                    screenInfo.screenSizeUpdateTime = System.currentTimeMillis();
-                    screenInfo.screenSize = Toolkit.getDefaultToolkit().getScreenSize();
-                }
                 if (showingMode == Constants.Enums.ShowingSearchBarMode.EXPLORER_ATTACH) {
                     String searchInfoLabelText = searchInfoLabel.getText();
                     if (searchInfoLabelText != null && searchInfoLabelText.isEmpty()) {
@@ -3043,10 +3033,11 @@ private void switchSearchBarShowingMode() {
                                         .getInstance()
                                         .getTranslation("Double-click shift to switch here")));
                     }
-                    getExplorerSizeAndChangeSearchBarSizeExplorerMode(screenInfo.screenSize);
+                    getExplorerSizeAndChangeSearchBarSizeExplorerMode();
                 } else {
-                    int width = screenInfo.screenSize.width;
-                    int height = screenInfo.screenSize.height;
+                    Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+                    int width = screenSize.width;
+                    int height = screenSize.height;
                     int searchBarWidth = (int) (width * SEARCH_BAR_WIDTH_RATIO);
                     int searchBarHeight = (int) (height * SEARCH_BAR_HEIGHT_RATIO);
                     int positionX, positionY;
@@ -3092,14 +3083,15 @@ private void switchSearchBarShowingMode() {
     /**
      * 获取explorer窗口大小，并修改显示模式和大小
      */
-    private void getExplorerSizeAndChangeSearchBarSizeExplorerMode(Dimension screenSize) {
-        double dpi = DpiUtil.getDpi();
-        long explorerWidth = (long) (GetHandle.INSTANCE.getExplorerWidth() / dpi);
-        long explorerHeight = (long) (GetHandle.INSTANCE.getExplorerHeight() / dpi);
-        long explorerX = (long) (GetHandle.INSTANCE.getExplorerX() / dpi);
-        long explorerY = (long) (GetHandle.INSTANCE.getExplorerY() / dpi);
+    private void getExplorerSizeAndChangeSearchBarSizeExplorerMode() {
+        Dimension dimension = new Dimension();
+        float dpi = DpiUtil.getDpi(dimension);
+        long explorerWidth = GetHandle.INSTANCE.getExplorerWidth();
+        long explorerHeight = GetHandle.INSTANCE.getExplorerHeight();
+        long explorerX = GetHandle.INSTANCE.getExplorerX();
+        long explorerY = GetHandle.INSTANCE.getExplorerY();
         int searchBarWidth = (int) (explorerWidth * SEARCH_BAR_WIDTH_RATIO);
-        int searchBarHeight = (int) (screenSize.height * SEARCH_BAR_HEIGHT_RATIO);
+        int searchBarHeight = (int) (dimension.height / dpi * SEARCH_BAR_HEIGHT_RATIO);
 
         int labelHeight = searchBarHeight / 9;
         //explorer窗口大于20像素才开始显示，防止误判其他系统窗口
diff --git a/src/main/java/file/engine/utils/DpiUtil.java b/src/main/java/file/engine/utils/DpiUtil.java
@@ -2,19 +2,28 @@
 
 import lombok.SneakyThrows;
 
+import java.awt.*;
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.nio.file.Path;
 
 public class DpiUtil {
 
-    private static volatile double dpi = 1;
+    private static volatile float dpi = 1;
+    private static volatile Dimension screenDimension = new Dimension();
     private static volatile long getDpiTime = 0;
     private static final String DPI_CHECK_PROC = "user/getDpi.exe";
 
+    public static float getDpi() {
+        return getDpi(null);
+    }
+
     @SneakyThrows
-    public static double getDpi() {
+    public static float getDpi(Dimension dimension) {
         if (System.currentTimeMillis() - getDpiTime <= 1000) {
+            if (dimension != null) {
+                dimension.setSize(screenDimension);
+            }
             return dpi;
         }
         getDpiTime = System.currentTimeMillis();
@@ -23,7 +32,15 @@ public static double getDpi() {
         try (var reader = new BufferedReader(new InputStreamReader(exec.getInputStream()))) {
             String dpiStr = reader.readLine();
             if (dpiStr != null) {
-                dpi = Double.parseDouble(dpiStr);
+                dpi = Float.parseFloat(dpiStr);
+            }
+            if (dimension != null) {
+                String screenWidth = reader.readLine();
+                int width = Integer.parseInt(screenWidth);
+                String ScreenHeight = reader.readLine();
+                int height = Integer.parseInt(ScreenHeight);
+                dimension.setSize(width, height);
+                screenDimension = new Dimension(width, height);
             }
         }
         return dpi;
diff --git a/src/main/resources/win32-native/getDpi.exe b/src/main/resources/win32-native/getDpi.exe
diff --git a/src/main/resources/win32-native/getHandle.dll b/src/main/resources/win32-native/getHandle.dll

Original file line number	Diff line number	Diff line change
`@@ -504,6 +504,7 @@ void checkMouseThread()`
`504`	`504`	`void checkTopWindowThread()`
`505`	`505`	`{`
`506`	`506`	`RECT window_rect;`
	`507`	`+ SetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_UNAWARE);`
`507`	`508`	`while (is_running)`
`508`	`509`	`{`
`509`	`510`	`HWND hwnd = GetForegroundWindow();`