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

fix: DCHECK minimizing parent window with non-modal child (#38460)

Browse source
This commit is contained in:
Shelley Vohr 2023-05-31 11:57:44 +02:00 • committed by GitHub
parent 13f9e2db40
commit 40e724e5dd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 107 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

9
shell/browser/native_window.h
View file

@ -149,6 +149,9 @@ class NativeWindow : public base::SupportsUserData,
virtual std::string GetAlwaysOnTopLevel() = 0;
virtual void SetActive(bool is_key) = 0;
virtual bool IsActive() const = 0;
virtual void RemoveChildWindow(NativeWindow* child) = 0;
virtual void AttachChildren() = 0;
virtual void DetachChildren() = 0;
#endif
// Ability to augment the window title for the screen readers.
@ -382,6 +385,10 @@ class NativeWindow : public base::SupportsUserData,
int32_t window_id() const { return next_id_; }
void add_child_window(NativeWindow* child) {
child_windows_.push_back(child);
}
int NonClientHitTest(const gfx::Point& point);
void AddDraggableRegionProvider(DraggableRegionProvider* provider);
void RemoveDraggableRegionProvider(DraggableRegionProvider* provider);
@ -422,6 +429,8 @@ class NativeWindow : public base::SupportsUserData,
FullScreenTransitionType fullscreen_transition_type_ =
FullScreenTransitionType::kNone;
std::list<NativeWindow*> child_windows_;
private:
std::unique_ptr<views::Widget> widget_;