Skip to content
Permalink
Browse files

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

  • Loading branch information
xen2 committed May 21, 2019
2 parents 01c81ae + e024d32 commit e8eb8dd42c88e285f1d560b71c570352fd1e0414
@@ -17,13 +17,12 @@ public PipelineStateDescriptionWithHash(PipelineStateDescription state)

public bool Equals(PipelineStateDescriptionWithHash other)
{
return Hash == other.Hash && State.Equals(other.State);
return Hash == other.Hash && (State == null) == (other.State == null) && (State?.Equals(other.State) ?? true);
}

public override bool Equals(object obj)
{
if (ReferenceEquals(null, obj)) return false;
return obj is PipelineStateDescriptionWithHash && Equals((PipelineStateDescriptionWithHash)obj);
return obj is PipelineStateDescriptionWithHash other && Equals(other);
}

public override int GetHashCode()
@@ -370,7 +370,6 @@ public string Text
/// <summary>
/// Style of border. Currently can only be Sizable or FixedSingle.
/// </summary>
/// <remarks>On SDL, one cannot change the style after the window has been created.</remarks>
public FormBorderStyle FormBorderStyle
{
get
@@ -387,7 +386,7 @@ public FormBorderStyle FormBorderStyle
}
set
{
// FIXME: How to implement this since this is being called.
SDL.SDL_SetWindowResizable(SdlHandle, value == FormBorderStyle.Sizable ? SDL.SDL_bool.SDL_TRUE : SDL.SDL_bool.SDL_FALSE);
}
}

@@ -88,8 +88,8 @@ public override int GetHashCode()
{
unchecked
{
var result = ColliderA.GetHashCode();
result = (result * 397) ^ ColliderB.GetHashCode();
var result = ColliderA?.GetHashCode() ?? 0;
result = (result * 397) ^ (ColliderB?.GetHashCode() ?? 0);
return result;
}
}

0 comments on commit e8eb8dd

Please sign in to comment.
You can’t perform that action at this time.