izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix for radial menu after PIE

Browse Source 
#rb Yannick.Lange

#jira UE-42885

[CL 3351499 by Lauren Ridge in Dev-VREditor branch]
This commit is contained in:
Lauren Ridge
2017-03-17 09:22:10 -04:00
parent 83d71085e2
commit fa8354faf5
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Engine/Source/Editor/VREditor/UI/VREditorUISystem.cpp
+7 -7
View File
@@ -288,7 +288,7 @@ void UVREditorUISystem::OnPreviewInputAction(FEditorViewportClient& ViewportClie
SwapRadialMenu();
if (!bRadialMenuVisibleAtSwap)
{
HideRadialMenu(VREditorInteractor);
HideRadialMenu();
}
bWasHandled = true;
}
@@ -376,7 +376,7 @@ void UVREditorUISystem::OnPreviewInputAction(FEditorViewportClient& ViewportClie
SwapRadialMenu();
if (!bRadialMenuVisibleAtSwap)
{
HideRadialMenu(VREditorInteractor);
HideRadialMenu();
}
}
}
@@ -744,7 +744,7 @@ void UVREditorUISystem::Tick( FEditorViewportClient* ViewportClient, const float
if (!bRadialMenuIsNumpad &&
FTimespan::FromSeconds(FPlatformTime::Seconds()) - CompareTime > FTimespan::FromSeconds(1.5f))
{
HideRadialMenu(UIInteractor);
HideRadialMenu();
}
// When dragging a panel with the UI interactor for a while, we want to close the radial menu.
@@ -753,7 +753,7 @@ void UVREditorUISystem::Tick( FEditorViewportClient* ViewportClient, const float
DragPanelFromOpenTime += DeltaTime;
if (DragPanelFromOpenTime >= 1.0 && UIInteractor != nullptr && DraggingUI != nullptr && InteractorDraggingUI != nullptr && UIInteractor == InteractorDraggingUI)
{
HideRadialMenu(InteractorDraggingUI, false);
HideRadialMenu(false);
}
}
@@ -1371,10 +1371,10 @@ void UVREditorUISystem::TryToSpawnRadialMenu( UVREditorInteractor* Interactor, c
}
void UVREditorUISystem::HideRadialMenu( UVREditorInteractor* Interactor, const bool bPlaySound /*= true*/ )
void UVREditorUISystem::HideRadialMenu( const bool bPlaySound /*= true */ )
{
// Only hide the radial menu if the passed interactor is actually the interactor with the radial menu
if( IsShowingRadialMenu( Interactor ) )
if( IsShowingRadialMenu( UIInteractor ) )
{
QuickRadialMenu->ShowUI( false, true, VREd::RadialMenuFadeDelay->GetFloat(), bPlaySound );
}
@@ -2676,7 +2676,7 @@ void UVREditorUISystem::HandleEditorModeChanged(FEdMode* Mode, bool IsEnabled)
void UVREditorUISystem::ResetAll()
{
RadialMenuHandler->Home();
HideRadialMenu(UIInteractor, false);
HideRadialMenu(false);
FVREditorActionCallbacks::DeselectAll();
Engine/Source/Editor/VREditor/UI/VREditorUISystem.h
+1 -1
View File
@@ -162,7 +162,7 @@ public:
void TryToSpawnRadialMenu( UVREditorInteractor* Interactor, const bool bForceRefresh, const bool bPlaySound = true );
/** Hides the radial menu if the specified hand is showing it */
void HideRadialMenu( UVREditorInteractor* Interactor, const bool bPlaySound = true );
void HideRadialMenu( const bool bPlaySound = true );
/** Start dragging a dock window on the hand */
void StartDraggingDockUI( class AVREditorDockableWindow* InitDraggingDockUI, UVREditorInteractor* Interactor, const float DockSelectDistance, const bool bPlaySound = true );