github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-29 17:28:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: remove pretarget handler before window destruction

Browse Source
This commit is contained in:
Jeremy Apthorp
2019-01-14 11:30:08 -08:00
parent 8122dd2c33
commit f115376595
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
atom/browser/native_window_views.cc
View File

@@ -1216,6 +1216,14 @@ void NativeWindowViews::OnWidgetBoundsChanged(views::Widget* changed_widget,
}
}
void NativeWindowViews::OnWidgetDestroying(views::Widget* widget) {
#if defined(OS_LINUX)
aura::Window* window = GetNativeWindow();
if (window)
window->RemovePreTargetHandler(this);
#endif
}
void NativeWindowViews::DeleteDelegate() {
if (is_modal() && this->parent()) {
auto* parent = this->parent();

1
atom/browser/native_window_views.h
View File

@@ -161,6 +161,7 @@ class NativeWindowViews : public NativeWindow,
void AutoresizeBrowserView(int width_delta,
int height_delta,
NativeBrowserView* browser_view);
void OnWidgetDestroying(views::Widget* widget) override;
// views::WidgetDelegate:
void DeleteDelegate() override;
views::View* GetInitiallyFocusedView() override;