poret/UnrealImGui
1
0
Fork 0
mirror of https://github.com/kevinporetti/UnrealImGui.git synced 2025-01-18 16:30:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed restoring of the user focus to game viewport in UE 4.20+

Browse Source
This commit is contained in:
Sebastian 2019-02-05 20:48:19 +00:00
parent dcbf229263
commit ffe532f6b3
2 changed files with 65 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
Source/ImGui/Private/SImGuiWidget.cpp
View File

@ -491,6 +491,65 @@ void SImGuiWidget::SetVisibilityFromInputEnabled()
ContextIndex, *GetVisibility().ToString()); ContextIndex, *GetVisibility().ToString());
} }
ULocalPlayer* SImGuiWidget::GetLocalPlayer() const
{
if (GameViewport.IsValid())
{
if (UWorld* World = GameViewport->GetWorld())
{
if (ULocalPlayer* LocalPlayer = World->GetFirstLocalPlayerFromController())
{
return World->GetFirstLocalPlayerFromController();
}
}
}
return nullptr;
}
void SImGuiWidget::TakeFocus()
{
auto& SlateApplication = FSlateApplication::Get();
PreviousUserFocusedWidget = SlateApplication.GetUserFocusedWidget(SlateApplication.GetUserIndexForKeyboard());
if (ULocalPlayer* LocalPlayer = GetLocalPlayer())
{
TSharedRef<SWidget> FocusWidget = SharedThis(this);
LocalPlayer->GetSlateOperations().CaptureMouse(FocusWidget);
LocalPlayer->GetSlateOperations().SetUserFocus(FocusWidget);
}
else
{
SlateApplication.SetKeyboardFocus(SharedThis(this));
}
}
void SImGuiWidget::ReturnFocus()
{
if (HasKeyboardFocus())
{
auto FocusWidgetPtr = PreviousUserFocusedWidget.IsValid()
? PreviousUserFocusedWidget.Pin()
: GameViewport->GetGameViewportWidget();
if (ULocalPlayer* LocalPlayer = GetLocalPlayer())
{
auto FocusWidgetRef = FocusWidgetPtr.ToSharedRef();
LocalPlayer->GetSlateOperations().CaptureMouse(FocusWidgetRef);
LocalPlayer->GetSlateOperations().SetUserFocus(FocusWidgetRef);
}
else
{
auto& SlateApplication = FSlateApplication::Get();
SlateApplication.ResetToDefaultPointerInputSettings();
SlateApplication.SetUserFocus(SlateApplication.GetUserIndexForKeyboard(), FocusWidgetPtr);
}
}
PreviousUserFocusedWidget.Reset();
}
void SImGuiWidget::UpdateInputEnabled() void SImGuiWidget::UpdateInputEnabled()
{ {
const bool bEnabled = ModuleManager && ModuleManager->GetProperties().IsInputEnabled(); const bool bEnabled = ModuleManager && ModuleManager->GetProperties().IsInputEnabled();
@ -505,16 +564,7 @@ void SImGuiWidget::UpdateInputEnabled()
if (!bInputEnabled) if (!bInputEnabled)
{ {
auto& Slate = FSlateApplication::Get(); ReturnFocus();
if (Slate.GetKeyboardFocusedWidget().Get() == this)
{
Slate.ResetToDefaultPointerInputSettings();
Slate.SetUserFocus(Slate.GetUserIndexForKeyboard(),
PreviousUserFocusedWidget.IsValid() ? PreviousUserFocusedWidget.Pin() : GameViewport->GetGameViewportWidget());
}
PreviousUserFocusedWidget.Reset();
UpdateInputMode(false, false); UpdateInputMode(false, false);
} }
} }
@ -526,9 +576,7 @@ void SImGuiWidget::UpdateInputEnabled()
const auto& ViewportWidget = GameViewport->GetGameViewportWidget(); const auto& ViewportWidget = GameViewport->GetGameViewportWidget();
if (ViewportWidget->HasKeyboardFocus() || ViewportWidget->HasFocusedDescendants()) if (ViewportWidget->HasKeyboardFocus() || ViewportWidget->HasFocusedDescendants())
{ {
auto& Slate = FSlateApplication::Get(); TakeFocus();
PreviousUserFocusedWidget = Slate.GetUserFocusedWidget(Slate.GetUserIndexForKeyboard());
Slate.SetKeyboardFocus(SharedThis(this));
} }
} }

4
Source/ImGui/Private/SImGuiWidget.h
View File

@ -113,6 +113,10 @@ private:
// Update visibility based on input enabled state. // Update visibility based on input enabled state.
void SetVisibilityFromInputEnabled(); void SetVisibilityFromInputEnabled();
ULocalPlayer* GetLocalPlayer() const;
void TakeFocus();
void ReturnFocus();
// Update input enabled state from console variable. // Update input enabled state from console variable.
void UpdateInputEnabled(); void UpdateInputEnabled();