Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-28 02:11:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

[rtns] Fix icons (#3972)

Browse Source
This commit is contained in:
Thad House
2022-01-27 20:58:07 -08:00
committed by GitHub
parent 560094ad92
commit 84df14dd70
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
roborioteamnumbersetter/CMakeLists.txt
View File

@@ -12,7 +12,7 @@ file(GLOB rtns_src src/main/native/cpp/*.cpp ${CMAKE_CURRENT_BINARY_DIR}/WPILibV
if (WIN32)
set(rtns_rc src/main/native/win/roborioteamnumbersetter.rc)
elseif(APPLE)
set(MACOSX_BUNDLE_ICON_FILE glass.icns)
set(MACOSX_BUNDLE_ICON_FILE rtns.icns)
set(APP_ICON_MACOSX src/main/native/mac/rtns.icns)
set_source_files_properties(${APP_ICON_MACOSX} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
endif()

19
roborioteamnumbersetter/src/main/native/cpp/App.cpp
View File

@@ -31,6 +31,16 @@ namespace gui = wpi::gui;
const char* GetWPILibVersion();
namespace rtns {
std::string_view GetResource_rtns_16_png();
std::string_view GetResource_rtns_32_png();
std::string_view GetResource_rtns_48_png();
std::string_view GetResource_rtns_64_png();
std::string_view GetResource_rtns_128_png();
std::string_view GetResource_rtns_256_png();
std::string_view GetResource_rtns_512_png();
} // namespace rtns
#define GLFWAPI extern "C"
GLFWAPI void glfwGetWindowSize(GLFWwindow* window, int* width, int* height);
#define GLFW_DONT_CARE -1
@@ -240,6 +250,15 @@ void Application(std::string_view saveDir) {
gui::CreateContext();
glass::CreateContext();
// Add icons
gui::AddIcon(rtns::GetResource_rtns_16_png());
gui::AddIcon(rtns::GetResource_rtns_32_png());
gui::AddIcon(rtns::GetResource_rtns_48_png());
gui::AddIcon(rtns::GetResource_rtns_64_png());
gui::AddIcon(rtns::GetResource_rtns_128_png());
gui::AddIcon(rtns::GetResource_rtns_256_png());
gui::AddIcon(rtns::GetResource_rtns_512_png());
glass::SetStorageName("roborioteamnumbersetter");
glass::SetStorageDir(saveDir.empty() ? gui::GetPlatformSaveFileDir()
: saveDir);