Skip to content

Commit

Permalink
Merge pull request #7 from rocksdanister/dev
Browse files Browse the repository at this point in the history
cef v4.2 for lively v0.9.5.1
  • Loading branch information
rocksdanister committed Apr 16, 2020
2 parents 3dc0732 + 54ad004 commit ca3bd53
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 3 deletions.
6 changes: 4 additions & 2 deletions src/cefsharptest/Form1.cs
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,9 @@ class Options
public Form1()
{
InitializeComponent();
this.StartPosition = FormStartPosition.Manual;
this.Left = -99999;

mainForm = this;
ListenToParent(); //stdin listen pipe.

Expand Down Expand Up @@ -152,7 +155,6 @@ private void RunOptions(Options opts)

try
{
//todo: if absolute path, then ignore this procedure (otherwise folder conflict if same folder exists for different wp.)
if (File.Exists(Path.Combine(Directory.GetParent(htmlPath).ToString(), "LivelyProperties.json")) && linkType == LinkType.local)
{
//extract last digits of the Screen class DeviceName, eg: \\.\DISPLAY4 -> 4
Expand Down Expand Up @@ -448,7 +450,7 @@ private string ShadertoyURLtoEmbedLink(string shadertoylink)

string text = @"<!DOCTYPE html><html lang=""en"" dir=""ltr""> <head> <meta charset=""utf - 8"">
<title>Digital Brain</title> <style media=""screen""> iframe { position: fixed; width: 100%; height: 100%; top: 0; right: 0; bottom: 0;
left: 0; z-index; -1; } </style> </head> <body> <iframe width=""640"" height=""360"" frameborder=""0""
left: 0; z-index; -1; pointer-events: none; } </style> </head> <body> <iframe width=""640"" height=""360"" frameborder=""0""
src=" + shadertoylink + @"?gui=false&t=10&paused=false&muted=true""></iframe> </body></html>";
// WriteAllText creates a file, writes the specified string to the file,
// and then closes the file. You do NOT need to call Flush() or Close().
Expand Down
2 changes: 1 addition & 1 deletion src/cefsharptest/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("4.1.0.0")]
[assembly: AssemblyVersion("4.2.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
Binary file not shown.
Binary file not shown.

0 comments on commit ca3bd53

Please sign in to comment.