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

fix: fixed white flash on call to BrowserWindow.show (#48558)

Browse source 
Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Cezary Kulakowski <cezary@openfin.co>
This commit is contained in:
trop[bot] 2025-10-16 14:49:09 +02:00 • committed by GitHub
commit 5a1d521a1d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
shell/browser/api/electron_api_base_window.h
View file

@ -104,8 +104,8 @@ class BaseWindow : public gin_helper::TrackableObject<BaseWindow>,
virtual void Focus();
virtual void Blur();
bool IsFocused() const;
void Show();
void ShowInactive();
virtual void Show();
virtual void ShowInactive();
void Hide();
bool IsVisible() const;
bool IsEnabled() const;

14
shell/browser/api/electron_api_browser_window.cc
View file

@ -280,7 +280,6 @@ v8::Local<v8::Value> BrowserWindow::GetWebContents(v8::Isolate* isolate) {
}
void BrowserWindow::OnWindowShow() {
web_contents()->WasShown();
BaseWindow::OnWindowShow();
}
@ -289,6 +288,19 @@ void BrowserWindow::OnWindowHide() {
BaseWindow::OnWindowHide();
}
void BrowserWindow::Show() {
web_contents()->WasShown();
BaseWindow::Show();
}
void BrowserWindow::ShowInactive() {
// This method doesn't make sense for modal window.
if (IsModal())
return;
web_contents()->WasShown();
BaseWindow::ShowInactive();
}
// static
gin_helper::WrappableBase* BrowserWindow::New(gin_helper::ErrorThrower thrower,
gin::Arguments* args) {

2
shell/browser/api/electron_api_browser_window.h
View file

@ -67,6 +67,8 @@ class BrowserWindow : public BaseWindow,
void SetBackgroundMaterial(const std::string& material) override;
void OnWindowShow() override;
void OnWindowHide() override;
void Show() override;
void ShowInactive() override;
// BrowserWindow APIs.
void FocusOnWebView();