drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 4 Pull Requests Actions Releases 10 Activity

[turbine] Disable useless window icon on Mac, it causes GLFW warning
All checks were successful
Build / build (push) Successful in 1m16s
Details

Browse Source
This commit is contained in:
Gary Talent 2025-04-17 21:36:56 -05:00
parent 8f03af99a7
commit 5169a607cf
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/olympic/turbine/src/glfw/gfx.cpp
View File

@ -247,18 +247,20 @@ static ox::Result<IconData> toGlfwImgPixels(ox::SpanView<uint8_t> const &iconPng
} }
ox::Error setWindowIcon(Context &ctx, ox::SpanView<ox::SpanView<uint8_t>> const &iconPngs) noexcept { ox::Error setWindowIcon(Context &ctx, ox::SpanView<ox::SpanView<uint8_t>> const &iconPngs) noexcept {
ox::Vector<IconData, 8> src; if constexpr(ox::defines::OS != ox::OS::Darwin) {
ox::Vector<GLFWimage, 8> imgs; ox::Vector<IconData, 8> src;
for (auto const &iconPng : iconPngs) { ox::Vector<GLFWimage, 8> imgs;
OX_RETURN_ERROR(toGlfwImgPixels(iconPng).moveTo(src.emplace_back())); for (auto const &iconPng : iconPngs) {
auto &icon = *src.back().unwrap(); OX_RETURN_ERROR(toGlfwImgPixels(iconPng).moveTo(src.emplace_back()));
imgs.emplace_back(GLFWimage{ auto &icon = *src.back().unwrap();
.width = icon.w, imgs.emplace_back(GLFWimage{
.height = icon.h, .width = icon.w,
.pixels = icon.pixels.data(), .height = icon.h,
}); .pixels = icon.pixels.data(),
});
}
glfwSetWindowIcon(ctx.window, static_cast<int>(imgs.size()), imgs.data());
} }
glfwSetWindowIcon(ctx.window, static_cast<int>(imgs.size()), imgs.data());
return {}; return {};
} }