From e5ce2745086961cc1f6d46e8e5cc97e18c546149 Mon Sep 17 00:00:00 2001 From: scawful Date: Sat, 9 Jul 2022 22:46:01 -0400 Subject: [PATCH] Added lang def to assembly editor --- src/app/editor/assembly_editor.cc | 6 ++++++ src/app/editor/assembly_editor.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/app/editor/assembly_editor.cc b/src/app/editor/assembly_editor.cc index 65499ab6..f8391924 100644 --- a/src/app/editor/assembly_editor.cc +++ b/src/app/editor/assembly_editor.cc @@ -1,11 +1,17 @@ #include "assembly_editor.h" #include "core/constants.h" +#include "gui/widgets.h" namespace yaze { namespace app { namespace editor { +AssemblyEditor::AssemblyEditor() { + text_editor_.SetLanguageDefinition(gui::widgets::GetAssemblyLanguageDef()); + text_editor_.SetPalette(TextEditor::GetDarkPalette()); +} + void AssemblyEditor::Update() { auto cpos = text_editor_.GetCursorPosition(); ImGui::Begin("ASM Editor", &file_is_loaded_, ImGuiWindowFlags_MenuBar); diff --git a/src/app/editor/assembly_editor.h b/src/app/editor/assembly_editor.h index a9b24991..81135b40 100644 --- a/src/app/editor/assembly_editor.h +++ b/src/app/editor/assembly_editor.h @@ -14,7 +14,7 @@ namespace editor { class AssemblyEditor { public: - AssemblyEditor() = default; + AssemblyEditor(); void Update(); void ChangeActiveFile(const std::string &);