Add CommandManager::ShowWhichKey and include src in build
This commit is contained in:
@@ -16,5 +16,6 @@ set(
|
|||||||
app/editor/utils/gfx_context.cc
|
app/editor/utils/gfx_context.cc
|
||||||
app/editor/overworld/entity.cc
|
app/editor/overworld/entity.cc
|
||||||
app/editor/system/settings_editor.cc
|
app/editor/system/settings_editor.cc
|
||||||
|
app/editor/system/command_manager.cc
|
||||||
app/editor/system/extension_manager.cc
|
app/editor/system/extension_manager.cc
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -242,6 +242,8 @@ void EditorManager::ManageActiveEditors() {
|
|||||||
void EditorManager::ManageKeyboardShortcuts() {
|
void EditorManager::ManageKeyboardShortcuts() {
|
||||||
bool ctrl_or_super = (GetIO().KeyCtrl || GetIO().KeySuper);
|
bool ctrl_or_super = (GetIO().KeyCtrl || GetIO().KeySuper);
|
||||||
|
|
||||||
|
command_manager_.ShowWhichKey();
|
||||||
|
|
||||||
// If CMD + R is pressed, reload the top result of recent files
|
// If CMD + R is pressed, reload the top result of recent files
|
||||||
if (IsKeyDown(ImGuiKey_R) && ctrl_or_super) {
|
if (IsKeyDown(ImGuiKey_R) && ctrl_or_super) {
|
||||||
static RecentFilesManager manager("recent_files.txt");
|
static RecentFilesManager manager("recent_files.txt");
|
||||||
|
|||||||
@@ -17,6 +17,7 @@
|
|||||||
#include "app/editor/overworld/overworld_editor.h"
|
#include "app/editor/overworld/overworld_editor.h"
|
||||||
#include "app/editor/sprite/sprite_editor.h"
|
#include "app/editor/sprite/sprite_editor.h"
|
||||||
#include "app/editor/system/constant_manager.h"
|
#include "app/editor/system/constant_manager.h"
|
||||||
|
#include "app/editor/system/command_manager.h"
|
||||||
#include "app/editor/system/extension_manager.h"
|
#include "app/editor/system/extension_manager.h"
|
||||||
#include "app/editor/system/settings_editor.h"
|
#include "app/editor/system/settings_editor.h"
|
||||||
#include "app/emu/emulator.h"
|
#include "app/emu/emulator.h"
|
||||||
@@ -99,6 +100,7 @@ class EditorManager : public SharedRom, public core::ExperimentFlags {
|
|||||||
emu::Emulator emulator_;
|
emu::Emulator emulator_;
|
||||||
|
|
||||||
Project current_project_;
|
Project current_project_;
|
||||||
|
CommandManager command_manager_;
|
||||||
ConstantManager constant_manager_;
|
ConstantManager constant_manager_;
|
||||||
ExtensionManager extension_manager_;
|
ExtensionManager extension_manager_;
|
||||||
yaze_editor_context editor_context_;
|
yaze_editor_context editor_context_;
|
||||||
|
|||||||
27
src/app/editor/system/command_manager.cc
Normal file
27
src/app/editor/system/command_manager.cc
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
#include "command_manager.h"
|
||||||
|
|
||||||
|
#include "imgui/imgui.h"
|
||||||
|
|
||||||
|
namespace yaze {
|
||||||
|
namespace app {
|
||||||
|
namespace editor {
|
||||||
|
|
||||||
|
// When the player presses Space, a popup will appear fixed to the bottom of the
|
||||||
|
// ImGui window with a list of the available key commands which can be used.
|
||||||
|
void CommandManager::ShowWhichKey() {
|
||||||
|
if (ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Space))) {
|
||||||
|
ImGui::OpenPopup("WhichKey");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ImGui::BeginPopup("WhichKey")) {
|
||||||
|
for (const auto& [shortcut, command] : commands_) {
|
||||||
|
ImGui::Text("%s: %s", shortcut.c_str(),
|
||||||
|
command->GetDescription().c_str());
|
||||||
|
}
|
||||||
|
ImGui::EndPopup();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace editor
|
||||||
|
} // namespace app
|
||||||
|
} // namespace yaze
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
#ifndef YAZE_APP_EDITOR_SYSTEM_COMMAND_MANAGER_H
|
#ifndef YAZE_APP_EDITOR_SYSTEM_COMMAND_MANAGER_H
|
||||||
#define YAZE_APP_EDITOR_SYSTEM_COMMAND_MANAGER_H
|
#define YAZE_APP_EDITOR_SYSTEM_COMMAND_MANAGER_H
|
||||||
|
|
||||||
|
#include <stack>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <unordered_map>
|
#include <unordered_map>
|
||||||
|
|
||||||
@@ -16,6 +17,8 @@ class Command {
|
|||||||
|
|
||||||
class CommandManager {
|
class CommandManager {
|
||||||
public:
|
public:
|
||||||
|
void ShowWhichKey();
|
||||||
|
|
||||||
void RegisterCommand(const std::string& shortcut, Command* command) {
|
void RegisterCommand(const std::string& shortcut, Command* command) {
|
||||||
commands_[shortcut] = command;
|
commands_[shortcut] = command;
|
||||||
}
|
}
|
||||||
@@ -50,4 +53,6 @@ class CommandManager {
|
|||||||
|
|
||||||
} // namespace editor
|
} // namespace editor
|
||||||
} // namespace app
|
} // namespace app
|
||||||
} // namespace yaze
|
} // namespace yaze
|
||||||
|
|
||||||
|
#endif // YAZE_APP_EDITOR_SYSTEM_COMMAND_MANAGER_H
|
||||||
Reference in New Issue
Block a user