1
0
mirror of synced 2024-11-28 01:20:51 +01:00

impr: Further optimize ImGui text rendering

This commit is contained in:
WerWolv 2024-06-27 17:09:20 +02:00
parent 7d42742684
commit e5c782ebe9
5 changed files with 40 additions and 15 deletions

View File

@ -123,6 +123,8 @@ namespace ImGuiExt {
int m_width = 0, m_height = 0; int m_width = 0, m_height = 0;
}; };
float GetTextWrapPos();
int UpdateStringSizeCallback(ImGuiInputTextCallbackData *data); int UpdateStringSizeCallback(ImGuiInputTextCallbackData *data);
bool IconHyperlink(const char *icon, const char *label, const ImVec2 &size_arg = ImVec2(0, 0), ImGuiButtonFlags flags = 0); bool IconHyperlink(const char *icon, const char *label, const ImVec2 &size_arg = ImVec2(0, 0), ImGuiButtonFlags flags = 0);
@ -186,7 +188,12 @@ namespace ImGuiExt {
void SmallProgressBar(float fraction, float yOffset = 0.0F); void SmallProgressBar(float fraction, float yOffset = 0.0F);
inline void TextFormatted(std::string_view fmt, auto &&...args) { inline void TextFormatted(std::string_view fmt, auto &&...args) {
ImGui::TextUnformatted(hex::format(fmt, std::forward<decltype(args)>(args)...).c_str()); if constexpr (sizeof...(args) == 0) {
ImGui::TextUnformatted(fmt.data(), fmt.data() + fmt.size());
} else {
const auto string = hex::format(fmt, std::forward<decltype(args)>(args)...);
ImGui::TextUnformatted(string.c_str(), string.c_str() + string.size());
}
} }
inline void TextFormattedSelectable(std::string_view fmt, auto &&...args) { inline void TextFormattedSelectable(std::string_view fmt, auto &&...args) {
@ -208,15 +215,24 @@ namespace ImGuiExt {
} }
inline void TextFormattedColored(ImColor color, std::string_view fmt, auto &&...args) { inline void TextFormattedColored(ImColor color, std::string_view fmt, auto &&...args) {
ImGui::TextColored(color, "%s", hex::format(fmt, std::forward<decltype(args)>(args)...).c_str()); ImGui::PushStyleColor(ImGuiCol_Text, color.Value);
ImGuiExt::TextFormatted(fmt, std::forward<decltype(args)>(args)...);
ImGui::PopStyleColor();
} }
inline void TextFormattedDisabled(std::string_view fmt, auto &&...args) { inline void TextFormattedDisabled(std::string_view fmt, auto &&...args) {
ImGui::TextDisabled("%s", hex::format(fmt, std::forward<decltype(args)>(args)...).c_str()); ImGui::PushStyleColor(ImGuiCol_Text, ImGui::GetStyle().Colors[ImGuiCol_TextDisabled]);
ImGuiExt::TextFormatted(fmt, std::forward<decltype(args)>(args)...);
ImGui::PopStyleColor();
} }
inline void TextFormattedWrapped(std::string_view fmt, auto &&...args) { inline void TextFormattedWrapped(std::string_view fmt, auto &&...args) {
ImGui::TextWrapped("%s", hex::format(fmt, std::forward<decltype(args)>(args)...).c_str()); const bool need_backup = ImGuiExt::GetTextWrapPos() < 0.0F; // Keep existing wrap position if one is already set
if (need_backup)
ImGui::PushTextWrapPos(0.0F);
ImGuiExt::TextFormatted(fmt, std::forward<decltype(args)>(args)...);
if (need_backup)
ImGui::PopTextWrapPos();
} }
inline void TextFormattedWrappedSelectable(std::string_view fmt, auto &&...args) { inline void TextFormattedWrappedSelectable(std::string_view fmt, auto &&...args) {

View File

@ -285,6 +285,10 @@ namespace ImGuiExt {
glDeleteTextures(1, reinterpret_cast<GLuint*>(&m_textureId)); glDeleteTextures(1, reinterpret_cast<GLuint*>(&m_textureId));
} }
float GetTextWrapPos() {
return GImGui->CurrentWindow->DC.TextWrapPos;
}
int UpdateStringSizeCallback(ImGuiInputTextCallbackData *data) { int UpdateStringSizeCallback(ImGuiInputTextCallbackData *data) {
if (data->EventFlag == ImGuiInputTextFlags_CallbackResize) { if (data->EventFlag == ImGuiInputTextFlags_CallbackResize) {
auto &string = *static_cast<std::string *>(data->UserData); auto &string = *static_cast<std::string *>(data->UserData);
@ -1194,7 +1198,7 @@ namespace ImGuiExt {
if (collapsed != nullptr && *collapsed) { if (collapsed != nullptr && *collapsed) {
ImGui::SetCursorPosY(ImGui::GetCursorPosY() - (ImGui::GetStyle().FramePadding.y * 2)); ImGui::SetCursorPosY(ImGui::GetCursorPosY() - (ImGui::GetStyle().FramePadding.y * 2));
ImGui::TextDisabled("..."); ImGuiExt::TextFormattedDisabled("...");
result = false; result = false;
} }
} }

View File

@ -325,7 +325,7 @@ namespace hex {
// Plugin load error popups // Plugin load error popups
// These are not translated because they should always be readable, no matter if any localization could be loaded or not // These are not translated because they should always be readable, no matter if any localization could be loaded or not
{ {
auto drawPluginFolderTable = [] { const static auto drawPluginFolderTable = [] {
ImGuiExt::UnderlinedText("Plugin folders"); ImGuiExt::UnderlinedText("Plugin folders");
if (ImGui::BeginTable("plugins", 2, ImGuiTableFlags_Borders | ImGuiTableFlags_RowBg | ImGuiTableFlags_ScrollY | ImGuiTableFlags_SizingFixedFit, ImVec2(0, 100_scaled))) { if (ImGui::BeginTable("plugins", 2, ImGuiTableFlags_Borders | ImGuiTableFlags_RowBg | ImGuiTableFlags_ScrollY | ImGuiTableFlags_SizingFixedFit, ImVec2(0, 100_scaled))) {
ImGui::TableSetupScrollFreeze(0, 1); ImGui::TableSetupScrollFreeze(0, 1);

View File

@ -63,11 +63,11 @@ namespace hex::plugin::builtin {
ImGui::TextUnformatted(" "); ImGui::TextUnformatted(" ");
break; break;
case 0xFF: case 0xFF:
ImGui::TextDisabled("##"); ImGuiExt::TextFormattedDisabled("##");
break; break;
default: default:
if (c >= ' ' && c <= '~') if (c >= ' ' && c <= '~')
ImGui::Text(".%c", c); ImGuiExt::TextFormatted(".{:c}", char(c));
else else
ImGui::Text(getFormatString(upperCase), c); ImGui::Text(getFormatString(upperCase), c);
break; break;

View File

@ -30,9 +30,9 @@ namespace hex::ui {
ImGui::TextUnformatted(string.data()); ImGui::TextUnformatted(string.data());
} }
else else
ImGui::TextDisabled("."); ImGuiExt::TextFormattedDisabled(".");
} else { } else {
ImGui::TextDisabled("."); ImGuiExt::TextFormattedDisabled(".");
} }
} }
@ -455,12 +455,17 @@ namespace hex::ui {
const float SeparatorColumWidth = 6_scaled; const float SeparatorColumWidth = 6_scaled;
const auto CharacterSize = ImGui::CalcTextSize("0"); const auto CharacterSize = ImGui::CalcTextSize("0");
if (const auto &visualizer = ContentRegistry::HexEditor::getVisualizerByName("hex.builtin.visualizer.hexadecimal.8bit"); m_currDataVisualizer == nullptr && visualizer != nullptr) { if (m_currDataVisualizer == nullptr) {
m_currDataVisualizer = visualizer; if (const auto &visualizer = ContentRegistry::HexEditor::getVisualizerByName("hex.builtin.visualizer.hexadecimal.8bit"); visualizer != nullptr) {
return; m_currDataVisualizer = visualizer;
return;
}
}
if (m_miniMapVisualizer == nullptr) {
if (const auto &visualizers = ContentRegistry::HexEditor::impl::getMiniMapVisualizers(); !visualizers.empty())
m_miniMapVisualizer = visualizers.front();
} }
if (const auto &visualizers = ContentRegistry::HexEditor::impl::getMiniMapVisualizers(); m_miniMapVisualizer == nullptr && !visualizers.empty())
m_miniMapVisualizer = visualizers.front();
const auto bytesPerCell = m_currDataVisualizer->getBytesPerCell(); const auto bytesPerCell = m_currDataVisualizer->getBytesPerCell();
const u16 columnCount = m_bytesPerRow / bytesPerCell; const u16 columnCount = m_bytesPerRow / bytesPerCell;