Skip to content

Fix Android define to standard #332

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.

Sign up for GitHub

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

Open
Caerind wants to merge 2 commits into
base: master
Choose a base branch
from
+3 −3
Open

Fix Android define to standard #332

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7fe033f
Fix Android define to standard
Caerind Dec 13, 2025
0c74f96
Change Android preprocessor directive to SFML_SYSTEM_ANDROID
Caerind Dec 15, 2025
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
6 changes: 3 additions & 3 deletions imgui-SFML.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif

#ifdef ANDROID
#ifdef SFML_SYSTEM_ANDROID
#ifdef USE_JNI

#include <SFML/System/NativeActivity.hpp>
Expand Down Expand Up @@ -264,7 +264,7 @@ struct WindowContext

std::optional<sf::Cursor> mouseCursors[ImGuiMouseCursor_COUNT];

#ifdef ANDROID
#ifdef SFML_SYSTEM_ANDROID
#ifdef USE_JNI
bool wantTextInput{false};
#endif
Expand Down Expand Up @@ -534,7 +534,7 @@ void Update(const sf::Vector2i& mousePos, const sf::Vector2f& displaySize, sf::T
}
}

#ifdef ANDROID
#ifdef SFML_SYSTEM_ANDROID
#ifdef USE_JNI
if (io.WantTextInput && !s_currWindowCtx->wantTextInput)
{
Expand Down