Skip to content

Commit

Permalink
Bump cefglue (#5585)
Browse files Browse the repository at this point in the history
* Bump cefglue

* another bump

* Update build-test.yml

* Update to latest CEF natives and fix code to be compatible.

* Switch CEF CreateBrowserWindow to Alloy style

you will NOT open Chrome

* Update cefglue, again

---------

Co-authored-by: ike709 <ike709@github.com>
Co-authored-by: PJB3005 <pieterjan.briers+git@gmail.com>
  • Loading branch information
3 people authored Jan 8, 2025
1 parent dfc4894 commit 09c6a81
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<PackageVersion Include="OpenToolkit.Graphics" Version="4.0.0-pre9.1" />
<PackageVersion Include="Pidgin" Version="3.3.0" />
<PackageVersion Include="Robust.Natives" Version="0.1.1" />
<PackageVersion Include="Robust.Natives.Cef" Version="120.1.9" />
<PackageVersion Include="Robust.Natives.Cef" Version="131.3.5" />
<PackageVersion Include="Robust.Shared.AuthLib" Version="0.1.2" />
<PackageVersion Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.10" />
<PackageVersion Include="SQLitePCLRaw.provider.sqlite3" Version="2.1.10" />
Expand Down
2 changes: 2 additions & 0 deletions Robust.Client.WebView/Cef/BaseRobustCefClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ protected override bool OnFileDialog(
string title,
string defaultFilePath,
string[] acceptFilters,
string[] acceptExtensions,
string[] acceptDescriptions,
CefFileDialogCallback callback)
{
callback.Cancel();
Expand Down
2 changes: 2 additions & 0 deletions Robust.Client.WebView/Cef/RobustCefApp.cs
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ protected override void OnBeforeCommandLineProcessing(string processType, CefCom
//commandLine.AppendSwitch("--disable-gpu-compositing");
//commandLine.AppendSwitch("--in-process-gpu");

commandLine.AppendSwitch("--off-screen-rendering-enabled");

commandLine.AppendSwitch("disable-threaded-scrolling", "1");
commandLine.AppendSwitch("disable-features", "TouchpadAndWheelScrollLatching,AsyncWheelEvents");

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ public IWebViewWindow CreateBrowserWindow(BrowserWindowCreateParameters createPa
var info = CefWindowInfo.Create();
info.Bounds = new CefRectangle(0, 0, createParams.Width, createParams.Height);
info.SetAsPopup(mainHWnd, "ss14cef");
info.RuntimeStyle = CefRuntimeStyle.Alloy;

var impl = new WebViewWindowImpl(this);

Expand Down
7 changes: 5 additions & 2 deletions Robust.Client.WebView/Cef/WebViewManagerCef.Control.cs
Original file line number Diff line number Diff line change
Expand Up @@ -587,8 +587,11 @@ protected override void OnPaint(CefBrowser browser, CefPaintElementType type, Ce
}
}

protected override void OnAcceleratedPaint(CefBrowser browser, CefPaintElementType type,
CefRectangle[] dirtyRects, IntPtr sharedHandle)
protected override void OnAcceleratedPaint(
CefBrowser browser,
CefPaintElementType type,
CefRectangle[] dirtyRects,
in CefAcceleratedPaintInfo info)
{
// Unused, but we're forced to implement it so.. NOOP.
}
Expand Down
2 changes: 1 addition & 1 deletion cefglue
Submodule cefglue updated 259 files

0 comments on commit 09c6a81

Please sign in to comment.