https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ed134bf2afefb52ea4786d16a74c54630f60911f
commit ed134bf2afefb52ea4786d16a74c54630f60911f Author: Ethan Rodensky <splitwi...@gmail.com> AuthorDate: Tue Aug 8 17:25:54 2023 -0400 Commit: Stanislav Motylkov <x86co...@gmail.com> CommitDate: Thu Aug 31 20:42:15 2023 +0300 [THEMES] Add PNG Start button to Lautus style (#5540) Use a PNG image with alpha channel transparency for the Start button when compiling Lautus as Vista+ visual style. This serves both as a test case, and improves appearance when using the taskbar with large icons. --- media/themes/Lautus/lautus.msstyles/CMakeLists.txt | 4 ++++ .../lautus.msstyles/bitmaps/NORMAL_STARTBUTTON.pdn | Bin 0 -> 15973 bytes .../lautus.msstyles/bitmaps/NORMAL_STARTBUTTON.png | Bin 0 -> 2341 bytes media/themes/Lautus/lautus.msstyles/lautus.rc | 14 ++++++++++++++ 4 files changed, 18 insertions(+) diff --git a/media/themes/Lautus/lautus.msstyles/CMakeLists.txt b/media/themes/Lautus/lautus.msstyles/CMakeLists.txt index 0f0971f9c55..e5e0565514c 100644 --- a/media/themes/Lautus/lautus.msstyles/CMakeLists.txt +++ b/media/themes/Lautus/lautus.msstyles/CMakeLists.txt @@ -1,4 +1,8 @@ +if(DLL_EXPORT_VERSION GREATER_EQUAL 0x600) + add_definitions(-DUSE_PNG_IMAGES) +endif() + list(APPEND TEXTFILES textfiles/ExtraLargeNormal.INI textfiles/LargeFontsNormal.INI diff --git a/media/themes/Lautus/lautus.msstyles/bitmaps/NORMAL_STARTBUTTON.pdn b/media/themes/Lautus/lautus.msstyles/bitmaps/NORMAL_STARTBUTTON.pdn new file mode 100644 index 00000000000..2beafa31ff4 Binary files /dev/null and b/media/themes/Lautus/lautus.msstyles/bitmaps/NORMAL_STARTBUTTON.pdn differ diff --git a/media/themes/Lautus/lautus.msstyles/bitmaps/NORMAL_STARTBUTTON.png b/media/themes/Lautus/lautus.msstyles/bitmaps/NORMAL_STARTBUTTON.png new file mode 100644 index 00000000000..5508ccbc79f Binary files /dev/null and b/media/themes/Lautus/lautus.msstyles/bitmaps/NORMAL_STARTBUTTON.png differ diff --git a/media/themes/Lautus/lautus.msstyles/lautus.rc b/media/themes/Lautus/lautus.msstyles/lautus.rc index dc5cdb7ddb1..ac5886e2929 100644 --- a/media/themes/Lautus/lautus.msstyles/lautus.rc +++ b/media/themes/Lautus/lautus.msstyles/lautus.rc @@ -92,7 +92,21 @@ NORMAL_SPINDOWNGLYPH_BMP BITMAP "bitmaps/NORMAL_SPINDOWNGLYPH.bmp" NORMAL_SPINLEFTGLYPH_BMP BITMAP "bitmaps/NORMAL_SPINLEFTGLYPH.bmp" NORMAL_SPINRIGHTGLYPH_BMP BITMAP "bitmaps/NORMAL_SPINRIGHTGLYPH.bmp" NORMAL_SPINUPGLYPH_BMP BITMAP "bitmaps/NORMAL_SPINUPGLYPH.bmp" +#ifdef USE_PNG_IMAGES +/* Resource ID ends in "BMP" both for BMP and PNG versions of this resource. This was + * done to keep the ImageFile paths the same, thus allowing the same INI file to be + * used to compile with or without using PNG resources. This is a workaround, and + * resource IDs ending with "PNG" do work and are preferable. + * + * This workaround is needed because preprocessor definitions only apply to code files. + * As more PNG resources are used, it might be best to some form of compile-time INI + * processing/generation, e.g. to conditionally assemble the final file from separate + * parts or something. This is far from a first priority task, though. + */ +NORMAL_STARTBUTTON_BMP IMAGE "bitmaps/NORMAL_STARTBUTTON.png" +#else NORMAL_STARTBUTTON_BMP BITMAP "bitmaps/NORMAL_STARTBUTTON.bmp" +#endif /* USE_PNG_IMAGES */ NORMAL_STARTGROUPBACKGROUND_BMP BITMAP "bitmaps/NORMAL_STARTGROUPBACKGROUND.bmp" NORMAL_STARTGROUPNEWAPPBUTTON_BMP BITMAP "bitmaps/NORMAL_STARTGROUPNEWAPPBUTTON.bmp" NORMAL_STARTGROUPSEPERATOR_BMP BITMAP "bitmaps/NORMAL_STARTGROUPSEPERATOR.bmp"