Merge branch 'fix-for-high-dpi' into master

pit-ray · Feb 21, 2021 · dea7e13 · dea7e13
2 parents a71929b + 1f12d30
commit dea7e13
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 21 deletions.
diff --git a/core/include/screen_metrics.hpp b/core/include/screen_metrics.hpp
@@ -1,21 +1,6 @@
 #ifndef _SCREEN_METRICS_HPP
 #define _SCREEN_METRICS_HPP
 
-#define _WIN32_WINNT_WIN10 0x0A00 //Windows 10
-
-//for DPI support
-#if !defined(WINVER)
-
-#define WINVER        _WIN32_WINNT_WIN10
-#define _WIN32_WINNT  _WIN32_WINNT_WIN10
-
-#elif WINVER < _WIN32_WINNT_WIN10
-
-#define WINVER        _WIN32_WINNT_WIN10
-#define _WIN32_WINNT  _WIN32_WINNT_WIN10
-
-#endif
-
 #include <windows.h>
 #include <sstream>
 #include <string>
@@ -100,10 +85,6 @@ namespace ScreenMetrics {
     }
 
     inline void get_conbined_metrics(RECT* const rect) {
-        if(!SetProcessDPIAware()) {
-            throw RUNTIME_EXCEPT("Your system is not supported DPI.") ;
-        }
-
         WINDOWINFO winfo ;
         winfo.cbSize = sizeof(WINDOWINFO) ;
         if(!GetWindowInfo(GetDesktopWindow(), &winfo)) {

diff --git a/core/src/win_vind.cpp b/core/src/win_vind.cpp
@@ -1,5 +1,20 @@
 #include "win_vind.hpp"
 
+#define _WIN32_WINNT_WIN10 0x0A00 //Windows 10
+
+//for DPI support
+#if !defined(WINVER)
+
+#define WINVER        _WIN32_WINNT_WIN10
+#define _WIN32_WINNT  _WIN32_WINNT_WIN10
+
+#elif WINVER < _WIN32_WINNT_WIN10
+
+#define WINVER        _WIN32_WINNT_WIN10
+#define _WIN32_WINNT  _WIN32_WINNT_WIN10
+
+#endif
+
 #include <windows.h>
 
 #if defined(__GNUC__)
@@ -106,6 +121,12 @@ namespace win_vind
                 return false ;
             }
 
+            //enable high DPI support
+            if(!SetProcessDPIAware()) {
+                ERROR_PRINT("Your system is not supported DPI.") ;
+                return false ;
+            }
+
             //load keyboard mapping of ascii code
             //For example, we type LShift + 1 or RShift + 1 in order to input '!' at JP-Keyboard.
             VKCConverter::load_input_combination() ;

diff --git a/wxgui/src/wx_prop_dlg.cpp b/wxgui/src/wx_prop_dlg.cpp
@@ -39,9 +39,9 @@
 #define KEY_COLOR "#1e96ff"
 #define TXT_COLOR "gray"
 #define TXT_SIZE "small"
-#define CREATE_ITEM(KEY, VAL) "<tt><span size='"TXT_SIZE"' foreground='" KEY_COLOR \
+#define CREATE_ITEM(KEY, VAL) "<tt><span size='" TXT_SIZE "' foreground='" KEY_COLOR \
                               "'>" KEY \
-                              "</span> <span size='"TXT_SIZE"' foreground='" TXT_COLOR \
+                              "</span> <span size='" TXT_SIZE "' foreground='" TXT_COLOR \
                               "'>" VAL "</span></tt>"
 
 namespace wxGUI