github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-10 07:58:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: the parent window remained interactive after the modal window was opened (#48770)

Browse Source 
fix: fix the issue where the parent window remained interactive after the modal window was opened in somecases.
This commit is contained in:
BILL SHEN
2025-11-10 19:06:28 +08:00
committed by GitHub
parent 87d1ff59cb
commit 068ac3c405
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
shell/browser/native_window.cc
View File

@@ -104,7 +104,8 @@ NativeWindow::NativeWindow(const gin_helper::Dictionary& options,
transparent_{options.ValueOrDefault(options::kTransparent, false)},
enable_larger_than_screen_{
options.ValueOrDefault(options::kEnableLargerThanScreen, false)},
is_modal_{parent != nullptr && options.ValueOrDefault("modal", false)},
is_modal_{parent != nullptr &&
options.ValueOrDefault(options::kModal, false)},
has_frame_{options.ValueOrDefault(options::kFrame, true) &&
title_bar_style_ == TitleBarStyle::kNormal},
parent_{parent} {

2
shell/browser/native_window_views.cc
View File

@@ -553,7 +553,7 @@ bool NativeWindowViews::IsFocused() const {
}
void NativeWindowViews::Show() {
if (is_modal() && NativeWindow::parent() && !widget()->IsVisible())
if (is_modal() && NativeWindow::parent())
static_cast<NativeWindowViews*>(parent())->IncrementChildModals();
widget()->native_widget_private()->Show(GetRestoredState(), gfx::Rect());

2
shell/common/options_switches.h
View File

@@ -222,6 +222,8 @@ inline constexpr std::string_view kSpellcheck = "spellcheck";
inline constexpr std::string_view kEnableDeprecatedPaste =
"enableDeprecatedPaste";
inline constexpr std::string_view kModal = "modal";
} // namespace options
// Following are actually command line switches, should be moved to other files.