2016-12-08 08:52:44 -05:00
|
|
|
// Copyright 1998-2017 Epic Games, Inc. All Rights Reserved.
|
Copying //UE4/Portal-Staging to //UE4/Dev-Main (Source: //Portal/Main @ 3216504)
#lockdown Nick.Penwarden
#rb no one
==========================
MAJOR FEATURES + CHANGES
==========================
Change 3216141 on 2016/11/30 by Justin.Sargent
Completed first ready to use pass of the new AutomationDriver module and new Spec test type.
Change 3213288 on 2016/11/29 by Leigh.Swift
#jira OPP-6353: CEF FName Javascript PROBLEM
Removing deprecation of IWebBrowserSingleton::SetJSBindingToLoweringEnabled for now.
Change 3212796 on 2016/11/29 by Leigh.Swift
#jira OPP-6353: CEF FName Javascript PROBLEM
Added SetJSBindingToLoweringEnabled to IWebBrowserSingleton so that the to-lowering of binding names can be disabled.
Deprecated SetJSBindingToLoweringEnabled since 4.15. In future the to-lowering will always occurr.
Adding GetBindingName helper to FWebJSScripting, which returns a to-lowered name for a UField, unless disabled.
Updated all current binding code to use GetBindingName when building from UObjects/UStructs. This affects Windows, Mac, Linux, and Android.
Portal currently disables to-lowering unless a commandline -LowercaseJS is provided.
Change 3200370 on 2016/11/16 by Richard.Fawcett
Ensure we always get the latest version of the user content catalog when promoting marketplace items.
Change 3192974 on 2016/11/10 by Leigh.Swift
#jira OPP-6365: Crash during shutdown if a manifest is still being downloaded
This is because of the OnPreExit core delegate being used to null out the Data uobject member on a manifest, also being the only sensible way to ensure threads complete in a safe and clean manner.
Refactoring BuildPatchServices manifest class to not permanently hold any UObject and simply just use one while serialising.
This removes the reliance on the OnPreExit delegate from manifest class, making it generally safer behaviour for shutdown.
Change 3187028 on 2016/11/04 by Leigh.Swift
PortalPublishingTool: Adding UE_Main app to UnrealEngine project
Change 3186788 on 2016/11/04 by Richard.Fawcett
Change C# wrapper for BuildPatchTool patch generation to prevent clobbering manifest files by default, unless we specifically pass in an optional flag to allow this.
#jira OPP-6355
Change 3186779 on 2016/11/04 by Richard.Fawcett
Add support to automation tool testing framework for the following assertions:
Assert.AreNotEqual(a, b, optionalFailureMessage)
Assert.ThrowsError(actionToCarryOut, expectedExceptionType, optionalExceptionMessageContainsString)
Moved attribute-based expected exception declarations to their own attribute, TestThrowsExceptionAttribute, which can now accept an optional parameter for a string which should be contained within the exception message.
Fixed a bug where a test method with an attribute-based expected exception would not count towards the success total if the exception was encountered as expected.
Fixed a bug where NOT throwing an exception when we were expecting one would count as a success.
Added an internal property bDoNotLogTestFailsAsError which we can set to true to suppress logging of UAT errors when a test fails (but still count them in our failure results), to allow us to deliberately cause test failures to test the test framework!
Added a suite of unit tests for the test framework itself, in TestRunner.Automation.Tests.cs.
Change 3185411 on 2016/11/03 by Richard.Fawcett
Allow Rocket_PromoteBuild changelist to be overridden by a changelist read from a file.
Change 3184843 on 2016/11/03 by Richard.Fawcett
Ensure catalog file synced during user content generation is always the latest one.
Change 3184752 on 2016/11/03 by Richard.Fawcett
Ensure we log reading changelist from specified file.
Change 3184744 on 2016/11/03 by Richard.Fawcett
Ensure directory is created for Changelist file if it doesn't already exist.
Change 3184738 on 2016/11/03 by Richard.Fawcett
Ensure we use latest CL from all of Perforce when generating build versions for user content
Because of the nature of the build farm, where separate parts of the job are executed on different build agents at different times, this changelist is serialized to the filesystem during execution of a node dedicated to this task, and then made available to all future nodes, so that they're working with a consistent build version. In the case of an execution where we're updating Perforce with new content, this calculation of the changelist occurs AFTER we've updated Perforce with the new content.
Have also optimized the build graph scripts to enable Mac and Windows user generated content to execute simultaneously.
#jira OPP-6274
Change 3181456 on 2016/11/01 by Andrew.Brown
SExpandable area has been modified as the Portal settings mocks weren't able to be achieved with default functionality.
Added BodyBorderImage arguement and BodyBorderBackgroundColor attribute so we can specify a different brush/color to use for the expanded area compared with the title area. Additional care was made to ensure that rounded corners still appear correctly if the developer doesn't want to specify a different look to the body.
Added AreaTitlePadding attribute, to be able to specify padding between the expand/collapse icon and the header content.
Added MinWidth arguement, to ensure that the areas meet a minimum width requirement.
Change 3181285 on 2016/11/01 by Richard.Fawcett
Ensure user content generated using latest changelist submitted to Perforce, rather than using portal's latest changelist
#jira OPP-6274
Change 3177758 on 2016/10/28 by Leigh.Swift
#jira OPP-6247: Portal needs Social Plugin integration v1.2
Copying //Portal/Dev-Social to Dev-Main (//Portal/Dev-Main)
Change 3175889 on 2016/10/26 by Wes.Fudala
Web browser tooltips will no longer continue to appear when the mouse leaves the browser window.
#jira: OPP-5895 The Mouseover info in Recent Additions (Marketplace) anchors itself to the mouse pointer over other Browser windows
rb: Justin.Sargent
Change 3171388 on 2016/10/22 by Leigh.Swift
#jira OPP-6343: Launcher crashes patching from 2.12.13 Main to 2.12.13 Release-Live
BPS: FBuildPatchAppManifest needs to listen for FCoreDelegates::OnPreExit in order to clean up references to it's UObject which is about to be destroyed.
Change 3170373 on 2016/10/21 by Leigh.Swift
#jira: OPP-6340: Portal builds fail on audit nodes.
Reducing platform regex to only match pre-defined possibilities.
[CL 3219291 by Justin Sargent in Main branch]
2016-12-02 13:27:02 -05:00
|
|
|
|
|
|
|
|
#include "PassThroughMessageHandler.h"
|
2016-12-12 17:26:59 -05:00
|
|
|
#include "InputCoreTypes.h"
|
Copying //UE4/Portal-Staging to //UE4/Dev-Main (Source: //Portal/Main @ 3216504)
#lockdown Nick.Penwarden
#rb no one
==========================
MAJOR FEATURES + CHANGES
==========================
Change 3216141 on 2016/11/30 by Justin.Sargent
Completed first ready to use pass of the new AutomationDriver module and new Spec test type.
Change 3213288 on 2016/11/29 by Leigh.Swift
#jira OPP-6353: CEF FName Javascript PROBLEM
Removing deprecation of IWebBrowserSingleton::SetJSBindingToLoweringEnabled for now.
Change 3212796 on 2016/11/29 by Leigh.Swift
#jira OPP-6353: CEF FName Javascript PROBLEM
Added SetJSBindingToLoweringEnabled to IWebBrowserSingleton so that the to-lowering of binding names can be disabled.
Deprecated SetJSBindingToLoweringEnabled since 4.15. In future the to-lowering will always occurr.
Adding GetBindingName helper to FWebJSScripting, which returns a to-lowered name for a UField, unless disabled.
Updated all current binding code to use GetBindingName when building from UObjects/UStructs. This affects Windows, Mac, Linux, and Android.
Portal currently disables to-lowering unless a commandline -LowercaseJS is provided.
Change 3200370 on 2016/11/16 by Richard.Fawcett
Ensure we always get the latest version of the user content catalog when promoting marketplace items.
Change 3192974 on 2016/11/10 by Leigh.Swift
#jira OPP-6365: Crash during shutdown if a manifest is still being downloaded
This is because of the OnPreExit core delegate being used to null out the Data uobject member on a manifest, also being the only sensible way to ensure threads complete in a safe and clean manner.
Refactoring BuildPatchServices manifest class to not permanently hold any UObject and simply just use one while serialising.
This removes the reliance on the OnPreExit delegate from manifest class, making it generally safer behaviour for shutdown.
Change 3187028 on 2016/11/04 by Leigh.Swift
PortalPublishingTool: Adding UE_Main app to UnrealEngine project
Change 3186788 on 2016/11/04 by Richard.Fawcett
Change C# wrapper for BuildPatchTool patch generation to prevent clobbering manifest files by default, unless we specifically pass in an optional flag to allow this.
#jira OPP-6355
Change 3186779 on 2016/11/04 by Richard.Fawcett
Add support to automation tool testing framework for the following assertions:
Assert.AreNotEqual(a, b, optionalFailureMessage)
Assert.ThrowsError(actionToCarryOut, expectedExceptionType, optionalExceptionMessageContainsString)
Moved attribute-based expected exception declarations to their own attribute, TestThrowsExceptionAttribute, which can now accept an optional parameter for a string which should be contained within the exception message.
Fixed a bug where a test method with an attribute-based expected exception would not count towards the success total if the exception was encountered as expected.
Fixed a bug where NOT throwing an exception when we were expecting one would count as a success.
Added an internal property bDoNotLogTestFailsAsError which we can set to true to suppress logging of UAT errors when a test fails (but still count them in our failure results), to allow us to deliberately cause test failures to test the test framework!
Added a suite of unit tests for the test framework itself, in TestRunner.Automation.Tests.cs.
Change 3185411 on 2016/11/03 by Richard.Fawcett
Allow Rocket_PromoteBuild changelist to be overridden by a changelist read from a file.
Change 3184843 on 2016/11/03 by Richard.Fawcett
Ensure catalog file synced during user content generation is always the latest one.
Change 3184752 on 2016/11/03 by Richard.Fawcett
Ensure we log reading changelist from specified file.
Change 3184744 on 2016/11/03 by Richard.Fawcett
Ensure directory is created for Changelist file if it doesn't already exist.
Change 3184738 on 2016/11/03 by Richard.Fawcett
Ensure we use latest CL from all of Perforce when generating build versions for user content
Because of the nature of the build farm, where separate parts of the job are executed on different build agents at different times, this changelist is serialized to the filesystem during execution of a node dedicated to this task, and then made available to all future nodes, so that they're working with a consistent build version. In the case of an execution where we're updating Perforce with new content, this calculation of the changelist occurs AFTER we've updated Perforce with the new content.
Have also optimized the build graph scripts to enable Mac and Windows user generated content to execute simultaneously.
#jira OPP-6274
Change 3181456 on 2016/11/01 by Andrew.Brown
SExpandable area has been modified as the Portal settings mocks weren't able to be achieved with default functionality.
Added BodyBorderImage arguement and BodyBorderBackgroundColor attribute so we can specify a different brush/color to use for the expanded area compared with the title area. Additional care was made to ensure that rounded corners still appear correctly if the developer doesn't want to specify a different look to the body.
Added AreaTitlePadding attribute, to be able to specify padding between the expand/collapse icon and the header content.
Added MinWidth arguement, to ensure that the areas meet a minimum width requirement.
Change 3181285 on 2016/11/01 by Richard.Fawcett
Ensure user content generated using latest changelist submitted to Perforce, rather than using portal's latest changelist
#jira OPP-6274
Change 3177758 on 2016/10/28 by Leigh.Swift
#jira OPP-6247: Portal needs Social Plugin integration v1.2
Copying //Portal/Dev-Social to Dev-Main (//Portal/Dev-Main)
Change 3175889 on 2016/10/26 by Wes.Fudala
Web browser tooltips will no longer continue to appear when the mouse leaves the browser window.
#jira: OPP-5895 The Mouseover info in Recent Additions (Marketplace) anchors itself to the mouse pointer over other Browser windows
rb: Justin.Sargent
Change 3171388 on 2016/10/22 by Leigh.Swift
#jira OPP-6343: Launcher crashes patching from 2.12.13 Main to 2.12.13 Release-Live
BPS: FBuildPatchAppManifest needs to listen for FCoreDelegates::OnPreExit in order to clean up references to it's UObject which is about to be destroyed.
Change 3170373 on 2016/10/21 by Leigh.Swift
#jira: OPP-6340: Portal builds fail on audit nodes.
Reducing platform regex to only match pre-defined possibilities.
[CL 3219291 by Justin Sargent in Main branch]
2016-12-02 13:27:02 -05:00
|
|
|
|
|
|
|
|
class FPassThroughMessageHandlerFactory;
|
|
|
|
|
|
|
|
|
|
class FPassThroughMessageHandlerImpl
|
|
|
|
|
: public FPassThroughMessageHandler
|
|
|
|
|
{
|
|
|
|
|
public:
|
|
|
|
|
|
2016-12-05 10:31:40 -05:00
|
|
|
virtual ~FPassThroughMessageHandlerImpl()
|
|
|
|
|
{ }
|
|
|
|
|
|
Copying //UE4/Portal-Staging to //UE4/Dev-Main (Source: //Portal/Main @ 3216504)
#lockdown Nick.Penwarden
#rb no one
==========================
MAJOR FEATURES + CHANGES
==========================
Change 3216141 on 2016/11/30 by Justin.Sargent
Completed first ready to use pass of the new AutomationDriver module and new Spec test type.
Change 3213288 on 2016/11/29 by Leigh.Swift
#jira OPP-6353: CEF FName Javascript PROBLEM
Removing deprecation of IWebBrowserSingleton::SetJSBindingToLoweringEnabled for now.
Change 3212796 on 2016/11/29 by Leigh.Swift
#jira OPP-6353: CEF FName Javascript PROBLEM
Added SetJSBindingToLoweringEnabled to IWebBrowserSingleton so that the to-lowering of binding names can be disabled.
Deprecated SetJSBindingToLoweringEnabled since 4.15. In future the to-lowering will always occurr.
Adding GetBindingName helper to FWebJSScripting, which returns a to-lowered name for a UField, unless disabled.
Updated all current binding code to use GetBindingName when building from UObjects/UStructs. This affects Windows, Mac, Linux, and Android.
Portal currently disables to-lowering unless a commandline -LowercaseJS is provided.
Change 3200370 on 2016/11/16 by Richard.Fawcett
Ensure we always get the latest version of the user content catalog when promoting marketplace items.
Change 3192974 on 2016/11/10 by Leigh.Swift
#jira OPP-6365: Crash during shutdown if a manifest is still being downloaded
This is because of the OnPreExit core delegate being used to null out the Data uobject member on a manifest, also being the only sensible way to ensure threads complete in a safe and clean manner.
Refactoring BuildPatchServices manifest class to not permanently hold any UObject and simply just use one while serialising.
This removes the reliance on the OnPreExit delegate from manifest class, making it generally safer behaviour for shutdown.
Change 3187028 on 2016/11/04 by Leigh.Swift
PortalPublishingTool: Adding UE_Main app to UnrealEngine project
Change 3186788 on 2016/11/04 by Richard.Fawcett
Change C# wrapper for BuildPatchTool patch generation to prevent clobbering manifest files by default, unless we specifically pass in an optional flag to allow this.
#jira OPP-6355
Change 3186779 on 2016/11/04 by Richard.Fawcett
Add support to automation tool testing framework for the following assertions:
Assert.AreNotEqual(a, b, optionalFailureMessage)
Assert.ThrowsError(actionToCarryOut, expectedExceptionType, optionalExceptionMessageContainsString)
Moved attribute-based expected exception declarations to their own attribute, TestThrowsExceptionAttribute, which can now accept an optional parameter for a string which should be contained within the exception message.
Fixed a bug where a test method with an attribute-based expected exception would not count towards the success total if the exception was encountered as expected.
Fixed a bug where NOT throwing an exception when we were expecting one would count as a success.
Added an internal property bDoNotLogTestFailsAsError which we can set to true to suppress logging of UAT errors when a test fails (but still count them in our failure results), to allow us to deliberately cause test failures to test the test framework!
Added a suite of unit tests for the test framework itself, in TestRunner.Automation.Tests.cs.
Change 3185411 on 2016/11/03 by Richard.Fawcett
Allow Rocket_PromoteBuild changelist to be overridden by a changelist read from a file.
Change 3184843 on 2016/11/03 by Richard.Fawcett
Ensure catalog file synced during user content generation is always the latest one.
Change 3184752 on 2016/11/03 by Richard.Fawcett
Ensure we log reading changelist from specified file.
Change 3184744 on 2016/11/03 by Richard.Fawcett
Ensure directory is created for Changelist file if it doesn't already exist.
Change 3184738 on 2016/11/03 by Richard.Fawcett
Ensure we use latest CL from all of Perforce when generating build versions for user content
Because of the nature of the build farm, where separate parts of the job are executed on different build agents at different times, this changelist is serialized to the filesystem during execution of a node dedicated to this task, and then made available to all future nodes, so that they're working with a consistent build version. In the case of an execution where we're updating Perforce with new content, this calculation of the changelist occurs AFTER we've updated Perforce with the new content.
Have also optimized the build graph scripts to enable Mac and Windows user generated content to execute simultaneously.
#jira OPP-6274
Change 3181456 on 2016/11/01 by Andrew.Brown
SExpandable area has been modified as the Portal settings mocks weren't able to be achieved with default functionality.
Added BodyBorderImage arguement and BodyBorderBackgroundColor attribute so we can specify a different brush/color to use for the expanded area compared with the title area. Additional care was made to ensure that rounded corners still appear correctly if the developer doesn't want to specify a different look to the body.
Added AreaTitlePadding attribute, to be able to specify padding between the expand/collapse icon and the header content.
Added MinWidth arguement, to ensure that the areas meet a minimum width requirement.
Change 3181285 on 2016/11/01 by Richard.Fawcett
Ensure user content generated using latest changelist submitted to Perforce, rather than using portal's latest changelist
#jira OPP-6274
Change 3177758 on 2016/10/28 by Leigh.Swift
#jira OPP-6247: Portal needs Social Plugin integration v1.2
Copying //Portal/Dev-Social to Dev-Main (//Portal/Dev-Main)
Change 3175889 on 2016/10/26 by Wes.Fudala
Web browser tooltips will no longer continue to appear when the mouse leaves the browser window.
#jira: OPP-5895 The Mouseover info in Recent Additions (Marketplace) anchors itself to the mouse pointer over other Browser windows
rb: Justin.Sargent
Change 3171388 on 2016/10/22 by Leigh.Swift
#jira OPP-6343: Launcher crashes patching from 2.12.13 Main to 2.12.13 Release-Live
BPS: FBuildPatchAppManifest needs to listen for FCoreDelegates::OnPreExit in order to clean up references to it's UObject which is about to be destroyed.
Change 3170373 on 2016/10/21 by Leigh.Swift
#jira: OPP-6340: Portal builds fail on audit nodes.
Reducing platform regex to only match pre-defined possibilities.
[CL 3219291 by Justin Sargent in Main branch]
2016-12-02 13:27:02 -05:00
|
|
|
virtual bool IsHandlingMessages() const override
|
|
|
|
|
{
|
|
|
|
|
return bAllowMessageHandling;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
virtual void SetAllowMessageHandling(bool bValue) override
|
|
|
|
|
{
|
|
|
|
|
bAllowMessageHandling = bValue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public:
|
|
|
|
|
|
|
|
|
|
virtual bool ShouldProcessUserInputMessages(const TSharedPtr< FGenericWindow >& PlatformWindow) const override
|
|
|
|
|
{
|
|
|
|
|
return RealMessageHandler->ShouldProcessUserInputMessages(PlatformWindow);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
virtual bool OnKeyChar(const TCHAR Character, const bool IsRepeat) override
|
|
|
|
|
{
|
|
|
|
|
if (!bAllowMessageHandling)
|
|
|
|
|
{
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return RealMessageHandler->OnKeyChar(Character, IsRepeat);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
virtual bool OnKeyDown(const int32 KeyCode, const uint32 CharacterCode, const bool IsRepeat) override
|
|
|
|
|
{
|
|
|
|
|
if (!bAllowMessageHandling)
|
|
|
|
|
{
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return RealMessageHandler->OnKeyDown(KeyCode, CharacterCode, IsRepeat);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
virtual bool OnKeyUp(const int32 KeyCode, const uint32 CharacterCode, const bool IsRepeat) override
|
|
|
|
|
{
|
|
|
|
|
const FKey Key = FInputKeyManager::Get().GetKeyFromCodes(KeyCode, CharacterCode);
|
|
|
|
|
|
|
|
|
|
if (Key == EKeys::ScrollLock)
|
|
|
|
|
{
|
|
|
|
|
// Allow scroll lock to toggle whether platform input can be processed by the application
|
|
|
|
|
bAllowMessageHandling = !bAllowMessageHandling;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!bAllowMessageHandling)
|
|
|
|
|
{
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return RealMessageHandler->OnKeyUp(KeyCode, CharacterCode, IsRepeat);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
virtual bool OnMouseDown(const TSharedPtr< FGenericWindow >& Window, const EMouseButtons::Type Button) override
|
|
|
|
|
{
|
|
|
|
|
if (!bAllowMessageHandling)
|
|
|
|
|
{
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return RealMessageHandler->OnMouseDown(Window, Button);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
virtual bool OnMouseDown(const TSharedPtr< FGenericWindow >& Window, const EMouseButtons::Type Button, const FVector2D CursorPos)
|
|
|
|
|
{
|
|
|
|
|
if (!bAllowMessageHandling)
|
|
|
|
|
{
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return RealMessageHandler->OnMouseDown(Window, Button, CursorPos);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
virtual bool OnMouseUp(const EMouseButtons::Type Button) override
|
|
|
|
|
{
|
|
|
|
|
if (!bAllowMessageHandling)
|
|
|
|
|
{
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return RealMessageHandler->OnMouseUp(Button);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
virtual bool OnMouseUp(const EMouseButtons::Type Button, const FVector2D CursorPos)
|
|
|
|
|
{
|
|
|
|
|
if (!bAllowMessageHandling)
|
|
|
|
|
{
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return RealMessageHandler->OnMouseUp(Button, CursorPos);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
virtual bool OnMouseDoubleClick(const TSharedPtr< FGenericWindow >& Window, const EMouseButtons::Type Button) override
|
|
|
|
|
{
|
|
|
|
|
if (!bAllowMessageHandling)
|
|
|
|
|
{
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return RealMessageHandler->OnMouseDoubleClick(Window, Button);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
virtual bool OnMouseDoubleClick(const TSharedPtr< FGenericWindow >& Window, const EMouseButtons::Type Button, const FVector2D CursorPos)
|
|
|
|
|
{
|
|
|
|
|
if (!bAllowMessageHandling)
|
|
|
|
|
{
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return RealMessageHandler->OnMouseDoubleClick(Window, Button, CursorPos);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
virtual bool OnMouseWheel(const float Delta) override
|
|
|
|
|
{
|
|
|
|
|
if (!bAllowMessageHandling)
|
|
|
|
|
{
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return RealMessageHandler->OnMouseWheel(Delta);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
virtual bool OnMouseWheel(const float Delta, const FVector2D CursorPos)
|
|
|
|
|
{
|
|
|
|
|
if (!bAllowMessageHandling)
|
|
|
|
|
{
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return RealMessageHandler->OnMouseWheel(Delta, CursorPos);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
virtual bool OnMouseMove() override
|
|
|
|
|
{
|
|
|
|
|
if (!bAllowMessageHandling)
|
|
|
|
|
{
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return RealMessageHandler->OnMouseMove();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
virtual bool OnRawMouseMove(const int32 X, const int32 Y) override
|
|
|
|
|
{
|
|
|
|
|
if (!bAllowMessageHandling)
|
|
|
|
|
{
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return RealMessageHandler->OnRawMouseMove(X, Y);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
virtual bool OnCursorSet() override
|
|
|
|
|
{
|
|
|
|
|
if (!bAllowMessageHandling)
|
|
|
|
|
{
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return RealMessageHandler->OnCursorSet();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
virtual bool OnControllerAnalog(FGamepadKeyNames::Type KeyName, int32 ControllerId, float AnalogValue) override
|
|
|
|
|
{
|
|
|
|
|
if (!bAllowMessageHandling)
|
|
|
|
|
{
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return RealMessageHandler->OnControllerAnalog(KeyName, ControllerId, AnalogValue);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
virtual bool OnControllerButtonPressed(FGamepadKeyNames::Type KeyName, int32 ControllerId, bool IsRepeat) override
|
|
|
|
|
{
|
|
|
|
|
if (!bAllowMessageHandling)
|
|
|
|
|
{
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return RealMessageHandler->OnControllerButtonPressed(KeyName, ControllerId, IsRepeat);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
virtual bool OnControllerButtonReleased(FGamepadKeyNames::Type KeyName, int32 ControllerId, bool IsRepeat) override
|
|
|
|
|
{
|
|
|
|
|
if (!bAllowMessageHandling)
|
|
|
|
|
{
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return RealMessageHandler->OnControllerButtonReleased(KeyName, ControllerId, IsRepeat);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
virtual void OnBeginGesture() override
|
|
|
|
|
{
|
|
|
|
|
if (!bAllowMessageHandling)
|
|
|
|
|
{
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return RealMessageHandler->OnBeginGesture();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
virtual bool OnTouchGesture(EGestureEvent::Type GestureType, const FVector2D& Delta, float WheelDelta, bool bIsDirectionInvertedFromDevice) override
|
|
|
|
|
{
|
|
|
|
|
if (!bAllowMessageHandling)
|
|
|
|
|
{
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return RealMessageHandler->OnTouchGesture(GestureType, Delta, WheelDelta, bIsDirectionInvertedFromDevice);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
virtual void OnEndGesture() override
|
|
|
|
|
{
|
|
|
|
|
if (!bAllowMessageHandling)
|
|
|
|
|
{
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
RealMessageHandler->OnEndGesture();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
virtual bool OnTouchStarted(const TSharedPtr< FGenericWindow >& Window, const FVector2D& Location, int32 TouchIndex, int32 ControllerId) override
|
|
|
|
|
{
|
|
|
|
|
if (!bAllowMessageHandling)
|
|
|
|
|
{
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return RealMessageHandler->OnTouchStarted(Window, Location, TouchIndex, ControllerId);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
virtual bool OnTouchMoved(const FVector2D& Location, int32 TouchIndex, int32 ControllerId) override
|
|
|
|
|
{
|
|
|
|
|
if (!bAllowMessageHandling)
|
|
|
|
|
{
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return RealMessageHandler->OnTouchMoved(Location, TouchIndex, ControllerId);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
virtual bool OnTouchEnded(const FVector2D& Location, int32 TouchIndex, int32 ControllerId) override
|
|
|
|
|
{
|
|
|
|
|
if (!bAllowMessageHandling)
|
|
|
|
|
{
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return RealMessageHandler->OnTouchEnded(Location, TouchIndex, ControllerId);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
virtual bool OnMotionDetected(const FVector& Tilt, const FVector& RotationRate, const FVector& Gravity, const FVector& Acceleration, int32 ControllerId) override
|
|
|
|
|
{
|
|
|
|
|
if (!bAllowMessageHandling)
|
|
|
|
|
{
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return RealMessageHandler->OnMotionDetected(Tilt, RotationRate, Gravity, Acceleration, ControllerId);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
virtual bool OnSizeChanged(const TSharedRef< FGenericWindow >& Window, const int32 Width, const int32 Height, bool bWasMinimized = false) override
|
|
|
|
|
{
|
|
|
|
|
if (!bAllowMessageHandling)
|
|
|
|
|
{
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return RealMessageHandler->OnSizeChanged(Window, Width, Height, bWasMinimized);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
virtual void OnOSPaint(const TSharedRef<FGenericWindow>& Window) override
|
|
|
|
|
{
|
|
|
|
|
RealMessageHandler->OnOSPaint(Window);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
virtual FWindowSizeLimits GetSizeLimitsForWindow(const TSharedRef<FGenericWindow>& Window) const override
|
|
|
|
|
{
|
|
|
|
|
return RealMessageHandler->GetSizeLimitsForWindow(Window);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
virtual void OnResizingWindow(const TSharedRef<FGenericWindow>& Window) override
|
|
|
|
|
{
|
|
|
|
|
if (!bAllowMessageHandling)
|
|
|
|
|
{
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
RealMessageHandler->OnResizingWindow(Window);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
virtual bool BeginReshapingWindow(const TSharedRef< FGenericWindow >& Window) override
|
|
|
|
|
{
|
|
|
|
|
if (!bAllowMessageHandling)
|
|
|
|
|
{
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return RealMessageHandler->BeginReshapingWindow(Window);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
virtual void FinishedReshapingWindow(const TSharedRef< FGenericWindow >& Window) override
|
|
|
|
|
{
|
|
|
|
|
if (!bAllowMessageHandling)
|
|
|
|
|
{
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
RealMessageHandler->FinishedReshapingWindow(Window);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
virtual void OnMovedWindow(const TSharedRef< FGenericWindow >& Window, const int32 X, const int32 Y) override
|
|
|
|
|
{
|
|
|
|
|
if (!bAllowMessageHandling)
|
|
|
|
|
{
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
RealMessageHandler->OnMovedWindow(Window, X, Y);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
virtual bool OnWindowActivationChanged(const TSharedRef< FGenericWindow >& Window, const EWindowActivation::Type ActivationType) override
|
|
|
|
|
{
|
|
|
|
|
return RealMessageHandler->OnWindowActivationChanged(Window, ActivationType);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
virtual bool OnApplicationActivationChanged(const bool IsActive) override
|
|
|
|
|
{
|
|
|
|
|
return RealMessageHandler->OnApplicationActivationChanged(IsActive);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
virtual bool OnConvertibleLaptopModeChanged() override
|
|
|
|
|
{
|
|
|
|
|
if (!bAllowMessageHandling)
|
|
|
|
|
{
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return RealMessageHandler->OnConvertibleLaptopModeChanged();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
virtual EWindowZone::Type GetWindowZoneForPoint(const TSharedRef< FGenericWindow >& Window, const int32 X, const int32 Y) override
|
|
|
|
|
{
|
|
|
|
|
if (!bAllowMessageHandling)
|
|
|
|
|
{
|
|
|
|
|
return EWindowZone::NotInWindow;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return RealMessageHandler->GetWindowZoneForPoint(Window, X, Y);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
virtual void OnWindowClose(const TSharedRef< FGenericWindow >& Window) override
|
|
|
|
|
{
|
|
|
|
|
if (!bAllowMessageHandling)
|
|
|
|
|
{
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
RealMessageHandler->OnWindowClose(Window);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
virtual EDropEffect::Type OnDragEnterText(const TSharedRef< FGenericWindow >& Window, const FString& Text) override
|
|
|
|
|
{
|
|
|
|
|
if (!bAllowMessageHandling)
|
|
|
|
|
{
|
|
|
|
|
return EDropEffect::None;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return RealMessageHandler->OnDragEnterText(Window, Text);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
virtual EDropEffect::Type OnDragEnterFiles(const TSharedRef< FGenericWindow >& Window, const TArray< FString >& Files) override
|
|
|
|
|
{
|
|
|
|
|
if (!bAllowMessageHandling)
|
|
|
|
|
{
|
|
|
|
|
return EDropEffect::None;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return RealMessageHandler->OnDragEnterFiles(Window, Files);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
virtual EDropEffect::Type OnDragOver(const TSharedPtr< FGenericWindow >& Window) override
|
|
|
|
|
{
|
|
|
|
|
if (!bAllowMessageHandling)
|
|
|
|
|
{
|
|
|
|
|
return EDropEffect::None;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return RealMessageHandler->OnDragOver(Window);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
virtual void OnDragLeave(const TSharedPtr< FGenericWindow >& Window) override
|
|
|
|
|
{
|
|
|
|
|
if (!bAllowMessageHandling)
|
|
|
|
|
{
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
RealMessageHandler->OnDragLeave(Window);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
virtual EDropEffect::Type OnDragDrop(const TSharedPtr< FGenericWindow >& Window) override
|
|
|
|
|
{
|
|
|
|
|
if (!bAllowMessageHandling)
|
|
|
|
|
{
|
|
|
|
|
return EDropEffect::None;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return RealMessageHandler->OnDragDrop(Window);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
virtual bool OnWindowAction(const TSharedRef< FGenericWindow >& Window, const EWindowAction::Type InActionType) override
|
|
|
|
|
{
|
|
|
|
|
if (!bAllowMessageHandling)
|
|
|
|
|
{
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return RealMessageHandler->OnWindowAction(Window, InActionType);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private:
|
|
|
|
|
|
|
|
|
|
FPassThroughMessageHandlerImpl(
|
|
|
|
|
const TSharedRef<FGenericApplicationMessageHandler>& InMessageHandler)
|
|
|
|
|
: RealMessageHandler(InMessageHandler)
|
|
|
|
|
, bAllowMessageHandling(false)
|
|
|
|
|
{ }
|
|
|
|
|
|
|
|
|
|
private:
|
|
|
|
|
|
|
|
|
|
const TSharedRef<FGenericApplicationMessageHandler> RealMessageHandler;
|
|
|
|
|
|
|
|
|
|
bool bAllowMessageHandling;
|
|
|
|
|
|
|
|
|
|
friend FPassThroughMessageHandlerFactory;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
class FPassThroughMessageHandlerFactory
|
|
|
|
|
: public IPassThroughMessageHandlerFactory
|
|
|
|
|
{
|
|
|
|
|
public:
|
|
|
|
|
|
2016-12-05 10:31:40 -05:00
|
|
|
virtual ~FPassThroughMessageHandlerFactory()
|
|
|
|
|
{ }
|
|
|
|
|
|
Copying //UE4/Portal-Staging to //UE4/Dev-Main (Source: //Portal/Main @ 3216504)
#lockdown Nick.Penwarden
#rb no one
==========================
MAJOR FEATURES + CHANGES
==========================
Change 3216141 on 2016/11/30 by Justin.Sargent
Completed first ready to use pass of the new AutomationDriver module and new Spec test type.
Change 3213288 on 2016/11/29 by Leigh.Swift
#jira OPP-6353: CEF FName Javascript PROBLEM
Removing deprecation of IWebBrowserSingleton::SetJSBindingToLoweringEnabled for now.
Change 3212796 on 2016/11/29 by Leigh.Swift
#jira OPP-6353: CEF FName Javascript PROBLEM
Added SetJSBindingToLoweringEnabled to IWebBrowserSingleton so that the to-lowering of binding names can be disabled.
Deprecated SetJSBindingToLoweringEnabled since 4.15. In future the to-lowering will always occurr.
Adding GetBindingName helper to FWebJSScripting, which returns a to-lowered name for a UField, unless disabled.
Updated all current binding code to use GetBindingName when building from UObjects/UStructs. This affects Windows, Mac, Linux, and Android.
Portal currently disables to-lowering unless a commandline -LowercaseJS is provided.
Change 3200370 on 2016/11/16 by Richard.Fawcett
Ensure we always get the latest version of the user content catalog when promoting marketplace items.
Change 3192974 on 2016/11/10 by Leigh.Swift
#jira OPP-6365: Crash during shutdown if a manifest is still being downloaded
This is because of the OnPreExit core delegate being used to null out the Data uobject member on a manifest, also being the only sensible way to ensure threads complete in a safe and clean manner.
Refactoring BuildPatchServices manifest class to not permanently hold any UObject and simply just use one while serialising.
This removes the reliance on the OnPreExit delegate from manifest class, making it generally safer behaviour for shutdown.
Change 3187028 on 2016/11/04 by Leigh.Swift
PortalPublishingTool: Adding UE_Main app to UnrealEngine project
Change 3186788 on 2016/11/04 by Richard.Fawcett
Change C# wrapper for BuildPatchTool patch generation to prevent clobbering manifest files by default, unless we specifically pass in an optional flag to allow this.
#jira OPP-6355
Change 3186779 on 2016/11/04 by Richard.Fawcett
Add support to automation tool testing framework for the following assertions:
Assert.AreNotEqual(a, b, optionalFailureMessage)
Assert.ThrowsError(actionToCarryOut, expectedExceptionType, optionalExceptionMessageContainsString)
Moved attribute-based expected exception declarations to their own attribute, TestThrowsExceptionAttribute, which can now accept an optional parameter for a string which should be contained within the exception message.
Fixed a bug where a test method with an attribute-based expected exception would not count towards the success total if the exception was encountered as expected.
Fixed a bug where NOT throwing an exception when we were expecting one would count as a success.
Added an internal property bDoNotLogTestFailsAsError which we can set to true to suppress logging of UAT errors when a test fails (but still count them in our failure results), to allow us to deliberately cause test failures to test the test framework!
Added a suite of unit tests for the test framework itself, in TestRunner.Automation.Tests.cs.
Change 3185411 on 2016/11/03 by Richard.Fawcett
Allow Rocket_PromoteBuild changelist to be overridden by a changelist read from a file.
Change 3184843 on 2016/11/03 by Richard.Fawcett
Ensure catalog file synced during user content generation is always the latest one.
Change 3184752 on 2016/11/03 by Richard.Fawcett
Ensure we log reading changelist from specified file.
Change 3184744 on 2016/11/03 by Richard.Fawcett
Ensure directory is created for Changelist file if it doesn't already exist.
Change 3184738 on 2016/11/03 by Richard.Fawcett
Ensure we use latest CL from all of Perforce when generating build versions for user content
Because of the nature of the build farm, where separate parts of the job are executed on different build agents at different times, this changelist is serialized to the filesystem during execution of a node dedicated to this task, and then made available to all future nodes, so that they're working with a consistent build version. In the case of an execution where we're updating Perforce with new content, this calculation of the changelist occurs AFTER we've updated Perforce with the new content.
Have also optimized the build graph scripts to enable Mac and Windows user generated content to execute simultaneously.
#jira OPP-6274
Change 3181456 on 2016/11/01 by Andrew.Brown
SExpandable area has been modified as the Portal settings mocks weren't able to be achieved with default functionality.
Added BodyBorderImage arguement and BodyBorderBackgroundColor attribute so we can specify a different brush/color to use for the expanded area compared with the title area. Additional care was made to ensure that rounded corners still appear correctly if the developer doesn't want to specify a different look to the body.
Added AreaTitlePadding attribute, to be able to specify padding between the expand/collapse icon and the header content.
Added MinWidth arguement, to ensure that the areas meet a minimum width requirement.
Change 3181285 on 2016/11/01 by Richard.Fawcett
Ensure user content generated using latest changelist submitted to Perforce, rather than using portal's latest changelist
#jira OPP-6274
Change 3177758 on 2016/10/28 by Leigh.Swift
#jira OPP-6247: Portal needs Social Plugin integration v1.2
Copying //Portal/Dev-Social to Dev-Main (//Portal/Dev-Main)
Change 3175889 on 2016/10/26 by Wes.Fudala
Web browser tooltips will no longer continue to appear when the mouse leaves the browser window.
#jira: OPP-5895 The Mouseover info in Recent Additions (Marketplace) anchors itself to the mouse pointer over other Browser windows
rb: Justin.Sargent
Change 3171388 on 2016/10/22 by Leigh.Swift
#jira OPP-6343: Launcher crashes patching from 2.12.13 Main to 2.12.13 Release-Live
BPS: FBuildPatchAppManifest needs to listen for FCoreDelegates::OnPreExit in order to clean up references to it's UObject which is about to be destroyed.
Change 3170373 on 2016/10/21 by Leigh.Swift
#jira: OPP-6340: Portal builds fail on audit nodes.
Reducing platform regex to only match pre-defined possibilities.
[CL 3219291 by Justin Sargent in Main branch]
2016-12-02 13:27:02 -05:00
|
|
|
virtual TSharedRef<FPassThroughMessageHandler> Create(
|
|
|
|
|
const TSharedRef<FGenericApplicationMessageHandler>& MessageHandler) const override
|
|
|
|
|
{
|
|
|
|
|
return MakeShareable(new FPassThroughMessageHandlerImpl(MessageHandler));
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
TSharedRef<IPassThroughMessageHandlerFactory> FPassThroughMessageHandlerFactoryFactory::Create()
|
|
|
|
|
{
|
|
|
|
|
return MakeShareable(new FPassThroughMessageHandlerFactory());
|
|
|
|
|
}
|