Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix for SFML master integration without breaking for non master builds #232

Merged
merged 2 commits into from
Feb 1, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions imgui-SFML.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,14 @@
#include <memory>
#include <vector>

#if SFML_VERSION_MAJOR >= 3
#define IMGUI_SFML_KEY_APOSTROPHE sf::Keyboard::Apostrophe
#define IMGUI_SFML_KEY_GRAVE sf::Keyboard::Grave
#else
#define IMGUI_SFML_KEY_APOSTROPHE sf::Keyboard::Quote
#define IMGUI_SFML_KEY_GRAVE sf::Keyboard::Tilde
#endif

#ifdef ANDROID
#ifdef USE_JNI

Expand Down Expand Up @@ -354,7 +362,7 @@ ImGuiKey keycodeToImGuiKey(sf::Keyboard::Key code) {
return ImGuiKey_Enter;
case sf::Keyboard::Escape:
return ImGuiKey_Escape;
case sf::Keyboard::Quote:
case IMGUI_SFML_KEY_APOSTROPHE:
return ImGuiKey_Apostrophe;
case sf::Keyboard::Comma:
return ImGuiKey_Comma;
Expand All @@ -374,7 +382,7 @@ ImGuiKey keycodeToImGuiKey(sf::Keyboard::Key code) {
return ImGuiKey_Backslash;
case sf::Keyboard::RBracket:
return ImGuiKey_RightBracket;
case sf::Keyboard::Tilde:
case IMGUI_SFML_KEY_GRAVE:
return ImGuiKey_GraveAccent;
// case : return ImGuiKey_CapsLock;
// case : return ImGuiKey_ScrollLock;
Expand Down