Mark mouse button down/up as handled should resolve #1002

Move calculating of position and modifiers into the null check, those vars are only relevant when there is a browser host
cefsharp · Aug 8, 2016 · 05b4e05 · 05b4e05
1 parent eafbdd9
commit 05b4e05
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/CefSharp.Wpf/ChromiumWebBrowser.cs b/CefSharp.Wpf/ChromiumWebBrowser.cs
@@ -1867,13 +1867,15 @@ private void OnMouseButton(MouseButtonEventArgs e)
                 return;
             }
 
-            var modifiers = e.GetModifiers();
-            var mouseUp = (e.ButtonState == MouseButtonState.Released);
-            var point = e.GetPosition(this);
-
             if (browser != null)
             {
+                var modifiers = e.GetModifiers();
+                var mouseUp = (e.ButtonState == MouseButtonState.Released);
+                var point = e.GetPosition(this);
+
                 browser.GetHost().SendMouseClickEvent((int)point.X, (int)point.Y, (MouseButtonType)e.ChangedButton, mouseUp, e.ClickCount, modifiers);
+
+                e.Handled = true;
             }
         }