Merge pull request #1865 from nicolasnoble/typed-debugger-fixes

Several fixes and improvements to the typed debugger

Author: nicolasnoble

src/gui/gui.cc

@@ -90,6 +90,60 @@ extern "C" {
 #include "supportpsx/binloader.h"
 #include "tracy/Tracy.hpp"
 
+unsigned PCSX::GUI::MarkDown::m_id = 0;
+
+PCSX::GUI::MarkDown::MarkDown(GUI* gui) : m_gui(gui) {}
+
+PCSX::GUI::MarkDown::MarkDown(GUI* gui, std::map<std::string_view, std::function<void()>>&& customURLs)
+    : m_customURLs(std::move(customURLs)), m_gui(gui) {}
+
+int PCSX::GUI::MarkDown::print(const std::string_view text) {
+    const char* ptr = text.data();
+    const char* end = ptr + text.size();
+    return imgui_md::print(ptr, end);
+}
+
+void PCSX::GUI::MarkDown::open_url() const {
+    if (m_href.starts_with("http")) {
+        openUrl(m_href);
+        return;
+    }
+    auto i = m_customURLs.find(m_href);
+    if (i != m_customURLs.end()) i->second();
+}
+
+bool PCSX::GUI::MarkDown::get_image(image_info& nfo) const { return false; }
+
+void PCSX::GUI::MarkDown::BLOCK_CODE(const MD_BLOCK_CODE_DETAIL* d, bool e) {
+    imgui_md::BLOCK_CODE(d, e);
+    if (e) {
+        ImGui::PushStyleVar(ImGuiStyleVar_ChildBorderSize, 5.0f);
+        auto color = ImGui::GetStyleColorVec4(ImGuiCol_CheckMark);
+        ImGui::PushStyleColor(ImGuiCol_Text, color);
+        ImGui::PushID(m_id++);
+        ImGui::BeginChild("pre", ImVec2(-FLT_MIN, 0.0f), ImGuiChildFlags_Borders | ImGuiChildFlags_AutoResizeY);
+        m_gui->useMonoFont();
+    } else {
+        ImGui::PopFont();
+        ImGui::EndChild();
+        ImGui::PopID();
+        ImGui::PopStyleColor();
+        ImGui::PopStyleVar();
+    }
+}
+
+void PCSX::GUI::MarkDown::SPAN_CODE(bool e) {
+    imgui_md::SPAN_CODE(e);
+    if (e) {
+        auto color = ImGui::GetStyleColorVec4(ImGuiCol_CheckMark);
+        ImGui::PushStyleColor(ImGuiCol_Text, color);
+        m_gui->useMonoFont();
+    } else {
+        ImGui::PopFont();
+        ImGui::PopStyleColor();
+    }
+}
+
 #ifdef _WIN32
 extern "C" {
 __declspec(dllexport) DWORD NvOptimusEnablement = 1;
@@ -937,6 +991,7 @@ void PCSX::GUI::startFrame() {
     ImGui_ImplOpenGL3_NewFrame();
     ImGui_ImplGlfw_NewFrame();
     ImGui::NewFrame();
+    MarkDown::newFrame();
     if (io.WantSaveIniSettings) {
         io.WantSaveIniSettings = false;
         saveCfg();
@@ -2362,7 +2417,7 @@ bool PCSX::GUI::about() {
             if (ImGui::BeginTabItem(_("Licenses"))) {
                 ImGui::BeginChild("Licenses", ImVec2(0, 0), true);
 
-                static MarkDown md({{"AUTHORS", [this]() { m_aboutSelectAuthors = true; }}});
+                MarkDown md(this, {{"AUTHORS", [this]() { m_aboutSelectAuthors = true; }}});
                 std::string_view text =
 #include "LICENSES.md"
                     ;

src/gui/gui.h

@@ -179,28 +179,19 @@ class GUI final : public UI {
 
   public:
     struct MarkDown : public imgui_md {
-        MarkDown() {}
-        MarkDown(std::map<std::string_view, std::function<void()>> &&customURLs)
-            : m_customURLs(std::move(customURLs)) {}
-        int print(const std::string_view text) {
-            const char *ptr = text.data();
-            const char *end = ptr + text.size();
-            return imgui_md::print(ptr, end);
-        }
-
-        void open_url() const override {
-            if (m_href.starts_with("http")) {
-                openUrl(m_href);
-                return;
-            }
-            auto i = m_customURLs.find(m_href);
-            if (i != m_customURLs.end()) i->second();
-        }
-
-        bool get_image(image_info &nfo) const override { return false; }
+        static void newFrame() { m_id = 0; }
+        MarkDown(GUI *gui);
+        MarkDown(GUI *gui, std::map<std::string_view, std::function<void()>> &&customURLs);
+        int print(const std::string_view text);
+        void open_url() const override;
+        bool get_image(image_info &nfo) const override;
+        void BLOCK_CODE(const MD_BLOCK_CODE_DETAIL *d, bool e);
+        void SPAN_CODE(bool e) override;
 
       private:
         std::map<std::string_view, std::function<void()>> m_customURLs;
+        GUI *m_gui;
+        static unsigned m_id;
     };
     static void openUrl(std::string_view url);
     void setOnlyLogGLErrors(bool value) { m_onlyLogGLErrors = value; }