Changing the Logical Or to Bitwise Or to change from Either to Either Or Both values

This commit is contained in:
Chris Soh 2014-08-21 14:43:35 +08:00
parent 0b24883649
commit a0867fa7c5

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));
}