From 65d97bbab5eb6c9b8cd2f13c0abb02e33e9988ce Mon Sep 17 00:00:00 2001 From: scawful Date: Wed, 24 Jul 2024 10:43:39 -0400 Subject: [PATCH] housekeeping, imgui, emulator, input --- src/app/emu/emulator.h | 2 +- src/app/gui/input.h | 5 +---- src/lib/imgui | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/app/emu/emulator.h b/src/app/emu/emulator.h index 193111f4..879ca38b 100644 --- a/src/app/emu/emulator.h +++ b/src/app/emu/emulator.h @@ -66,7 +66,7 @@ class Emulator : public SharedRom { TableNextColumn, Function id="SnesPpu", - Function id="BreakpointList", + Function id="BreakpointList" } )"; const std::map data_bindings = { diff --git a/src/app/gui/input.h b/src/app/gui/input.h index 7b574809..4c70ff7f 100644 --- a/src/app/gui/input.h +++ b/src/app/gui/input.h @@ -28,13 +28,10 @@ namespace gui { constexpr ImVec2 kDefaultModalSize = ImVec2(200, 0); constexpr ImVec2 kZeroPos = ImVec2(0, 0); -IMGUI_API bool InputHexWithScrollwheel(const char* label, uint32_t* data, - uint32_t step = 0x01, - float input_width = 50.f); - IMGUI_API bool InputHex(const char* label, uint64_t* data); IMGUI_API bool InputHex(const char* label, int* data, int num_digits = 4, float input_width = 50.f); + IMGUI_API bool InputHexShort(const char* label, uint32_t* data); IMGUI_API bool InputHexWord(const char* label, uint16_t* data, float input_width = 50.f, bool no_step = false); diff --git a/src/lib/imgui b/src/lib/imgui index fe09ebbe..97c6f404 160000 --- a/src/lib/imgui +++ b/src/lib/imgui @@ -1 +1 @@ -Subproject commit fe09ebbe0a1c8bb5f39f326658faa6bde75bb568 +Subproject commit 97c6f4047ccc01367e29f6852e9cecf1e157d26b