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

Merge remote-tracking branch 'origin/master' into 1.11

Browse Source 
# Conflicts:
#	Source/Engine/Level/Actors/Sky.cpp
This commit is contained in:
Wojtek Figat
2025-10-03 22:37:32 +02:00
parent 93219793d5 8f3b80492e
commit 823ed247d2
26 changed files with 152 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Engine/UI/GUI/Common/CheckBox.cs
View File

@@ -181,8 +181,8 @@ namespace FlaxEngine.GUI
ImageColor = style.BorderSelected * 1.2f;
BorderColor = style.BorderNormal;
BorderColorHighlighted = style.BorderSelected;
CheckedImage = new SpriteBrush(style.CheckBoxTick);
IntermediateImage = new SpriteBrush(style.CheckBoxIntermediate);
CheckedImage = style.CheckBoxTick.IsValid ? new SpriteBrush(style.CheckBoxTick) : new SolidColorBrush(style.Foreground);
IntermediateImage = style.CheckBoxIntermediate.IsValid ? new SpriteBrush(style.CheckBoxIntermediate) : new SolidColorBrush(style.ForegroundGrey);
CacheBox();
}