GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/1.1' into 1.2

Browse Source 
# Conflicts:
#	Source/Editor/Editor.Build.cs
This commit is contained in:
Wojtek Figat
2021-03-15 09:38:58 +01:00
parent 4072796e54 afea02d92f
commit c7c339957b
86 changed files with 4242 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Engine/Platform/Base/PlatformBase.h
View File

@@ -569,17 +569,17 @@ public:
API_PROPERTY() static BatteryInfo GetBatteryInfo();
/// <summary>
/// Gets the screen DPI setting.
/// Gets the primary monitor's DPI setting.
/// </summary>
API_PROPERTY() static int32 GetDpi();
/// <summary>
/// Gets the screen DPI setting scale factor (1 is default). Includes custom DPI scale.
/// Gets the primary monitor's DPI setting scale factor (1 is default). Includes custom DPI scale.
/// </summary>
API_PROPERTY() static float GetDpiScale();
/// <summary>
/// The custom screen DPI scale factor to apply globally. Can be used to adjust the User Interface scale (resolution).
/// The custom DPI scale factor to apply globally. Can be used to adjust the User Interface scale (resolution).
/// </summary>
API_FIELD() static float CustomDpiScale;