From 71e43261cfb6dc48a2ebbd2bed68294f516e6745 Mon Sep 17 00:00:00 2001 From: sadlava Date: Wed, 1 May 2024 01:42:06 +0800 Subject: [PATCH 1/5] update auto-build bat script to support vs2022 and change the encoding to utf8 --- build_commands.bat | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/build_commands.bat b/build_commands.bat index b2b0c5bb..18e90bf8 100644 --- a/build_commands.bat +++ b/build_commands.bat @@ -1,4 +1,4 @@ -:: 以下命令用于将各版本库文件方便地输出到 build\lib 中 +:: 浠ヤ笅鍛戒护鐢ㄤ簬灏嗗悇鐗堟湰搴撴枃浠舵柟渚垮湴杈撳嚭鍒 build\lib 涓 :: MinGW @@ -67,8 +67,12 @@ cmake --build build\vs2019 --config Release -j cmake -G "Visual Studio 16 2019" -A x64 -S . -B build\vs2019_64 -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE="%CD%\build\lib\vs2019\x64" cmake --build build\vs2019_64 --config Release -j +:: Visual Studio 2022 64bit +cmake -G "Visual Studio 17 2022" -A x64 -S . -B build\vs2022_64 -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE="%CD%\build\lib\vs2022\x64" +cmake --build build\vs2022_64 --config Release -j + :: Visual C++ 6.0 -:: 请使用 CMD 执行 -:: 执行命令前请确保按 BUILD.md 中 `编译配置 -- Visual C++ 6.0` 一节做好设置 +:: 璇蜂娇鐢 CMD 鎵ц +:: 鎵ц鍛戒护鍓嶈纭繚鎸 BUILD.md 涓 `缂栬瘧閰嶇疆 -- Visual C++ 6.0` 涓鑺傚仛濂借缃 cmake -G "NMake Makefiles" -S . -B build\vc6 -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY="%CD%\build\lib\vc6" -DCMAKE_BUILD_TYPE=Release cmake --build build\vc6 From bdc1c60ee83608ef7b0467f46981b6cd069311ea Mon Sep 17 00:00:00 2001 From: sadlava Date: Wed, 1 May 2024 14:01:31 +0800 Subject: [PATCH 2/5] support vs2022 x86 --- build_commands.bat | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build_commands.bat b/build_commands.bat index 18e90bf8..63e5cc74 100644 --- a/build_commands.bat +++ b/build_commands.bat @@ -67,6 +67,10 @@ cmake --build build\vs2019 --config Release -j cmake -G "Visual Studio 16 2019" -A x64 -S . -B build\vs2019_64 -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE="%CD%\build\lib\vs2019\x64" cmake --build build\vs2019_64 --config Release -j +:: Visual Studio 2022 32bit +cmake -G "Visual Studio 17 2022" -A Win32 -S . -B build\vs2022 -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE="%CD%\build\lib\vs2022\x86" +cmake --build build\vs2022 --config Release -j + :: Visual Studio 2022 64bit cmake -G "Visual Studio 17 2022" -A x64 -S . -B build\vs2022_64 -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE="%CD%\build\lib\vs2022\x64" cmake --build build\vs2022_64 --config Release -j From c3fd9b563b58c658ec20a02e33298bd9358908e2 Mon Sep 17 00:00:00 2001 From: sadlava Date: Fri, 28 Feb 2025 19:20:02 +0800 Subject: [PATCH 3/5] update inputbox_getline to fix scaling issue --- src/egegapi.cpp | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/egegapi.cpp b/src/egegapi.cpp index 3f904bd9..036ffaea 100644 --- a/src/egegapi.cpp +++ b/src/egegapi.cpp @@ -2991,9 +2991,15 @@ int inputbox_getline(const char* title, const char* text, LPSTR buf, int len) int inputbox_getline(const wchar_t* title, const wchar_t* text, LPWSTR buf, int len) { + // 缁樺埗閫昏緫锛氬鏋滅┖闂磋冻澶燂紝灏遍噰鐢ㄨ繙鍙よ缃 + // 濡傛灉绌洪棿涓嶅锛屽氨绛夋瘮渚嬬缉鏀句竴涓 + //鐢变簬瀛椾綋楂樺害瀵硅鎰熷奖鍝嶆瘮杈冨ぇ锛岃繖閲屽瓧浣撻珮搴︾粦瀹氱殑鏄璇濇鐨勯珮搴 IMAGE bg; IMAGE window; - int w = 400, h = 300, x = (getwidth() - w) / 2, y = (getheight() - h) / 2; + + const int defaultWidth = 400, defaultHeight = 300; + + int w = MAX(defaultWidth, getwidth()), h = MAX(defaultHeight, getheight()), x = (getwidth() - w) / 2, y = (getheight() - h) / 2; int ret = 0; bg.getimage(0, 0, getwidth(), getheight()); @@ -3002,8 +3008,8 @@ int inputbox_getline(const wchar_t* title, const wchar_t* text, LPWSTR buf, int sys_edit edit(true); edit.create(true); - edit.move(x + 30 + 1, y + 192 + 1); - edit.size(w - (30 + 1) * 2, h - 40 - 192 - 2); + edit.move(x + (30 + 1)*w / defaultWidth, y + (192 + 1)*h / defaultHeight); + edit.size(w - (30 + 1) * 2*w / defaultWidth, h - (40 + 192 + 2)*h / defaultHeight); edit.setmaxlen(len); edit.visible(true); edit.setfocus(); @@ -3019,12 +3025,12 @@ int inputbox_getline(const wchar_t* title, const wchar_t* text, LPWSTR buf, int setcolor(0xFFFFFF, &window); setbkmode(TRANSPARENT, &window); - setfont(18, 0, L"Tahoma", &window); - outtextxy(3, 3, title, &window); + setfont(18*h/defaultHeight, 0, L"Tahoma", &window); + outtextxy(3*w/defaultWidth, 3*h/defaultHeight, title, &window); setcolor(0x0, &window); { - RECT rect = {30, 32, w - 30, 128 - 3}; + RECT rect = {30*w/defaultWidth, 32*h/defaultHeight, w - 30*w/defaultWidth, 128 - 3*h/defaultHeight}; DrawTextW(window.m_hDC, text, -1, From a98a7b71cf57df6db8d5a20f60d5c476febc2f44 Mon Sep 17 00:00:00 2001 From: sadlava Date: Fri, 28 Feb 2025 19:32:45 +0800 Subject: [PATCH 4/5] fix min and max bug --- src/egegapi.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/egegapi.cpp b/src/egegapi.cpp index 036ffaea..19cd13ae 100644 --- a/src/egegapi.cpp +++ b/src/egegapi.cpp @@ -2999,7 +2999,7 @@ int inputbox_getline(const wchar_t* title, const wchar_t* text, LPWSTR buf, int const int defaultWidth = 400, defaultHeight = 300; - int w = MAX(defaultWidth, getwidth()), h = MAX(defaultHeight, getheight()), x = (getwidth() - w) / 2, y = (getheight() - h) / 2; + int w = MIN(defaultWidth, getwidth()), h = MIN(defaultHeight, getheight()), x = (getwidth() - w) / 2, y = (getheight() - h) / 2; int ret = 0; bg.getimage(0, 0, getwidth(), getheight()); From 60691c6a3ced1a5cfb114b55dacc2d3f0770d4e9 Mon Sep 17 00:00:00 2001 From: sadlava Date: Fri, 28 Feb 2025 19:45:06 +0800 Subject: [PATCH 5/5] fix a bug when drawing label of inputbox --- src/egegapi.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/egegapi.cpp b/src/egegapi.cpp index 19cd13ae..da00c6fd 100644 --- a/src/egegapi.cpp +++ b/src/egegapi.cpp @@ -3020,7 +3020,7 @@ int inputbox_getline(const wchar_t* title, const wchar_t* text, LPWSTR buf, int for (int dy = 1; dy < 24; dy++) { setcolor(HSLtoRGB(240.0f, 1.0f, 0.5f + float(dy / 24.0 * 0.3)), &window); - line(1, dy, w - 1, dy, &window); + line(1, dy*h/defaultHeight, w - 1, dy*h/defaultHeight, &window); } setcolor(0xFFFFFF, &window);