From bc1671090461553f2362cefd7e2f8cc60c261f8a Mon Sep 17 00:00:00 2001 From: Ryan Fleury Date: Sun, 21 Jan 2024 22:21:41 -0800 Subject: [PATCH] raddbg icon building/embedding/loading --- build.bat | 9 +++++++-- data/logo.ico | Bin 0 -> 7719 bytes data/logo.rc | 1 + src/df/gfx/df_gfx.c | 4 ++-- src/os/gfx/win32/os_gfx_win32.c | 1 + 5 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 data/logo.ico create mode 100644 data/logo.rc diff --git a/build.bat b/build.bat index 6809c165..130dbd30 100644 --- a/build.bat +++ b/build.bat @@ -47,8 +47,8 @@ set cl_debug= call cl /Od %cl_common% %auto_compile_flags% set cl_release= call cl /O2 /DNDEBUG %cl_common% %auto_compile_flags% set clang_debug= call clang -g -O0 %clang_common% %auto_compile_flags% set clang_release= call clang -g -O3 -DNDEBUG %clang_common% %auto_compile_flags% -set cl_link= /link /MANIFEST:EMBED /INCREMENTAL:NO /natvis:"%~dp0\src\natvis\base.natvis" -set clang_link= -fuse-ld=lld -Xlinker /MANIFEST:EMBED -Xlinker /natvis:"%~dp0\src\natvis\base.natvis" +set cl_link= /link /MANIFEST:EMBED /INCREMENTAL:NO /natvis:"%~dp0\src\natvis\base.natvis" logo.res +set clang_link= -fuse-ld=lld -Xlinker /MANIFEST:EMBED -Xlinker /natvis:"%~dp0\src\natvis\base.natvis" logo.res set cl_out= /out: set clang_out= -o @@ -77,6 +77,11 @@ if "%release%"=="1" set compile=%compile_release% if not exist build mkdir build if not exist local mkdir local +:: --- Produce Logo Icon File ------------------------------------------------- +pushd build +rc /nologo /fo logo.res ..\data\logo.rc +popd + :: --- Build & Run Metaprogram ------------------------------------------------ if "%no_meta%"=="1" echo [skipping metagen] if not "%no_meta%"=="1" ( diff --git a/data/logo.ico b/data/logo.ico new file mode 100644 index 0000000000000000000000000000000000000000..7591f203d082ca354e6de573a98eaea3b91d56c9 GIT binary patch literal 7719 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 if(!df_view_is_nil(view) && contains_2f32(panel_rect, ui_mouse()) && - abs_f32(view->scroll_pos.x.off) > 0.01f || - abs_f32(view->scroll_pos.y.off) > 0.01f) + (abs_f32(view->scroll_pos.x.off) > 0.01f || + abs_f32(view->scroll_pos.y.off) > 0.01f)) { build_hover_eval = 0; ws->hover_eval_first_frame_idx = df_frame_index(); diff --git a/src/os/gfx/win32/os_gfx_win32.c b/src/os/gfx/win32/os_gfx_win32.c index 9ead413f..1e9ccae6 100644 --- a/src/os/gfx/win32/os_gfx_win32.c +++ b/src/os/gfx/win32/os_gfx_win32.c @@ -571,6 +571,7 @@ os_graphical_init(void) wndclass.hInstance = w32_h_instance; wndclass.lpszClassName = L"graphical-window"; wndclass.hCursor = LoadCursorA(0, IDC_ARROW); + wndclass.hIcon = LoadIcon(w32_h_instance, MAKEINTRESOURCE(1)); ATOM wndatom = RegisterClassExW(&wndclass); (void)wndatom; }