Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2025-02-17 18:59:21 +01:00
Code Releases Wiki Activity

impr: Better UI/UX of the new debugger

Browse Source
This commit is contained in:
WerWolv 2023-06-11 22:00:49 +02:00
parent 54c6c9360a
commit ef1d831158
3 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/builtin/include/content/views/view_pattern_editor.hpp
View File

@ -166,7 +166,6 @@ namespace hex::plugin::builtin {
PerProvider<bool> m_shouldAnalyze;
PerProvider<bool> m_breakpointHit;
PerProvider<int> m_temporaryBreakpointLine;
PerProvider<ui::PatternDrawer> m_debuggerDrawer;
std::atomic<bool> m_resetDebuggerVariables;

2
plugins/builtin/romfs/lang/en_US.json
View File

@ -816,13 +816,13 @@
"hex.builtin.view.pattern_editor.accept_pattern.pattern_language": "Patterns",
"hex.builtin.view.pattern_editor.accept_pattern.question": "Do you want to apply the selected pattern?",
"hex.builtin.view.pattern_editor.auto": "Auto evaluate",
"hex.builtin.view.pattern_editor.breakpoint_hit": "Halted at line {0}",
"hex.builtin.view.pattern_editor.console": "Console",
"hex.builtin.view.pattern_editor.dangerous_function.desc": "This pattern tried to call a dangerous function.\nAre you sure you want to trust this pattern?",
"hex.builtin.view.pattern_editor.dangerous_function.name": "Allow dangerous function?",
"hex.builtin.view.pattern_editor.debugger": "Debugger",
"hex.builtin.view.pattern_editor.debugger.add_tooltip": "Add breakpoint",
"hex.builtin.view.pattern_editor.debugger.continue": "Continue",
"hex.builtin.view.pattern_editor.debugger.halted_line": "Halted at line {0}",
"hex.builtin.view.pattern_editor.debugger.remove_tooltip": "Remove breakpoint",
"hex.builtin.view.pattern_editor.env_vars": "Environment Variables",
"hex.builtin.view.pattern_editor.evaluating": "Evaluating...",

34
plugins/builtin/source/content/views/view_pattern_editor.cpp
View File

@ -171,8 +171,13 @@ namespace hex::plugin::builtin {
{
auto &runtime = ContentRegistry::PatternLanguage::getRuntime();
if (runtime.isRunning()) {
if (ImGui::IconButton(ICON_VS_DEBUG_STOP, ImGui::GetCustomColorVec4(ImGuiCustomCol_ToolbarRed)))
runtime.abort();
if (this->m_breakpointHit) {
if (ImGui::IconButton(ICON_VS_DEBUG_CONTINUE, ImGui::GetCustomColorVec4(ImGuiCustomCol_ToolbarYellow)))
this->m_breakpointHit = false;
} else {
if (ImGui::IconButton(ICON_VS_DEBUG_STOP, ImGui::GetCustomColorVec4(ImGuiCustomCol_ToolbarRed)))
runtime.abort();
}
} else {
if (ImGui::IconButton(ICON_VS_DEBUG_START, ImGui::GetCustomColorVec4(ImGuiCustomCol_ToolbarGreen)) || this->m_triggerEvaluation) {
this->m_triggerEvaluation = false;
@ -184,9 +189,13 @@ namespace hex::plugin::builtin {
ImGui::PopStyleVar();
ImGui::SameLine();
if (this->m_runningEvaluators > 0)
ImGui::TextSpinner("hex.builtin.view.pattern_editor.evaluating"_lang);
else {
if (this->m_runningEvaluators > 0) {
if (this->m_breakpointHit) {
ImGui::TextFormatted("hex.builtin.view.pattern_editor.breakpoint_hit"_lang, runtime.getInternals().evaluator->getPauseLine().value_or(0));
} else {
ImGui::TextSpinner("hex.builtin.view.pattern_editor.evaluating"_lang);
}
} else {
if (ImGui::Checkbox("hex.builtin.view.pattern_editor.auto"_lang, &this->m_runAutomatically)) {
if (this->m_runAutomatically)
this->m_hasUnevaluatedChanges = true;
@ -549,27 +558,14 @@ namespace hex::plugin::builtin {
ImGui::InfoTooltip("hex.builtin.view.pattern_editor.debugger.remove_tooltip"_lang);
}
ImGui::SameLine(0, 20_scaled);
if (*this->m_breakpointHit) {
auto pauseLine = evaluator->getPauseLine();
if (ImGui::IconButton(ICON_VS_DEBUG_CONTINUE, ImGui::GetCustomColorVec4(ImGuiCustomCol_ToolbarGreen))) {
*this->m_breakpointHit = false;
}
ImGui::InfoTooltip("hex.builtin.view.pattern_editor.debugger.continue"_lang);
if (pauseLine.has_value()) {
ImGui::SameLine();
ImGui::TextFormatted("hex.builtin.view.pattern_editor.debugger.halted_line"_lang, pauseLine.value());
}
auto &variables = *evaluator->getScope(0).scope;
if (this->m_resetDebuggerVariables) {
this->m_debuggerDrawer->reset();
this->m_resetDebuggerVariables = false;
auto pauseLine = evaluator->getPauseLine();
if (pauseLine.has_value())
this->m_textEditor.SetCursorPosition({ int(pauseLine.value() - 1), 0 });
}