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

Refactor to unify keyboard and controller input and focus.

Browse Source 
Native controller navigation support.

[CL 2345039 by Chris Gagnon in Main branch]
This commit is contained in:
Chris Gagnon
2014-10-30 12:29:36 -04:00
committed by UnrealBot
parent bcfc2607d1
commit 0e6d657c3d
268 changed files with 2981 additions and 1823 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Engine/Source/Developer/OutputLog/Private/SDebugConsole.cpp
View File

@@ -103,7 +103,7 @@ SDebugConsole::SDebugConsole()
void SDebugConsole::SetFocusToEditableText()
{
FSlateApplication::Get().SetKeyboardFocus( EditableTextBox.ToSharedRef(), EKeyboardFocusCause::SetDirectly );
FSlateApplication::Get().SetKeyboardFocus( EditableTextBox.ToSharedRef(), EFocusCause::SetDirectly );
}
EVisibility SDebugConsole::MakeVisibleIfLogIsShown() const

24
Engine/Source/Developer/OutputLog/Private/SOutputLog.cpp
View File

@@ -68,16 +68,16 @@ private:
);
}
virtual FReply OnKeyDown( const FGeometry& MyGeometry, const FKeyboardEvent& InKeyboardEvent )
virtual FReply OnKeyDown( const FGeometry& MyGeometry, const FKeyEvent& InKeyEvent )
{
// Special case handling. Intercept the tilde key. It is not suitable for typing in the console
if( InKeyboardEvent.GetKey() == EKeys::Tilde )
if( InKeyEvent.GetKey() == EKeys::Tilde )
{
return FReply::Unhandled();
}
else
{
return SEditableText::OnKeyDown( MyGeometry, InKeyboardEvent );
return SEditableText::OnKeyDown( MyGeometry, InKeyEvent );
}
}
@@ -200,7 +200,7 @@ void SConsoleInputBox::SuggestionSelectionChanged(TSharedPtr<FString> NewValue,
// Ideally this would set the focus back to the edit control
// FWidgetPath WidgetToFocusPath;
// FSlateApplication::Get().GeneratePathToWidgetUnchecked( InputText.ToSharedRef(), WidgetToFocusPath );
// FSlateApplication::Get().SetKeyboardFocus( WidgetToFocusPath, EKeyboardFocusCause::SetDirectly );
// FSlateApplication::Get().SetKeyboardFocus( WidgetToFocusPath, EFocusCause::SetDirectly );
break;
}
}
@@ -384,13 +384,13 @@ void SConsoleInputBox::OnTextCommitted( const FText& InText, ETextCommit::Type C
}
}
FReply SConsoleInputBox::OnKeyDown( const FGeometry& MyGeometry, const FKeyboardEvent& KeyboardEvent )
FReply SConsoleInputBox::OnKeyDown( const FGeometry& MyGeometry, const FKeyEvent& KeyEvent )
{
if(SuggestionBox->IsOpen())
{
if(KeyboardEvent.GetKey() == EKeys::Up || KeyboardEvent.GetKey() == EKeys::Down)
if(KeyEvent.GetKey() == EKeys::Up || KeyEvent.GetKey() == EKeys::Down)
{
if(KeyboardEvent.GetKey() == EKeys::Up)
if(KeyEvent.GetKey() == EKeys::Up)
{
if(SelectedSuggestion < 0)
{
@@ -404,7 +404,7 @@ FReply SConsoleInputBox::OnKeyDown( const FGeometry& MyGeometry, const FKeyboard
}
}
if(KeyboardEvent.GetKey() == EKeys::Down)
if(KeyEvent.GetKey() == EKeys::Down)
{
if(SelectedSuggestion < Suggestions.Num() - 1)
{
@@ -422,7 +422,7 @@ FReply SConsoleInputBox::OnKeyDown( const FGeometry& MyGeometry, const FKeyboard
return FReply::Handled();
}
else if (KeyboardEvent.GetKey() == EKeys::Tab)
else if (KeyEvent.GetKey() == EKeys::Tab)
{
if (Suggestions.Num())
{
@@ -443,7 +443,7 @@ FReply SConsoleInputBox::OnKeyDown( const FGeometry& MyGeometry, const FKeyboard
}
else
{
if(KeyboardEvent.GetKey() == EKeys::Up)
if(KeyEvent.GetKey() == EKeys::Up)
{
TArray<FString> History;
@@ -495,7 +495,7 @@ void SConsoleInputBox::SetSuggestions(TArray<FString>& Elements, bool bInHistory
// Force the textbox back into focus.
FWidgetPath WidgetToFocusPath;
FSlateApplication::Get().GeneratePathToWidgetUnchecked( InputText.ToSharedRef(), WidgetToFocusPath );
FSlateApplication::Get().SetKeyboardFocus( WidgetToFocusPath, EKeyboardFocusCause::SetDirectly );
FSlateApplication::Get().SetKeyboardFocus( WidgetToFocusPath, EFocusCause::SetDirectly );
}
else
{
@@ -503,7 +503,7 @@ void SConsoleInputBox::SetSuggestions(TArray<FString>& Elements, bool bInHistory
}
}
void SConsoleInputBox::OnKeyboardFocusLost( const FKeyboardFocusEvent& InKeyboardFocusEvent )
void SConsoleInputBox::OnFocusLost( const FFocusEvent& InFocusEvent )
{
// SuggestionBox->SetIsOpen(false);
}

4
Engine/Source/Developer/OutputLog/Private/SOutputLog.h
View File

@@ -67,9 +67,9 @@ protected:
virtual bool SupportsKeyboardFocus() const { return true; }
// e.g. Tab or Key_Up
virtual FReply OnKeyDown( const FGeometry& MyGeometry, const FKeyboardEvent& KeyboardEvent );
virtual FReply OnKeyDown( const FGeometry& MyGeometry, const FKeyEvent& KeyEvent );
void OnKeyboardFocusLost( const FKeyboardFocusEvent& InKeyboardFocusEvent );
void OnFocusLost( const FFocusEvent& InFocusEvent );
/** Handles entering in a command */
void OnTextCommitted(const FText& InText, ETextCommit::Type CommitInfo);

2
Engine/Source/Developer/OutputLog/Public/OutputLogModule.h
View File

@@ -19,7 +19,7 @@ namespace EDebugConsoleStyle
struct FDebugConsoleDelegates
{
FSimpleDelegate OnKeyboardFocusLost;
FSimpleDelegate OnFocusLost;
FSimpleDelegate OnConsoleCommandExecuted;
};