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

Merge remote-tracking branch 'origin/1.6' into 1.6

Browse Source
This commit is contained in:
Wojtek Figat
2023-03-13 10:26:13 +01:00
parent 2930b0ad67 c1dcc52a6a
commit af54b907d7
23 changed files with 157 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Editor/Options/OptionsModule.cs
View File

@@ -125,9 +125,12 @@ namespace FlaxEditor.Options
options.CustomSettings.Add(e.Key, JsonSerializer.Serialize(e.Value()));
}
float prevInterfaceScale = Options.Interface.InterfaceScale;
Options = options;
OnOptionsChanged();
Platform.CustomDpiScale = Options.Interface.InterfaceScale;
// Scale interface relative to the current value (eg. when using system-provided Dpi Scale)
Platform.CustomDpiScale *= Options.Interface.InterfaceScale / prevInterfaceScale;
}
else
{

2
Source/Editor/Windows/SplashScreen.cpp
View File

@@ -153,7 +153,7 @@ void SplashScreen::Show()
LOG(Info, "Showing splash screen");
// Create window
const float dpiScale = (float)Platform::GetDpi() / (float)DefaultDPI;
const float dpiScale = Platform::GetDpiScale();
CreateWindowSettings settings;
settings.Title = TEXT("Flax Editor");
settings.Size.X = 500 * dpiScale;