scawful/yaze
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor EditorManager to improve code consistency and readability by standardizing spacing and updating key press conditions in popups

Browse Source
This commit is contained in:
scawful
2024-11-08 00:14:40 -05:00
parent 6c0bc9877e
commit 0ca27cd35c
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/editor/editor_manager.cc
View File

@@ -314,8 +314,7 @@ void EditorManager::DrawStatusPopup() {
Separator(); Separator();
NewLine(); NewLine();
SameLine(128); SameLine(128);
if (Button("OK", gui::kDefaultModalSize) || if (Button("OK", gui::kDefaultModalSize) || IsKeyPressed(ImGuiKey_Space)) {
IsKeyPressed(GetKeyIndex(ImGuiKey_Space))) {
show_status_ = false; show_status_ = false;
status_ = absl::OkStatus(); status_ = absl::OkStatus();
} }
@@ -352,7 +351,7 @@ void EditorManager::DrawInfoPopup() {
Text("ROM Size: %s", core::UppercaseHexLongLong(rom()->size()).c_str()); Text("ROM Size: %s", core::UppercaseHexLongLong(rom()->size()).c_str());
if (Button("Close", gui::kDefaultModalSize) || if (Button("Close", gui::kDefaultModalSize) ||
IsKeyPressed(GetKeyIndex(ImGuiKey_Space))) { IsKeyPressed(ImGuiKey_Escape)) {
rom_info_ = false; rom_info_ = false;
CloseCurrentPopup(); CloseCurrentPopup();
} }

13
src/app/editor/editor_manager.h
View File

@@ -16,8 +16,8 @@
#include "app/editor/music/music_editor.h" #include "app/editor/music/music_editor.h"
#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/command_manager.h" #include "app/editor/system/command_manager.h"
#include "app/editor/system/constant_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"
@@ -35,7 +35,7 @@ namespace editor {
* @brief The EditorManager controls the main editor window and manages the * @brief The EditorManager controls the main editor window and manages the
* various editor classes. * various editor classes.
* *
* This class inherits from SharedRom, GfxContext, and ExperimentFlags, and * This class inherits from SharedRom and ExperimentFlags, and
* provides functionality for setting up the screen, updating the editor, and * provides functionality for setting up the screen, updating the editor, and
* shutting down the editor. It also includes methods for drawing various menus * shutting down the editor. It also includes methods for drawing various menus
* and popups, saving the Rom, and managing editor-specific flags. * and popups, saving the Rom, and managing editor-specific flags.
@@ -63,7 +63,7 @@ class EditorManager : public SharedRom, public core::ExperimentFlags {
void SetupScreen(std::string filename = ""); void SetupScreen(std::string filename = "");
absl::Status Update(); absl::Status Update();
auto emulator() -> emu::Emulator& { return emulator_; } auto emulator() -> emu::Emulator & { return emulator_; }
auto quit() { return quit_; } auto quit() { return quit_; }
private: private:
@@ -80,7 +80,7 @@ class EditorManager : public SharedRom, public core::ExperimentFlags {
void LoadRom(); void LoadRom();
void SaveRom(); void SaveRom();
void OpenRomOrProject(const std::string& filename); void OpenRomOrProject(const std::string &filename);
absl::Status OpenProject(); absl::Status OpenProject();
bool quit_ = false; bool quit_ = false;
@@ -94,9 +94,8 @@ class EditorManager : public SharedRom, public core::ExperimentFlags {
absl::Status status_; absl::Status status_;
ImVector<int> active_tabs_; ImVector<int> active_tabs_;
std::vector<Editor*> active_editors_; std::vector<Editor *> active_editors_;
core::MessageDispatcher dispatcher_;
emu::Emulator emulator_; emu::Emulator emulator_;
Project current_project_; Project current_project_;
@@ -105,7 +104,7 @@ class EditorManager : public SharedRom, public core::ExperimentFlags {
ExtensionManager extension_manager_; ExtensionManager extension_manager_;
yaze_editor_context editor_context_; yaze_editor_context editor_context_;
Editor* current_editor_ = nullptr; Editor *current_editor_ = nullptr;
AssemblyEditor assembly_editor_; AssemblyEditor assembly_editor_;
DungeonEditor dungeon_editor_; DungeonEditor dungeon_editor_;
GraphicsEditor graphics_editor_; GraphicsEditor graphics_editor_;