mirrors/looking-glass
2
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-12-23 06:11:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[client] imgui: allow arrows to be displayed

Browse source
This commit is contained in:
Quantum 2022-01-15 00:33:54 -05:00 committed by Geoffrey McRae
parent 5fe529f213
commit b020372972
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
client/src/main.c
View file

@ -258,9 +258,9 @@ static int renderThread(void * unused)
ImFontAtlas_Clear(g_state.io->Fonts); ImFontAtlas_Clear(g_state.io->Fonts);
ImFontAtlas_AddFontFromFileTTF(g_state.io->Fonts, g_state.fontName, ImFontAtlas_AddFontFromFileTTF(g_state.io->Fonts, g_state.fontName,
g_params.uiSize * g_state.windowScale, NULL, NULL); g_params.uiSize * g_state.windowScale, NULL, g_state.fontRange.Data);
g_state.fontLarge = ImFontAtlas_AddFontFromFileTTF(g_state.io->Fonts, g_state.fontLarge = ImFontAtlas_AddFontFromFileTTF(g_state.io->Fonts,
g_state.fontName, 1.3f * g_params.uiSize * g_state.windowScale, NULL, NULL); g_state.fontName, 1.3f * g_params.uiSize * g_state.windowScale, NULL, g_state.fontRange.Data);
if (!ImFontAtlas_Build(g_state.io->Fonts)) if (!ImFontAtlas_Build(g_state.io->Fonts))
DEBUG_FATAL("Failed to build font atlas: %s (%s)", g_params.uiFont, g_state.fontName); DEBUG_FATAL("Failed to build font atlas: %s (%s)", g_params.uiFont, g_state.fontName);
@ -1011,6 +1011,17 @@ static int lg_run(void)
DEBUG_INFO("Using font: %s", g_state.fontName); DEBUG_INFO("Using font: %s", g_state.fontName);
} }
ImVector_ImWchar_Init(&g_state.fontRange);
ImFontGlyphRangesBuilder * rangeBuilder =
ImFontGlyphRangesBuilder_ImFontGlyphRangesBuilder();
ImFontGlyphRangesBuilder_AddRanges(rangeBuilder, (ImWchar[]) {
0x0020, 0x00FF, // Basic Latin + Latin Supplement
0x2190, 0x2193, // four directional arrows
0,
});
ImFontGlyphRangesBuilder_BuildRanges(rangeBuilder, &g_state.fontRange);
ImFontGlyphRangesBuilder_destroy(rangeBuilder);
app_initOverlays(); app_initOverlays();
// initialize metrics ringbuffers // initialize metrics ringbuffers
@ -1560,6 +1571,7 @@ static void lg_shutdown(void)
ringbuffer_free(&g_state.renderDuration); ringbuffer_free(&g_state.renderDuration);
free(g_state.fontName); free(g_state.fontName);
ImVector_ImWchar_UnInit(&g_state.fontRange);
igDestroyContext(NULL); igDestroyContext(NULL);
free(g_state.imGuiIni); free(g_state.imGuiIni);
} }

1
client/src/main.h
View file

@ -54,6 +54,7 @@ struct AppState
struct ll * overlays; struct ll * overlays;
char * fontName; char * fontName;
ImFont * fontLarge; ImFont * fontLarge;
ImVector_ImWchar fontRange;
bool overlayInput; bool overlayInput;
ImGuiMouseCursor cursorLast; ImGuiMouseCursor cursorLast;
char * imGuiIni; char * imGuiIni;