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

fix: NativeWindow.window_id() returns same value for all windows (#46562)

Browse source 
fix: NativeWindow.window_id() returns same value for all windows
This commit is contained in:
Charles Kerr 2025-04-09 10:45:06 -05:00 • committed by GitHub
parent c1c74b0a6c
commit c6e6a03a24
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
shell/browser/native_window.cc
View file

@ -94,8 +94,6 @@ gfx::Size GetExpandedWindowSize(const NativeWindow* window, gfx::Size size) {
NativeWindow::NativeWindow(const gin_helper::Dictionary& options, NativeWindow::NativeWindow(const gin_helper::Dictionary& options,
NativeWindow* parent) NativeWindow* parent)
: widget_(std::make_unique<views::Widget>()), parent_(parent) { : widget_(std::make_unique<views::Widget>()), parent_(parent) {
++next_id_;
options.Get(options::kFrame, &has_frame_); options.Get(options::kFrame, &has_frame_);
options.Get(options::kTransparent, &transparent_); options.Get(options::kTransparent, &transparent_);
options.Get(options::kEnableLargerThanScreen, &enable_larger_than_screen_); options.Get(options::kEnableLargerThanScreen, &enable_larger_than_screen_);
@ -820,9 +818,6 @@ void NativeWindow::HandlePendingFullscreenTransitions() {
SetFullScreen(next_transition); SetFullScreen(next_transition);
} }
// static
int32_t NativeWindow::next_id_ = 0;
bool NativeWindow::IsTranslucent() const { bool NativeWindow::IsTranslucent() const {
// Transparent windows are translucent // Transparent windows are translucent
if (transparent()) { if (transparent()) {

5
shell/browser/native_window.h
View file

@ -409,7 +409,7 @@ class NativeWindow : public base::SupportsUserData,
NativeWindow* parent() const { return parent_; } NativeWindow* parent() const { return parent_; }
bool is_modal() const { return is_modal_; } bool is_modal() const { return is_modal_; }
int32_t window_id() const { return next_id_; } int32_t window_id() const { return window_id_; }
void add_child_window(NativeWindow* child) { void add_child_window(NativeWindow* child) {
child_windows_.push_back(child); child_windows_.push_back(child);
@ -472,7 +472,8 @@ class NativeWindow : public base::SupportsUserData,
private: private:
std::unique_ptr<views::Widget> widget_; std::unique_ptr<views::Widget> widget_;
static int32_t next_id_; static inline int32_t next_id_ = 0;
const int32_t window_id_ = ++next_id_;
// The content view, weak ref. // The content view, weak ref.
raw_ptr<views::View> content_view_ = nullptr; raw_ptr<views::View> content_view_ = nullptr;