tesses50
/
Ooui-tws-port
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make styles inherited by default

This commit is contained in:
Frank A. Krueger 2017-06-18 13:00:07 -07:00
parent 3f1b44d855
commit 3f30531d52
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Ooui/Style.cs
View File

@ -17,12 +17,17 @@ namespace Ooui
set => SetProperty ("background-color", value);
}
public Value BackgroundImage {
get => GetProperty ("background-image");
set => SetProperty ("background-image", value);
}
private Value GetProperty (string propertyName)
{
lock (properties) {
Value p;
if (!properties.TryGetValue (propertyName, out p)) {
p = new Value ();
p = "inherit";
properties[propertyName] = p;
}
return p;
@ -31,13 +36,14 @@ namespace Ooui
private void SetProperty (string propertyName, Value value)
{
var safeValue = value ?? "inherit";
lock (properties) {
Value old;
if (properties.TryGetValue (propertyName, out old)) {
if (EqualityComparer<Value>.Default.Equals (old, value))
if (EqualityComparer<Value>.Default.Equals (old, safeValue))
return;
}
properties[propertyName] = value;
properties[propertyName] = safeValue;
}
PropertyChanged?.Invoke (this, new PropertyChangedEventArgs (propertyName));
}

17
Tests/StyleTests.cs
View File

@ -8,6 +8,23 @@ namespace Tests
[TestClass]
public class StyleTests
{
[TestMethod]
public void DefaultIsInherit ()
{
var s = new Style ();
Assert.AreEqual ("inherit", s.BackgroundColor);
}
[TestMethod]
public void NullMakesInherit ()
{
var s = new Style ();
s.BackgroundColor = "red";
Assert.AreEqual ("red", s.BackgroundColor);
s.BackgroundColor = null;
Assert.AreEqual ("inherit", s.BackgroundColor);
}
[TestMethod]
public void ChangedWhen ()
{