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

Set resizable on Linux from InitWithOptions

Browse source
This commit is contained in:
Kevin Sawicki 2016-03-07 13:48:33 -08:00
parent 993b878925
commit 7de37859f0
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
atom/browser/native_window.cc
View file

@ -115,6 +115,12 @@ void NativeWindow::InitFromOptions(const mate::Dictionary& options) {
} else { } else {
SetSizeConstraints(size_constraints); SetSizeConstraints(size_constraints);
} }
#if defined(USE_X11)
bool resizable;
if (options.Get(options::kResizable, &resizable)) {
SetResizable(resizable);
}
#endif
#if defined(OS_WIN) || defined(USE_X11) #if defined(OS_WIN) || defined(USE_X11)
bool closable; bool closable;
if (options.Get(options::kClosable, &closable)) { if (options.Get(options::kClosable, &closable)) {

7
atom/browser/native_window_views.cc
View file

@ -120,7 +120,6 @@ NativeWindowViews::NativeWindowViews(
minimizable_(true) { minimizable_(true) {
options.Get(options::kTitle, &title_); options.Get(options::kTitle, &title_);
options.Get(options::kAutoHideMenuBar, &menu_bar_autohide_); options.Get(options::kAutoHideMenuBar, &menu_bar_autohide_);
options.Get(options::kResizable, &resizable_);
#if defined(OS_WIN) #if defined(OS_WIN)
// On Windows we rely on the CanResize() to indicate whether window can be // On Windows we rely on the CanResize() to indicate whether window can be
@ -218,12 +217,6 @@ NativeWindowViews::NativeWindowViews(
std::string window_type; std::string window_type;
if (options.Get(options::kType, &window_type)) if (options.Get(options::kType, &window_type))
SetWindowType(GetAcceleratedWidget(), window_type); SetWindowType(GetAcceleratedWidget(), window_type);
if (!resizable_) {
gfx::Size content_size = GetContentSize();
SetContentSizeConstraints(
extensions::SizeConstraints(content_size, content_size));
}
#endif #endif
// Add web view. // Add web view.