这是indexloc提供的服务，不要输入任何密码
Skip to content

Update Flash.cs #6

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
Feb 28, 2015
Merged

Update Flash.cs #6

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
17 changes: 13 additions & 4 deletions Media/Flash.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ class Flash
private string _backgroundColor;
private string _backgroundTop;
private string _backgroundLeft;

private bool _disposed = false;

public Flash (RegionOptions options)
: base(options.width, options.height, options.top, options.left)
{
Expand Down Expand Up @@ -71,6 +72,10 @@ public Flash (RegionOptions options)

// Navigate to temp file
_webBrowser.Navigate(_tempHtml.Path);
Controls.Add(_webBrowser);

// Show the control
Show();
}

/// <summary>
Expand Down Expand Up @@ -101,9 +106,12 @@ private void GenerateHeadHtml()
/// <param name="e"></param>
void _webBrowser_DocumentCompleted(object sender, WebBrowserDocumentCompletedEventArgs e)
{
// We have navigated to the temporary file.
Show();
Controls.Add(_webBrowser);
base.StartTimer();

if (_disposed)
return;

_webBrowser.Visible = true;
}

/// <summary>
Expand All @@ -112,6 +120,7 @@ void _webBrowser_DocumentCompleted(object sender, WebBrowserDocumentCompletedEve
/// <param name="disposing"></param>
protected override void Dispose(bool disposing)
{
_disposed = true;
if (disposing)
{
// Remove the webbrowser control
Expand Down