sid
/
NazaraEditor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add categories to Windows to filter actions to display

This commit is contained in:
SweetId 2023-10-16 19:33:51 -04:00
parent 9b9b93a183
commit 52ed1e7749
6 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/NazaraEditor/Core/UI/MainWindow.h
View File

@ -8,7 +8,7 @@ namespace Nz
: public EditorWindow : public EditorWindow
{ {
public: public:
EditorMainWindow(EditorBaseApplication* app, const std::string& name = ""); EditorMainWindow(EditorBaseApplication* app, const std::string& name = "", const std::vector<std::string>& categories = {});
virtual ~EditorMainWindow() = default; virtual ~EditorMainWindow() = default;
protected: protected:

5
include/NazaraEditor/Core/UI/Window.hpp
View File

@ -14,7 +14,7 @@ namespace Nz
: private Nz::ImguiHandler : private Nz::ImguiHandler
{ {
public: public:
EditorWindow(EditorBaseApplication* app, const std::string& name = ""); EditorWindow(EditorBaseApplication* app, const std::string& name = "", const std::vector<std::string>& categories = {});
virtual ~EditorWindow(); virtual ~EditorWindow();
EditorWindow(const EditorWindow&) = delete; EditorWindow(const EditorWindow&) = delete;
@ -28,6 +28,8 @@ namespace Nz
EditorBaseApplication* GetApplication() { return m_application; } EditorBaseApplication* GetApplication() { return m_application; }
const EditorBaseApplication* GetApplication() const { return m_application; } const EditorBaseApplication* GetApplication() const { return m_application; }
bool HasMenuCategory(const std::string& category) const;
protected: protected:
void DrawMenus(); void DrawMenus();
@ -39,6 +41,7 @@ namespace Nz
EditorBaseApplication* m_application; EditorBaseApplication* m_application;
std::string m_windowName; std::string m_windowName;
std::vector<std::string> m_categories;
struct MenuAction struct MenuAction
{ {

4
src/NazaraEditor/Core/UI/MainWindow.cpp
View File

@ -2,8 +2,8 @@
namespace Nz namespace Nz
{ {
EditorMainWindow::EditorMainWindow(EditorBaseApplication* app, const std::string& name) EditorMainWindow::EditorMainWindow(EditorBaseApplication* app, const std::string& name, const std::vector<std::string>& categories)
: EditorWindow(app, name) : EditorWindow(app, name, categories)
{ } { }
void EditorMainWindow::OnRenderImgui() void EditorMainWindow::OnRenderImgui()

14
src/NazaraEditor/Core/UI/Window.cpp
View File

@ -4,12 +4,18 @@
namespace Nz namespace Nz
{ {
EditorWindow::EditorWindow(EditorBaseApplication* app, const std::string& name) EditorWindow::EditorWindow(EditorBaseApplication* app, const std::string& name, const std::vector<std::string>& categories)
: m_application(app) : m_application(app)
, m_windowName(name) , m_windowName(name)
, m_categories(categories)
{ {
Nz::Imgui::Instance()->AddHandler(this); Nz::Imgui::Instance()->AddHandler(this);
// Automatically add actions to menus
app->OnActionRegistered.Connect([this](auto&& prop) { app->OnActionRegistered.Connect([this](auto&& prop) {
if (!HasMenuCategory(prop.category))
return;
auto name = prop.className; auto name = prop.className;
AddMenuAction(prop.path, prop.shortcut.ToString(), [name]() { Nz::ActionStack::Instance()->ExecuteAction(name); }, prop.icon); AddMenuAction(prop.path, prop.shortcut.ToString(), [name]() { Nz::ActionStack::Instance()->ExecuteAction(name); }, prop.icon);
}); });
@ -60,6 +66,12 @@ namespace Nz
parent.entries.push_back(MenuSeparator{}); parent.entries.push_back(MenuSeparator{});
} }
bool EditorWindow::HasMenuCategory(const std::string& category) const
{
return std::find_if(m_categories.begin(), m_categories.end(), [&category](auto&& cat) { return cat == category; })
!= m_categories.end();
}
void EditorWindow::DrawMenus() void EditorWindow::DrawMenus()
{ {
if (m_root.entries.empty()) if (m_root.entries.empty())

2
src/NazaraEditor/Editor/UI/AssetsWindow.cpp
View File

@ -3,7 +3,7 @@
namespace NzEditor namespace NzEditor
{ {
AssetsWindow::AssetsWindow(Nz::EditorBaseApplication* app) AssetsWindow::AssetsWindow(Nz::EditorBaseApplication* app)
: Nz::EditorWindow(app, "Assets Browser") : Nz::EditorWindow(app, "Assets Browser", { "Assets" })
{ {
BuildMenuBar(); BuildMenuBar();
} }

15
src/NazaraEditor/Editor/UI/MainWindow.cpp
View File

@ -3,21 +3,8 @@
namespace NzEditor namespace NzEditor
{ {
MainWindow::MainWindow(Nz::EditorBaseApplication* app) MainWindow::MainWindow(Nz::EditorBaseApplication* app)
: Nz::EditorMainWindow(app, "MainWindow") : Nz::EditorMainWindow(app, "MainWindow", { "General", "Plugins" })
{ {
BuildMenuBar();
}
void MainWindow::BuildMenuBar()
{
AddMenuAction("File|Project|New", "Ctrl+Shift+N", [this]() { NewProject(); });
AddMenuAction("File|Project|Open", "Ctrl+Shift+O", [this]() { OpenProject(); });
AddMenuAction("File|Project|Save", "Ctrl+Shift+S", [this]() { SaveProject(); });
AddMenuAction("File|Level|New", "Ctrl+N", [this]() { NewLevel(); });
AddMenuAction("File|Level|Open", "Ctrl+O", [this]() { OpenLevel(); });
AddMenuAction("File|Level|Save", "Ctrl+S", [this]() { SaveLevel(); });
AddMenuSeparator("File");
AddMenuAction("File|Quit", "Ctrl+W", [this]() { Quit(); });
} }
bool MainWindow::Quit() bool MainWindow::Quit()