Skip to content

Remove decoupling of render result appending #316

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

Merged
merged 1 commit into from
Dec 20, 2019
Merged

Remove decoupling of render result appending #316

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
116 changes: 57 additions & 59 deletions Source/AlphaTab.JavaScript/UI/BrowserUiFacade.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ private bool AreAllFontsLoaded()
}

public event Action CanRenderChanged;

private void OnFontLoaded(string family)
{
FontSizes.GenerateFontLookup(family);
Expand Down Expand Up @@ -417,6 +418,7 @@ public int[] ParseTracks(object tracksData)
{
return new int[0];
}

var tracks = new FastList<int>();

// decode string
Expand Down Expand Up @@ -548,74 +550,70 @@ private FastDictionary<string, object> GetDataAttributes()

public void BeginAppendRenderResults(RenderFinishedEventArgs renderResult)
{
Browser.Window.SetTimeout((Action)(() =>
var canvasElement = ((HtmlElementContainer)_api.CanvasElement).Element;

// null result indicates that the rendering finished
if (renderResult == null)
{
// so we remove elements that might be from a previous render session
while (canvasElement.ChildElementCount > _totalResultCount)
{
var canvasElement = ((HtmlElementContainer)_api.CanvasElement).Element;
canvasElement.RemoveChild(canvasElement.LastChild);
}

// null result indicates that the rendering finished
if (renderResult == null)
// directly show the elements in the viewport once we're done.
if (_api.Settings.Core.EnableLazyLoading)
{
ShowSvgsInViewPort();
}
}
// NOTE: here we try to replace existing children
else
{
var body = renderResult.RenderResult;
if (Platform.Platform.TypeOf(body) == "string")
{
Element placeholder;
if (_totalResultCount < canvasElement.ChildElementCount)
{
// so we remove elements that might be from a previous render session
while (canvasElement.ChildElementCount > _totalResultCount)
{
canvasElement.RemoveChild(canvasElement.LastChild);
}

// directly show the elements in the viewport once we're done.
if (_api.Settings.Core.EnableLazyLoading)
{
ShowSvgsInViewPort();
}
placeholder = (Element)canvasElement.ChildNodes.Item(_totalResultCount);
}
// NOTE: here we try to replace existing children
else
{
var body = renderResult.RenderResult;
if (Platform.Platform.TypeOf(body) == "string")
{
Element placeholder;
if (_totalResultCount < canvasElement.ChildElementCount)
{
placeholder = (Element)canvasElement.ChildNodes.Item(_totalResultCount);
}
else
{
placeholder = Browser.Document.CreateElement("div");
canvasElement.AppendChild(placeholder);
}
placeholder = Browser.Document.CreateElement("div");
canvasElement.AppendChild(placeholder);
}

placeholder.Style.Width = renderResult.Width + "px";
placeholder.Style.Height = renderResult.Height + "px";
placeholder.Style.Display = "inline-block";
placeholder.Style.Width = renderResult.Width + "px";
placeholder.Style.Height = renderResult.Height + "px";
placeholder.Style.Display = "inline-block";

if (IsElementInViewPort(placeholder) || !_api.Settings.Core.EnableLazyLoading)
{
var bodyHtml = (string)body;
placeholder.OuterHTML = bodyHtml;
}
else
{
placeholder.Member("svg", body);
placeholder.SetAttribute("data-lazy", "true");
}
}
else
{
if (_totalResultCount < canvasElement.ChildElementCount)
{
canvasElement.ReplaceChild(renderResult.RenderResult.As<Node>(),
canvasElement.ChildNodes.Item(_totalResultCount));
}
else
{
canvasElement.AppendChild(renderResult.RenderResult.As<Node>());
}
}

_totalResultCount++;
if (IsElementInViewPort(placeholder) || !_api.Settings.Core.EnableLazyLoading)
{
var bodyHtml = (string)body;
placeholder.OuterHTML = bodyHtml;
}
else
{
placeholder.Member("svg", body);
placeholder.SetAttribute("data-lazy", "true");
}
}
else
{
if (_totalResultCount < canvasElement.ChildElementCount)
{
canvasElement.ReplaceChild(renderResult.RenderResult.As<Node>(),
canvasElement.ChildNodes.Item(_totalResultCount));
}
}),
1);
else
{
canvasElement.AppendChild(renderResult.RenderResult.As<Node>());
}
}

_totalResultCount++;
}
}

/// <summary>
Expand Down