mirror of
https://github.com/WerWolv/ImHex.git
synced 2026-03-29 08:20:02 -05:00
fix: Error message rendering of visualizers
This commit is contained in:
@@ -1,6 +1,7 @@
|
|||||||
#include <ui/visualizer_drawer.hpp>
|
#include <ui/visualizer_drawer.hpp>
|
||||||
|
|
||||||
#include <hex/api/localization_manager.hpp>
|
#include <hex/api/localization_manager.hpp>
|
||||||
|
#include <hex/helpers/scaling.hpp>
|
||||||
|
|
||||||
#include "imgui.h"
|
#include "imgui.h"
|
||||||
|
|
||||||
@@ -10,34 +11,32 @@ namespace hex::ui {
|
|||||||
const std::vector<pl::core::Token::Literal> &arguments, pl::ptrn::Pattern &pattern, bool reset) {
|
const std::vector<pl::core::Token::Literal> &arguments, pl::ptrn::Pattern &pattern, bool reset) {
|
||||||
auto visualizerName = arguments.front().toString(true);
|
auto visualizerName = arguments.front().toString(true);
|
||||||
|
|
||||||
if (auto entry = visualizers.find(visualizerName); entry != visualizers.end()) {
|
if (m_lastVisualizerError.empty()) {
|
||||||
const auto &[name, visualizer] = *entry;
|
if (auto entry = visualizers.find(visualizerName); entry != visualizers.end()) {
|
||||||
|
const auto &[name, visualizer] = *entry;
|
||||||
|
|
||||||
auto paramCount = arguments.size() - 1;
|
auto paramCount = arguments.size() - 1;
|
||||||
auto [minParams, maxParams] = visualizer.parameterCount;
|
auto [minParams, maxParams] = visualizer.parameterCount;
|
||||||
|
|
||||||
if (paramCount >= minParams && paramCount <= maxParams) {
|
if (paramCount >= minParams && paramCount <= maxParams) {
|
||||||
try {
|
try {
|
||||||
visualizer.callback(pattern, reset, {arguments.begin() + 1, arguments.end()});
|
visualizer.callback(pattern, reset, {arguments.begin() + 1, arguments.end()});
|
||||||
} catch (std::exception &e) {
|
} catch (std::exception &e) {
|
||||||
m_lastVisualizerError = e.what();
|
m_lastVisualizerError = e.what();
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
ImGui::TextUnformatted("hex.ui.pattern_drawer.visualizer.invalid_parameter_count"_lang);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
ImGui::TextUnformatted("hex.ui.pattern_drawer.visualizer.invalid_parameter_count"_lang);
|
ImGui::TextUnformatted("hex.ui.pattern_drawer.visualizer.unknown"_lang);
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
ImGui::TextUnformatted("hex.ui.pattern_drawer.visualizer.unknown"_lang);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!m_lastVisualizerError.empty()) {
|
if (!m_lastVisualizerError.empty()) {
|
||||||
auto windowWidth = ImGui::GetContentRegionAvail().x-2 * ImGuiStyleVar_WindowPadding;
|
auto textSize = ImGui::CalcTextSize(m_lastVisualizerError.c_str(), nullptr, false, 300_scaled);
|
||||||
auto errorMessageSize = ImGui::CalcTextSize(m_lastVisualizerError.c_str());
|
if (ImGui::BeginChild("##error_message", textSize + ImGui::GetStyle().WindowPadding * 2)) {
|
||||||
if (errorMessageSize.x > windowWidth)
|
|
||||||
errorMessageSize.y *= 2;
|
|
||||||
auto errorMessageWindowSize = ImVec2(windowWidth, errorMessageSize.y);
|
|
||||||
if (ImGui::BeginChild("##error_message", errorMessageWindowSize, 0, ImGuiWindowFlags_HorizontalScrollbar)) {
|
|
||||||
ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(1.0F, 0.0F, 0.0F, 1.0F));
|
ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(1.0F, 0.0F, 0.0F, 1.0F));
|
||||||
ImGui::TextUnformatted(m_lastVisualizerError.c_str());
|
ImGui::TextWrapped("%s", m_lastVisualizerError.c_str());
|
||||||
ImGui::PopStyleColor();
|
ImGui::PopStyleColor();
|
||||||
}
|
}
|
||||||
ImGui::EndChild();
|
ImGui::EndChild();
|
||||||
|
|||||||
Reference in New Issue
Block a user