From d965bed944b467c31949a12a370e01e4fffcf865 Mon Sep 17 00:00:00 2001 From: Patrick Dawson Date: Wed, 25 Jan 2023 17:12:13 +0100 Subject: [PATCH] beta 15 --- .github/workflows/godot.yml | 2 +- Dear ImGui for Godot Demo.csproj | 2 +- README.md | 2 +- addons/imgui-godot/ImGuiGodot/Internal/Input.cs | 5 ++--- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/godot.yml b/.github/workflows/godot.yml index 484249c..9f08cfc 100644 --- a/.github/workflows/godot.yml +++ b/.github/workflows/godot.yml @@ -10,7 +10,7 @@ on: env: gdver: "4.0" - gdrel: beta11 + gdrel: beta15 jobs: export_game: diff --git a/Dear ImGui for Godot Demo.csproj b/Dear ImGui for Godot Demo.csproj index 0f3100b..707bd32 100644 --- a/Dear ImGui for Godot Demo.csproj +++ b/Dear ImGui for Godot Demo.csproj @@ -1,4 +1,4 @@ - + net6.0 true diff --git a/README.md b/README.md index f323d9e..63d3721 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Dear ImGui plugin for Godot 4 (C#) -![](https://img.shields.io/static/v1?label=Godot%204.0&message=beta11&color=blue&logo=godotengine) +![](https://img.shields.io/static/v1?label=Godot%204.0&message=beta15&color=blue&logo=godotengine) ![](https://github.com/pkdawson/imgui-godot/actions/workflows/dotnet.yml/badge.svg) ![](https://github.com/pkdawson/imgui-godot/actions/workflows/godot.yml/badge.svg) diff --git a/addons/imgui-godot/ImGuiGodot/Internal/Input.cs b/addons/imgui-godot/ImGuiGodot/Internal/Input.cs index 7fd1b25..5acc723 100644 --- a/addons/imgui-godot/ImGuiGodot/Internal/Input.cs +++ b/addons/imgui-godot/ImGuiGodot/Internal/Input.cs @@ -207,7 +207,7 @@ private static void UpdateKeyMods(ImGuiIOPtr io) io.AddKeyEvent(ImGuiKey.ModCtrl, Godot.Input.IsKeyPressed(Key.Ctrl)); io.AddKeyEvent(ImGuiKey.ModShift, Godot.Input.IsKeyPressed(Key.Shift)); io.AddKeyEvent(ImGuiKey.ModAlt, Godot.Input.IsKeyPressed(Key.Alt)); - io.AddKeyEvent(ImGuiKey.ModSuper, Godot.Input.IsKeyPressed(Key.SuperL)); + io.AddKeyEvent(ImGuiKey.ModSuper, Godot.Input.IsKeyPressed(Key.Meta)); } private static CursorShape ConvertCursorShape(ImGuiMouseCursor cur) => cur switch @@ -263,8 +263,7 @@ private static void UpdateKeyMods(ImGuiIOPtr io) Key.Ctrl => ImGuiKey.LeftCtrl, Key.Shift => ImGuiKey.LeftShift, Key.Alt => ImGuiKey.LeftAlt, - Key.SuperL => ImGuiKey.LeftSuper, - Key.SuperR => ImGuiKey.RightSuper, + Key.Meta => ImGuiKey.LeftSuper, Key.Menu => ImGuiKey.Menu, Key.Key0 => ImGuiKey._0, Key.Key1 => ImGuiKey._1,