mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

views: Fix crash when setSizeConstrains is called early

Browse source
This commit is contained in:
Cheng Zhao 2015-10-15 16:19:45 +08:00
parent f52c4af605
commit 6aec8b092c
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
atom/browser/native_window_views.cc
View file

@ -390,7 +390,10 @@ gfx::Size NativeWindowViews::GetContentSize() {
void NativeWindowViews::SetContentSizeConstraints( void NativeWindowViews::SetContentSizeConstraints(
const extensions::SizeConstraints& size_constraints) { const extensions::SizeConstraints& size_constraints) {
NativeWindow::SetContentSizeConstraints(size_constraints); NativeWindow::SetContentSizeConstraints(size_constraints);
window_->OnSizeConstraintsChanged(); // widget_delegate() is only available after Init() is called, we make use of
// this to determine whether native widget has initialized.
if (window_ && window_->widget_delegate())
window_->OnSizeConstraintsChanged();
#if defined(USE_X11) #if defined(USE_X11)
if (resizable_) if (resizable_)
old_size_constraints_ = size_constraints; old_size_constraints_ = size_constraints;