mirror/sbox-public
1
0
Fork 0
mirror of https://github.com/Facepunch/sbox-public.git synced 2025-12-23 22:48:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix DropDown control struggling with empty/null values

Browse Source
This commit is contained in:
Garry Newman
2025-12-17 12:02:52 +00:00
parent f22c6ee375
commit dc25e9f401
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
game/addons/base/code/UI/DropDown.cs
View File

@@ -42,11 +42,7 @@ namespace Sandbox.UI
get => _value;
set
{
if ( _valueHash == HashCode.Combine( value ) )
return;
if ( $"{_value}" == $"{value}" )
return;
if ( _valueHash == HashCode.Combine( value ) ) return;
_valueHash = HashCode.Combine( value );
_value = value;
@@ -79,11 +75,13 @@ namespace Sandbox.UI
if ( selected != null )
{
Value = $"{selected.Value}";
var v = $"{selected.Value}";
Value = v;
Icon = selected.Icon;
Text = selected.Title;
ValueChanged?.Invoke( Value.ToString() );
ValueChanged?.Invoke( v );
CreateEvent( "onchange" );
CreateValueEvent( "value", selected?.Value );
}
@@ -185,7 +183,15 @@ namespace Sandbox.UI
/// </summary>
protected virtual void Select( string value, bool triggerChange = true )
{
Select( Options.FirstOrDefault( x => string.Equals( x.Value.ToString(), value, StringComparison.OrdinalIgnoreCase ) ), triggerChange );
Select( Options.FirstOrDefault( x => IsOptionMatch( x, value ) ), triggerChange );
}
private bool IsOptionMatch( Option option, string value )
{
if ( option.Value == null || (option.Value is string stringValue && string.IsNullOrEmpty( value )) )
return string.IsNullOrEmpty( value );
return string.Equals( option.Value?.ToString(), value, StringComparison.OrdinalIgnoreCase );
}
protected override void OnParametersSet()

1
game/addons/base/code/UI/Dropdown.cs.scss
View File

@@ -2,6 +2,7 @@
{
gap: 2px;
flex-grow: 1;
cursor: pointer;
.button-right-column
{