diff options
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/app.hpp | 2 | ||||
| -rw-r--r-- | editor/events.cpp | 5 | ||||
| -rw-r--r-- | editor/inspect.cpp | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/editor/app.hpp b/editor/app.hpp index 1e990f6c..800d3d10 100644 --- a/editor/app.hpp +++ b/editor/app.hpp @@ -116,7 +116,7 @@ private: void on_mouse_up_down(const mouse_button_event& event, bool is_down, const sdl2::EvClick& ev) noexcept override; void on_mouse_scroll(const mouse_scroll_event& event, const sdl2::EvScroll& ev) noexcept override; void on_key_up_down(const key_event& event, bool is_down, const sdl2::EvKey& ev) noexcept override; - std::tuple<key, int> resolve_keybinding(int k, int mods); + Pair<key, int> resolve_keybinding(int k, int mods); void on_text_input_event(const text_input_event& event) noexcept override; //bool on_text_editing_event(const text_editing_event& event) noexcept override; void on_viewport_event(const Magnum::Math::Vector2<int>& size) noexcept override; diff --git a/editor/events.cpp b/editor/events.cpp index b25cdb7e..6aaf1e70 100644 --- a/editor/events.cpp +++ b/editor/events.cpp @@ -7,7 +7,8 @@ #include "keys.hpp" #include "editor.hpp" #include "compat/enum-bitset.hpp" -#include <tuple> +#include <Corrade/Containers/Pair.h> +#include <Corrade/Containers/StructuredBindings.h> #include <Magnum/Platform/Sdl2Application.h> #include <Magnum/ImGuiIntegration/Context.hpp> @@ -141,7 +142,7 @@ void app::on_mouse_scroll(const mouse_scroll_event& event, const sdl2::EvScroll& while (false); } -auto app::resolve_keybinding(int k_, int mods_) -> std::tuple<key, int> +auto app::resolve_keybinding(int k_, int mods_) -> Pair<key, int> { [[maybe_unused]] constexpr int CTRL = kmod_ctrl; [[maybe_unused]] constexpr int SHIFT = kmod_shift; diff --git a/editor/inspect.cpp b/editor/inspect.cpp index ab177fda..7302f8bd 100644 --- a/editor/inspect.cpp +++ b/editor/inspect.cpp @@ -5,6 +5,7 @@ #include "imgui-raii.hpp" #include <cstdio> #include <utility> +#include <Corrade/Containers/StructuredBindings.h> #include <Corrade/Containers/ArrayView.h> #include <Corrade/Containers/String.h> #include <Magnum/Math/Functions.h> |