Skip to content

dont send input to imgui when cursor disabled #106

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
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

dont send input to imgui when cursor disabled #106

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef9aa8b
dont send input to imgui when cursor disabled
GameParrot Dec 25, 2024
a91073a
fix keystrokes
GameParrot Dec 25, 2024
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
10 changes: 5 additions & 5 deletions src/window_callbacks.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ void WindowCallbacks::onMouseButton(double x, double y, int btn, MouseButtonActi
window.stopTextInput();
}
}
if(io.WantCaptureMouse) {
if(io.WantCaptureMouse && !window.getCursorDisabled()) {
return;
}
}
Expand All @@ -158,7 +158,7 @@ void WindowCallbacks::onMouseButton(double x, double y, int btn, MouseButtonActi
void WindowCallbacks::onMousePosition(double x, double y) {
if(hasInputMode(InputMode::Mouse)) {
#ifdef USE_IMGUI
if(ImGui::GetCurrentContext()) {
if(ImGui::GetCurrentContext() && !window.getCursorDisabled()) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This now feels very inconsistent with the other mouse event handling

ImGuiIO& io = ImGui::GetIO();
io.AddMouseSourceEvent(ImGuiMouseSource_Mouse);
io.AddMousePosEvent(x, y);
Expand All @@ -184,7 +184,7 @@ void WindowCallbacks::onMouseRelativePosition(double x, double y) {
void WindowCallbacks::onMouseScroll(double x, double y, double dx, double dy) {
if(hasInputMode(InputMode::Mouse)) {
#ifdef USE_IMGUI
if(ImGui::GetCurrentContext()) {
if(ImGui::GetCurrentContext() && !window.getCursorDisabled()) {
ImGuiIO& io = ImGui::GetIO();
io.AddMouseSourceEvent(ImGuiMouseSource_Mouse);
io.AddMouseWheelEvent(dx, dy);
Expand Down Expand Up @@ -415,7 +415,7 @@ void WindowCallbacks::onKeyboard(KeyCode key, KeyAction action) {
window.stopTextInput();
}
}
if(io.WantCaptureKeyboard || io.WantTextInput) {
if((io.WantCaptureKeyboard || io.WantTextInput) && !window.getCursorDisabled()) {
return;
}
}
Expand Down Expand Up @@ -525,7 +525,7 @@ void WindowCallbacks::onKeyboard(KeyCode key, KeyAction action) {
}
void WindowCallbacks::onKeyboardText(std::string const& c) {
#ifdef USE_IMGUI
if(ImGui::GetCurrentContext()) {
if(ImGui::GetCurrentContext() && !window.getCursorDisabled()) {
ImGuiIO& io = ImGui::GetIO();
io.AddInputCharactersUTF8(c.data());
if(io.WantCaptureKeyboard) {
Expand Down
Loading