Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

要素の位置補正を修正 #893

Merged
merged 1 commit into from
Jan 18, 2024
Merged

要素の位置補正を修正 #893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/Beutl.ProjectSystem/ProjectSystem/Element.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ TimeRange GetOldRange()
Element? beforeTmp = null;
Element? afterTmp = null;
Element? coverTmp = null;
var range = new TimeRange(start, end - start);
var range = TimeRange.FromRange(start, end);

foreach (Element? item in scene.Children.GetMarshal().Value)
{
Expand All @@ -345,7 +345,7 @@ TimeRange GetOldRange()
afterTmp = item;
}

if (range.Contains(item.Range))
if (range.Contains(item.Range) || range == item.Range)
{
coverTmp = item;
}
Expand Down Expand Up @@ -382,7 +382,7 @@ TimeRange GetOldRange()
afterTmp = item;
}

if (range.Contains(item.Range))
if (range.Contains(item.Range) || range == item.Range)
{
coverTmp = item;
}
Expand Down
41 changes: 25 additions & 16 deletions src/Beutl.ProjectSystem/ProjectSystem/Scene.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -570,10 +570,7 @@ private void Children_CollectionChanged(object? sender, NotifyCollectionChangedE

private int NearestLayerNumber(Element element)
{
if (Children.Any(i => !(i.ZIndex != element.ZIndex
|| i.Range.Intersects(element.Range)
|| i.Range.Contains(element.Range)
|| element.Range.Contains(i.Range))))
if (IsOverlapping(element.Range, element.ZIndex))
{
int layerMax = Children.Max(i => i.ZIndex);

Expand Down Expand Up @@ -665,19 +662,31 @@ private int NearestLayerNumber(Element element)
return (beforeTmp, afterTmp, coverTmp);
}

private (TimeRange Range, int ZIndex) GetCorrectPosition(Element element, ElementOverlapHandling handling)
private bool IsOverlapping(TimeRange timeRange, int zindex)
{
bool IsOverlapping(TimeRange timeRange, int zindex)
return Children.Any(i =>
{
return !Children.Any(i => !(i.ZIndex != zindex
|| i.Range.Intersects(timeRange)
|| i.Range.Contains(timeRange)
|| timeRange.Contains(i.Range)));
}
if (i.ZIndex == zindex)
{
if (i.Range == timeRange
|| i.Range.Intersects(timeRange)
|| i.Range.Contains(timeRange)
|| timeRange.Contains(i.Range))
{
return true;
}
}

return false;
});
}

private (TimeRange Range, int ZIndex) GetCorrectPosition(Element element, ElementOverlapHandling handling)
{
bool overlapping = IsOverlapping(element.Range, element.ZIndex);

if (!overlapping || handling.HasFlag(ElementOverlapHandling.Allow)) return (element.Range, element.ZIndex);
if (!overlapping || handling.HasFlag(ElementOverlapHandling.Allow))
return (element.Range, element.ZIndex);

if (handling == ElementOverlapHandling.ThrowException)
throw new InvalidOperationException("要素の位置が無効です");
Expand All @@ -701,15 +710,15 @@ bool IsOverlapping(TimeRange timeRange, int zindex)
foreach (TimeSpan cEnd in candidateEnd)
{
TimeRange range = TimeRange.FromRange(start, cEnd);
if (range.Duration > TimeSpan.Zero && IsOverlapping(range, element.ZIndex))
if (range.Duration > TimeSpan.Zero && !IsOverlapping(range, element.ZIndex))
{
return (range, element.ZIndex);
}

foreach (TimeSpan cStart in candidateStart)
{
range = TimeRange.FromRange(cStart, cEnd);
if (range.Duration > TimeSpan.Zero && IsOverlapping(range, element.ZIndex))
if (range.Duration > TimeSpan.Zero && !IsOverlapping(range, element.ZIndex))
{
return (range, element.ZIndex);
}
Expand All @@ -722,7 +731,7 @@ bool IsOverlapping(TimeRange timeRange, int zindex)
foreach (TimeSpan item in candidateEnd)
{
TimeRange range = TimeRange.FromRange(start, item);
if (range.Duration > TimeSpan.Zero && IsOverlapping(range, element.ZIndex))
if (range.Duration > TimeSpan.Zero && !IsOverlapping(range, element.ZIndex))
{
return (range, element.ZIndex);
}
Expand All @@ -734,7 +743,7 @@ bool IsOverlapping(TimeRange timeRange, int zindex)
foreach (TimeSpan item in candidateStart)
{
TimeRange range = TimeRange.FromRange(item, end);
if (range.Duration > TimeSpan.Zero && IsOverlapping(range, element.ZIndex))
if (range.Duration > TimeSpan.Zero && !IsOverlapping(range, element.ZIndex))
{
return (range, element.ZIndex);
}
Expand Down
Loading