From 9336f9cb9d4be7cc348fee2a1d0dca7e03892d79 Mon Sep 17 00:00:00 2001 From: scawful Date: Sat, 25 Nov 2023 22:45:00 -0500 Subject: [PATCH] Remove widgets namespace --- src/app/gui/widgets.cc | 10 ++++++++-- src/app/gui/widgets.h | 6 ++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/app/gui/widgets.cc b/src/app/gui/widgets.cc index b07cd4d0..b269708c 100644 --- a/src/app/gui/widgets.cc +++ b/src/app/gui/widgets.cc @@ -9,7 +9,14 @@ namespace yaze { namespace app { namespace gui { -namespace widgets { + +void RenderTabItem(const std::string &title, + const std::function &render_func) { + if (ImGui::BeginTabItem(title.c_str())) { + render_func(); + ImGui::EndTabItem(); + } +} // ============================================================================ // 65816 LanguageDefinition @@ -92,7 +99,6 @@ TextEditor::LanguageDefinition GetAssemblyLanguageDef() { return language_65816; } -} // namespace widgets } // namespace gui } // namespace app } // namespace yaze diff --git a/src/app/gui/widgets.h b/src/app/gui/widgets.h index eda06c34..6f963174 100644 --- a/src/app/gui/widgets.h +++ b/src/app/gui/widgets.h @@ -5,6 +5,7 @@ #include #include +#include #include #include "absl/status/status.h" @@ -14,10 +15,12 @@ namespace yaze { namespace app { namespace gui { -namespace widgets { TextEditor::LanguageDefinition GetAssemblyLanguageDef(); +void RenderTabItem(const std::string& title, + const std::function& render_func); + class BitmapViewer { public: BitmapViewer() : current_bitmap_index_(0) {} @@ -65,7 +68,6 @@ class BitmapViewer { int current_bitmap_index_; }; -} // namespace widgets } // namespace gui } // namespace app } // namespace yaze