Skip to content
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

Move the subscription to LocationChanged and Deactivated Window events to OnLoaded. #62

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Move the subscription to LocationChanged and Deactivated Window events to OnLoaded. #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee4bb73
Move the subscription to LocationChanged and Deactivated Window event…
KristinaKoeva Jun 13, 2013
612ff0f
Store the parent window reference, so that we could unsubscribe from …
KristinaKoeva Jun 18, 2013
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
42 changes: 17 additions & 25 deletions CefSharp.Wpf/WebView.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,31 +226,6 @@ namespace Wpf
type, mouseUp, e->ClickCount);
}

void WebView::OnVisualParentChanged(DependencyObject^ oldParent)
{
EventHandler^ _handler = gcnew EventHandler(this, &WebView::OnHidePopup);
Window^ window;

if (oldParent != nullptr)
{
window = Window::GetWindow(oldParent);
if (window != nullptr)
{
window->LocationChanged -= _handler;
window->Deactivated -= _handler;
}
}

window = Window::GetWindow(this);
if (window != nullptr)
{
window->LocationChanged += _handler;
window->Deactivated += _handler;
}

ContentControl::OnVisualParentChanged(oldParent);
}

Size WebView::ArrangeOverride(Size size)
{
CefRefPtr<CefBrowser> browser;
Expand Down Expand Up @@ -814,10 +789,27 @@ namespace Wpf
void WebView::OnLoaded(Object^ sender, RoutedEventArgs^ e)
{
AddSourceHook();

EventHandler^ _handler = gcnew EventHandler(this, &WebView::OnHidePopup);

currentWindow = Window::GetWindow(this);
if (currentWindow != nullptr)
{
currentWindow->LocationChanged += _handler;
currentWindow->Deactivated += _handler;
}
}

void WebView::OnUnloaded(Object^ sender, RoutedEventArgs^ e)
{
EventHandler^ _handler = gcnew EventHandler(this, &WebView::OnHidePopup);

if (currentWindow != nullptr)
{
currentWindow->LocationChanged -= _handler;
currentWindow->Deactivated -= _handler;
}

if (_source && _hook)
{
_source->RemoveHook(_hook);
Expand Down
2 changes: 1 addition & 1 deletion CefSharp.Wpf/WebView.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ namespace Wpf
BrowserCore^ _browserCore;
MCefRefPtr<ScriptCore> _scriptCore;

Window^ currentWindow;
Object^ _sync;
HwndSource^ _source;
Matrix^ _matrix;
Expand Down Expand Up @@ -90,7 +91,6 @@ namespace Wpf
void AddSourceHook();

protected:
virtual void OnVisualParentChanged(DependencyObject^ oldParent) override;
virtual Size ArrangeOverride(Size size) override;
virtual void OnGotFocus(RoutedEventArgs^ e) override;
virtual void OnLostFocus(RoutedEventArgs^ e) override;
Expand Down