Merge branch 'ThePhantomMask-Improve-HighlightedPopUpColor'
This commit is contained in:
@@ -106,6 +106,7 @@ namespace FlaxEditor.Windows
|
||||
"Chandler Cox",
|
||||
"Ari Vuollet",
|
||||
"Vincent Saarmann",
|
||||
"Michael Salvini",
|
||||
});
|
||||
authors.Sort();
|
||||
var authorsLabel = new Label(4, topParentControl.Bottom + 20, Width - 8, 70)
|
||||
|
||||
@@ -82,6 +82,11 @@ namespace FlaxEngine
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets the brightness of the color
|
||||
/// </summary>
|
||||
public float Brightness => R * 0.299f + G * 0.587f + B * 0.114f;
|
||||
|
||||
/// <summary>
|
||||
/// Returns the minimum color component value: Min(r,g,b).
|
||||
/// </summary>
|
||||
|
||||
@@ -595,7 +595,7 @@ namespace FlaxEngine.GUI
|
||||
Size = new Float2(size.X - margin, size.Y),
|
||||
Font = Font,
|
||||
TextColor = TextColor * 0.9f,
|
||||
TextColorHighlighted = TextColorHighlighted,
|
||||
TextColorHighlighted = TextColorHighlighted.Brightness < 0.05f ? Color.Lerp(TextColorHighlighted, Color.White, 0.3f) : TextColorHighlighted,
|
||||
HorizontalAlignment = HorizontalAlignment,
|
||||
VerticalAlignment = VerticalAlignment,
|
||||
Text = _items[i],
|
||||
|
||||
Reference in New Issue
Block a user