FIX: enable HiDPI scaling on linux

effekseer · Sep 3, 2024 · 373b262 · 373b262
1 parent 96e39a7
commit 373b262
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -60,3 +60,5 @@ mono_crash.*.json
 mono_crash.*.blob
 Script/__pycache__/aceutils.cpython-37.pyc
 Tool/fbxsdk
+
+EffekseerTool/
diff --git a/Dev/Cpp/EditorCommon/GUI/MainWindow.cpp b/Dev/Cpp/EditorCommon/GUI/MainWindow.cpp
@@ -74,6 +74,12 @@ bool MainWindow::InitializeInternal(const char16_t* title, MainWindowState state
 	float yscale = 1.0f;
 	glfwGetMonitorContentScale(primary, &xscale, &yscale);
 	dpiScale_ = xscale;
+#elif defined(__linux__)
+	GLFWmonitor* primary = glfwGetPrimaryMonitor();
+	float xscale = 1.0f;
+	float yscale = 1.0f;
+	glfwGetMonitorContentScale(primary, &xscale, &yscale);
+	dpiScale_ = xscale;
 #endif
 
 	return true;

diff --git a/Dev/clean.sh b/Dev/clean.sh
@@ -0,0 +1,2 @@
+rm --force release/*.pdb
+rm --force release/Effekseer
diff --git a/Tool/CMakeLists.txt b/Tool/CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
 
 project(Tools)
 
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 14)
 
 if(MSVC)
   set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")

diff --git a/docs/Development/HowToBuild.md b/docs/Development/HowToBuild.md
@@ -32,7 +32,7 @@ Requirements
 - [.Net6.0 SDK](https://docs.microsoft.com/en-us/dotnet/core/install/linux-ubuntu)
 
 - Required packages:
-  - Ubuntu: `libx11-dev libgl1-mesa-dev libxrandr-dev libxi-dev x11proto-xf86vidmode-dev libx11-xcb-dev xorg-dev libglu1-mesa-dev libpulse-dev libgtk-3-dev libopenal-dev python3-distutils zenity`
+  - Ubuntu: `libglfw3-dev libx11-dev libgl1-mesa-dev libxrandr-dev libxi-dev x11proto-xf86vidmode-dev libx11-xcb-dev xorg-dev libglu1-mesa-dev libpulse-dev libgtk-3-dev libopenal-dev python3-distutils zenity`
   - On Fedora 40: `gtk3-devel pulseaudio-libs-devel openal-soft-devel mesa-libGLU-devel libX11-devel libxcb-devel libXi-devel libXrandr-devel mesa-libGL-devel glfw-devel gd-devel python3 dotnet zenity`
 
 Get code and resources

diff --git a/release_tool.sh b/release_tool.sh