From 7ac39b10f703838ce6770af5985c64e9621431e0 Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Wed, 23 Dec 2020 13:05:25 -0800 Subject: [PATCH] [wpigui] Add icon support --- wpigui/src/main/native/cpp/wpigui.cpp | 18 ++++++++++++++++ wpigui/src/main/native/include/wpigui.h | 21 +++++++++++++++++++ .../src/main/native/include/wpigui_internal.h | 2 ++ 3 files changed, 41 insertions(+) diff --git a/wpigui/src/main/native/cpp/wpigui.cpp b/wpigui/src/main/native/cpp/wpigui.cpp index cbaa3b84fa..a1be20a32e 100644 --- a/wpigui/src/main/native/cpp/wpigui.cpp +++ b/wpigui/src/main/native/cpp/wpigui.cpp @@ -208,6 +208,14 @@ bool gui::Initialize(const char* title, int width, int height) { glfwSetWindowMaximizeCallback(gContext->window, WindowMaximizeCallback); glfwSetWindowPosCallback(gContext->window, WindowPosCallback); + // Set icons + if (!gContext->icons.empty()) { + glfwSetWindowIcon(gContext->window, gContext->icons.size(), + gContext->icons.data()); + for (auto&& icon : gContext->icons) stbi_image_free(icon.pixels); + gContext->icons.clear(); + } + // Setup Dear ImGui style SetStyle(static_cast