github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

refactor: add gin_helper::Dictionary::ValueOrDefault() (#46939)

Browse Source 
* feat: add gin_helper::Dictionary::ValueOrDefault()

A convenience function for using a default value if the
specified key isn't present in the dictionary.

* refactor: use ValueOrDefault() in native_window.cc

* refactor: use ValueOrDefault() in native_window_mac.mm

* refactor: use ValueOrDefault() in native_window_views.cc

* refactor: use ValueOrDefault() in electron_api_native_image.cc
This commit is contained in:
Charles Kerr
2025-05-06 15:20:12 -05:00
committed by GitHub
parent e876cecbc7
commit b7ae162716
5 changed files with 48 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
shell/browser/native_window.cc
View File

@@ -168,17 +168,17 @@ void NativeWindow::InitFromOptions(const gin_helper::Dictionary& options) {
Center();
}
bool use_content_size = false;
options.Get(options::kUseContentSize, &use_content_size);
const bool use_content_size =
options.ValueOrDefault(options::kUseContentSize, false);
// On Linux and Window we may already have maximum size defined.
extensions::SizeConstraints size_constraints(
use_content_size ? GetContentSizeConstraints() : GetSizeConstraints());
int min_width = size_constraints.GetMinimumSize().width();
int min_height = size_constraints.GetMinimumSize().height();
options.Get(options::kMinWidth, &min_width);
options.Get(options::kMinHeight, &min_height);
const int min_width = options.ValueOrDefault(
options::kMinWidth, size_constraints.GetMinimumSize().width());
const int min_height = options.ValueOrDefault(
options::kMinHeight, size_constraints.GetMinimumSize().height());
size_constraints.set_minimum_size(gfx::Size(min_width, min_height));
gfx::Size max_size = size_constraints.GetMaximumSize();
@@ -278,9 +278,7 @@ void NativeWindow::InitFromOptions(const gin_helper::Dictionary& options) {
SetTitle(title);
// Then show it.
bool show = true;
options.Get(options::kShow, &show);
if (show)
if (options.ValueOrDefault(options::kShow, true))
Show();
}