Skip to content

Commit

Permalink
Merge branch 'main' of github:b-editor/beutl
Browse files Browse the repository at this point in the history
  • Loading branch information
yuto-trd committed Aug 6, 2023
2 parents 67621ad + cae3e80 commit 32c3d5c
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 25 deletions.
12 changes: 0 additions & 12 deletions src/Beutl.Core/PropertyFlags.cs

This file was deleted.

13 changes: 0 additions & 13 deletions src/Beutl.Engine/Animation/KeyFrame.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,8 @@ public class KeyFrame : CoreObject
{
public static readonly CoreProperty<Easing> EasingProperty;
public static readonly CoreProperty<TimeSpan> KeyTimeProperty;
//public static readonly CoreProperty<TimeSpan> DurationProperty;
private Easing _easing;
private TimeSpan _keyTime;
//private TimeSpan _duration;

protected KeyFrame()
{
Expand All @@ -29,11 +27,6 @@ static KeyFrame()
KeyTimeProperty = ConfigureProperty<TimeSpan, KeyFrame>(nameof(KeyTime))
.Accessor(o => o.KeyTime, (o, v) => o.KeyTime = v)
.Register();

//DurationProperty = ConfigureProperty<TimeSpan, KeyFrame>(nameof(Duration))
// .Accessor(o => o.Duration, (o, v) => o.Duration = v)
// .PropertyFlags(PropertyFlags.NotifyChanged)
// .Register();
}

[NotAutoSerialized]
Expand All @@ -49,12 +42,6 @@ public TimeSpan KeyTime
set => SetAndRaise(KeyTimeProperty, ref _keyTime, value);
}

//public TimeSpan Duration
//{
// get => _duration;
// protected set => SetAndRaise(DurationProperty, ref _duration, value);
//}

internal virtual CoreProperty? Property { get; set; }

public override void WriteToJson(JsonObject json)
Expand Down

0 comments on commit 32c3d5c

Please sign in to comment.