Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
  • Loading branch information
pkdawson committed Apr 20, 2024
1 parent 7a9a928 commit 931d1af
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ jobs:
DemoProj: Dear ImGui for Godot Demo.csproj

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup .NET
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: ${{ matrix.dotnet }}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/godot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup .NET
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x

Expand Down
6 changes: 6 additions & 0 deletions gdext/src/Input.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,8 @@ bool Input::ProcessInput(const Ref<InputEvent>& evt, Window* window)
case MOUSE_BUTTON_WHEEL_RIGHT:
impl->mouseWheel.x = mb->get_factor();
break;
case MOUSE_BUTTON_NONE:
break;
}
consumed = io.WantCaptureMouse;
}
Expand Down Expand Up @@ -288,6 +290,10 @@ bool Input::ProcessInput(const Ref<InputEvent>& evt, Window* window)
case JOY_AXIS_TRIGGER_RIGHT:
io.AddKeyAnalogEvent(ImGuiKey_GamepadR2, pressed, v);
break;
case JOY_AXIS_INVALID:
case JOY_AXIS_SDL_MAX:
case JOY_AXIS_MAX:
break;
};

consumed = true;
Expand Down

0 comments on commit 931d1af

Please sign in to comment.