Skip to content

Commit 9f471f7

Browse files
authored
Merge branch 'master' into master
2 parents 6398b35 + f90271f commit 9f471f7

File tree

4 files changed

+25
-7
lines changed

4 files changed

+25
-7
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@ Delete this line and everything above, and then fill in the details below.
6969

7070
- **Does this problem also occur in the `CEF` Sample Application**
7171
- Download one of the following:
72-
- For x86 download https://cef-builds.spotifycdn.com/cef_binary_95.7.14%2Bg9f72f35%2Bchromium-95.0.4638.69_windows32_client.tar.bz2
73-
- For x64 download https://cef-builds.spotifycdn.com/cef_binary_95.7.14%2Bg9f72f35%2Bchromium-95.0.4638.69_windows64_client.tar.bz2
74-
- For arm64 download https://cef-builds.spotifycdn.com/cef_binary_95.7.14%2Bg9f72f35%2Bchromium-95.0.4638.69_windowsarm64_client.tar.bz2
72+
- For x86 download https://cef-builds.spotifycdn.com/cef_binary_96.0.18%2Bgfe551e4%2Bchromium-96.0.4664.110_windows32_client.tar.bz2
73+
- For x64 download https://cef-builds.spotifycdn.com/cef_binary_96.0.18%2Bgfe551e4%2Bchromium-96.0.4664.110_windows64_client.tar.bz2
74+
- For arm64 download https://cef-builds.spotifycdn.com/cef_binary_96.0.18%2Bgfe551e4%2Bchromium-96.0.4664.110_windowsarm64_client.tar.bz2
7575
- Extract and run cefclient.exe
7676
- If you are using WPF/OffScreen run
7777
```

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ The upstream [`CEF` forum](http://magpcss.org/ceforum/) is a valuable resource,
1919
It maybe helpful to run the `cefclient` application and compare output with `CefSharp`. The `WinForms` and `WPF` versions use two different rendering modes, `WPF` uses Offscreen Rendering (`OSR`). `OffScreen` also uses `OSR` mode.
2020

2121
- Download one of the following:
22-
- For x86 download https://cef-builds.spotifycdn.com/cef_binary_95.7.14%2Bg9f72f35%2Bchromium-95.0.4638.69_windows32_client.tar.bz2
23-
- For x64 download https://cef-builds.spotifycdn.com/cef_binary_95.7.14%2Bg9f72f35%2Bchromium-95.0.4638.69_windows64_client.tar.bz2
24-
- For arm64 download https://cef-builds.spotifycdn.com/cef_binary_95.7.14%2Bg9f72f35%2Bchromium-95.0.4638.69_windowsarm64_client.tar.bz2
22+
- For x86 download https://cef-builds.spotifycdn.com/cef_binary_96.0.18%2Bgfe551e4%2Bchromium-96.0.4664.110_windows32_client.tar.bz2
23+
- For x64 download https://cef-builds.spotifycdn.com/cef_binary_96.0.18%2Bgfe551e4%2Bchromium-96.0.4664.110_windows64_client.tar.bz2
24+
- For arm64 download https://cef-builds.spotifycdn.com/cef_binary_96.0.18%2Bgfe551e4%2Bchromium-96.0.4664.110_windowsarm64_client.tar.bz2
2525
- Extract and run cefclient.exe
2626
- If you are using WPF/OffScreen run
2727
```

CefSharp.WinForms/Host/ChromiumHostControl.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,8 @@ protected override void Dispose(bool disposing)
268268
{
269269
if (disposing)
270270
{
271+
var browserCore = BrowserCore;
272+
271273
AddressChanged = null;
272274
ConsoleMessage = null;
273275
FrameLoadEnd = null;
@@ -277,6 +279,12 @@ protected override void Dispose(bool disposing)
277279
StatusMessage = null;
278280
TitleChanged = null;
279281
BrowserCore = null;
282+
283+
if (browserCore?.IsDisposed == false)
284+
{
285+
//Close the underlying CEF Browser
286+
browserCore?.GetHost()?.CloseBrowser(true);
287+
}
280288
}
281289

282290
base.Dispose(disposing);

CefSharp.Wpf/ChromiumWebBrowser.cs

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2328,7 +2328,17 @@ private void OnMouseButton(MouseButtonEventArgs e)
23282328
}
23292329
else
23302330
{
2331-
browser.GetHost().SendMouseClickEvent((int)point.X, (int)point.Y, (MouseButtonType)e.ChangedButton, mouseUp, e.ClickCount, modifiers);
2331+
//Chromium only supports values of 1, 2 or 3.
2332+
//https://github.com/cefsharp/CefSharp/issues/3940
2333+
//Anything greater than 3 then we send click count of 1
2334+
var clickCount = e.ClickCount;
2335+
2336+
if(clickCount > 3)
2337+
{
2338+
clickCount = 1;
2339+
}
2340+
2341+
browser.GetHost().SendMouseClickEvent((int)point.X, (int)point.Y, (MouseButtonType)e.ChangedButton, mouseUp, clickCount, modifiers);
23322342
}
23332343

23342344
e.Handled = true;

0 commit comments

Comments
 (0)