echoes91
/
pioneer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update Pioneer to use the new ImGui APIs.

master
Webster Sheets 2019-12-01 19:55:58 -05:00
parent b8c213ba40
commit 928789c0df
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/LuaPiGui.cpp
View File

@ -224,9 +224,9 @@ static LuaFlags<ImGuiCol_> imguiColTable = {
{ "Header", ImGuiCol_Header },
{ "HeaderHovered", ImGuiCol_HeaderHovered },
{ "HeaderActive", ImGuiCol_HeaderActive },
{ "Column", ImGuiCol_Column },
{ "ColumnHovered", ImGuiCol_ColumnHovered },
{ "ColumnActive", ImGuiCol_ColumnActive },
{ "Separator", ImGuiCol_Separator },
{ "SeparatorHovered", ImGuiCol_SeparatorHovered },
{ "SeparatorActive", ImGuiCol_SeparatorActive },
{ "ResizeGrip", ImGuiCol_ResizeGrip },
{ "ResizeGripHovered", ImGuiCol_ResizeGripHovered },
{ "ResizeGripActive", ImGuiCol_ResizeGripActive },

10
src/PiGui.cpp
View File

@ -426,12 +426,12 @@ void PiGui::Render(double delta, std::string handler)
for (auto &iter : m_fonts) {
ImFont *font = iter.second;
// font might be nullptr, if it wasn't baked yet
if (font && font->AreGlyphsMissing()) {
if (font && !font->MissingGlyphs.empty()) {
// Output("%s %i is missing glyphs.\n", iter.first.first.c_str(), iter.first.second);
for (auto &glyph : font->MissingGlyphs()) {
for (const auto &glyph : font->MissingGlyphs) {
AddGlyph(font, glyph);
}
font->ResetMissingGlyphs();
font->MissingGlyphs.clear();
}
}
@ -501,10 +501,10 @@ void PiGui::BakeFont(PiFont &font)
m_im_fonts[imfont] = std::make_pair(font.name(), font.pixelsize());
// Output("setting %s %i to %p\n", font.name(), font.pixelsize(), imfont);
m_fonts[std::make_pair(font.name(), font.pixelsize())] = imfont;
if (imfont->AreGlyphsMissing()) {
if (!imfont->MissingGlyphs.empty()) {
Output("WARNING: glyphs missing in shiny new font\n");
}
imfont->ResetMissingGlyphs();
imfont->MissingGlyphs.clear();
}
void PiGui::BakeFonts()