From 1ab80e19dbe8a90b6758b3dbf6df9eb6b43eaa03 Mon Sep 17 00:00:00 2001
From: Nanako <469449812@qq.com>
Date: Wed, 10 Jul 2024 22:18:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AD=97=E4=BD=93=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CMakeLists.txt         | 5 +++++
 src/main.cpp           | 8 +++++---
 src/widget/main_page.h | 5 ++---
 third_party/imgui      | 2 +-
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5af23e2..b8069ce 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,3 +18,8 @@ retrieve_files(${CMAKE_CURRENT_SOURCE_DIR}/src ALL_FILES)
 add_executable(${PROJECT_NAME} ${ALL_FILES})
 target_link_libraries(${PROJECT_NAME} imgui httplib)
 target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)
+
+# 关闭windows控制台
+add_link_options(-mwindows)
+# 拷贝resources文件夹到build目录
+file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/resources DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
diff --git a/src/main.cpp b/src/main.cpp
index 8ff0fab..e599f3a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -14,9 +14,11 @@ void configure_imgui(ImGuiIO& io) {
     io.ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad;         // Enable Gamepad Controls
     io.ConfigFlags |= ImGuiConfigFlags_DockingEnable;            // Enable Docking
     io.ConfigFlags |= ImGuiConfigFlags_ViewportsEnable;          // Enable Multi-Viewport / Platform Windows
-    io.ConfigFlags |= ImGuiConfigFlags_DpiEnableScaleFonts;
-    io.ConfigFlags |= ImGuiConfigFlags_DpiEnableScaleViewports;
-    io.ConfigViewportsNoAutoMerge = true;
+    io.ConfigViewportsNoAutoMerge = false;
+
+    float dpi_scale = get_dpi_scale();
+
+    io.Fonts->AddFontFromFileTTF("resources/GenJyuuGothic-Normal-2.ttf", 18.0f * dpi_scale());
 }
 
 // 执行一些数据更新代码在这里
diff --git a/src/widget/main_page.h b/src/widget/main_page.h
index e3520eb..e041d3b 100644
--- a/src/widget/main_page.h
+++ b/src/widget/main_page.h
@@ -53,16 +53,15 @@ inline void draw_fan_infos() {
             {
                 ImGui::Text("Fan %d: %d RPM", fan_info.id, fan_info.speed_rpm);
                 std::string label = "Speed##" + std::to_string(fan_info.id);
-                ImGui::SliderInt(label.c_str(), &fan_info.speed_percent, 0, 100);
+                ImGui::SliderInt(label.c_str(), &fan_info.speed_percent, 1, 100);
                 if (ImGui::IsItemDeactivatedAfterEdit()) {
                     // 更新风扇转速
-                    fan_info.speed_percent = std::clamp(fan_info.speed_percent, 0, 100);
+                    fan_info.speed_percent = std::clamp(fan_info.speed_percent, 1, 100);
                     task_executor<set_fan_speed_task>::run_task(fan_info.id, fan_info.speed_percent);
                 }
             }
             ImGui::EndDisabled();
         }
-
         ImGui::PopStyleColor();
     }
 }
diff --git a/third_party/imgui b/third_party/imgui
index 79b37f1..329ba6a 160000
--- a/third_party/imgui
+++ b/third_party/imgui
@@ -1 +1 @@
-Subproject commit 79b37f14318110c08d72c26003f622bf6bbdcb54
+Subproject commit 329ba6af41be5736ff1a82943f746dc176ba9089