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

Merge pull request #602 from soh1988/patch-minSize

Browse source 
Changing the Logical Or to Bitwise Or to change from Either to Either Or...
This commit is contained in:
Cheng Zhao 2014-08-23 19:17:54 +08:00
commit 2e7ef7ea44
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/native_window.cc
View file

@ -145,7 +145,7 @@ void NativeWindow::InitFromOptions(const mate::Dictionary& options) {
Center();
}
int min_height = 0, min_width = 0;
if (options.Get(switches::kMinHeight, &min_height) ||
if (options.Get(switches::kMinHeight, &min_height) |
options.Get(switches::kMinWidth, &min_width)) {
SetMinimumSize(gfx::Size(min_width, min_height));
}