From e656c01bda0376d3dbc1b4761b0101dc3f68053d Mon Sep 17 00:00:00 2001 From: antopilo Date: Sun, 13 Apr 2025 20:14:00 -0400 Subject: [PATCH] Prevent gizmo shortcut when controlling camera --- .../Editor/Windows/SceneEditor/Widgets/ViewportWidget.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Editor/Source/Editor/Windows/SceneEditor/Widgets/ViewportWidget.cpp b/Editor/Source/Editor/Windows/SceneEditor/Widgets/ViewportWidget.cpp index fd13bffd..866f927b 100644 --- a/Editor/Source/Editor/Windows/SceneEditor/Widgets/ViewportWidget.cpp +++ b/Editor/Source/Editor/Windows/SceneEditor/Widgets/ViewportWidget.cpp @@ -428,7 +428,7 @@ void ViewportWidget::DrawOverlay() ImGui::PushStyleColor(ImGuiCol_Button, { color.r, color.g, color.b, 1.0f }); } - if (ImGui::Button(ICON_FA_ARROWS_ALT, ImVec2(30, 28)) || (ImGui::Shortcut(ImGuiKey_W, 0, ImGuiInputFlags_RouteGlobalLow) && !ImGui::IsAnyItemActive())) + if (ImGui::Button(ICON_FA_ARROWS_ALT, ImVec2(30, 28)) || (ImGui::Shortcut(ImGuiKey_W, 0, ImGuiInputFlags_RouteGlobalLow) && !ImGui::IsAnyItemActive() && !IsControllingCamera)) { CurrentOperation = ImGuizmo::OPERATION::TRANSLATE; } @@ -449,7 +449,7 @@ void ViewportWidget::DrawOverlay() ImGui::PushStyleColor(ImGuiCol_Button, { color.r, color.g, color.b, 1.0f }); } - if (ImGui::Button(ICON_FA_SYNC_ALT, ImVec2(30, 28)) || (ImGui::Shortcut(ImGuiKey_E, 0, ImGuiInputFlags_RouteGlobalLow) && !ImGui::IsAnyItemActive())) + if (ImGui::Button(ICON_FA_SYNC_ALT, ImVec2(30, 28)) || (ImGui::Shortcut(ImGuiKey_E, 0, ImGuiInputFlags_RouteGlobalLow) && !ImGui::IsAnyItemActive() && !IsControllingCamera)) { CurrentOperation = ImGuizmo::OPERATION::ROTATE; } @@ -470,7 +470,7 @@ void ViewportWidget::DrawOverlay() ImGui::PushStyleColor(ImGuiCol_Button, { color.r, color.g, color.b, 1.0f }); } - if (ImGui::Button(ICON_FA_EXPAND_ALT, ImVec2(30, 28)) || (ImGui::Shortcut(ImGuiKey_R, 0, ImGuiInputFlags_RouteGlobalLow) && !ImGui::IsAnyItemActive())) + if (ImGui::Button(ICON_FA_EXPAND_ALT, ImVec2(30, 28)) || (ImGui::Shortcut(ImGuiKey_R, 0, ImGuiInputFlags_RouteGlobalLow) && !ImGui::IsAnyItemActive() && !IsControllingCamera)) { CurrentOperation = ImGuizmo::OPERATION::SCALE; }