fix: correctly enable and disable windows on Windows and Linux (#15184)
This commit is contained in:
parent
7cab7b6c7e
commit
51f3fb9bde
3 changed files with 54 additions and 17 deletions
|
@ -344,7 +344,7 @@ bool NativeWindowViews::IsFocused() {
|
||||||
void NativeWindowViews::Show() {
|
void NativeWindowViews::Show() {
|
||||||
if (is_modal() && NativeWindow::parent() &&
|
if (is_modal() && NativeWindow::parent() &&
|
||||||
!widget()->native_widget_private()->IsVisible())
|
!widget()->native_widget_private()->IsVisible())
|
||||||
NativeWindow::parent()->SetEnabled(false);
|
static_cast<NativeWindowViews*>(parent())->IncrementChildModals();
|
||||||
|
|
||||||
widget()->native_widget_private()->ShowWithWindowState(GetRestoredState());
|
widget()->native_widget_private()->ShowWithWindowState(GetRestoredState());
|
||||||
|
|
||||||
|
@ -369,7 +369,7 @@ void NativeWindowViews::ShowInactive() {
|
||||||
|
|
||||||
void NativeWindowViews::Hide() {
|
void NativeWindowViews::Hide() {
|
||||||
if (is_modal() && NativeWindow::parent())
|
if (is_modal() && NativeWindow::parent())
|
||||||
NativeWindow::parent()->SetEnabled(true);
|
static_cast<NativeWindowViews*>(parent())->DecrementChildModals();
|
||||||
|
|
||||||
widget()->Hide();
|
widget()->Hide();
|
||||||
|
|
||||||
|
@ -393,16 +393,34 @@ bool NativeWindowViews::IsEnabled() {
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void NativeWindowViews::IncrementChildModals() {
|
||||||
|
num_modal_children_++;
|
||||||
|
SetEnabledInternal(ShouldBeEnabled());
|
||||||
|
}
|
||||||
|
|
||||||
|
void NativeWindowViews::DecrementChildModals() {
|
||||||
|
if (num_modal_children_ > 0) {
|
||||||
|
num_modal_children_--;
|
||||||
|
}
|
||||||
|
SetEnabledInternal(ShouldBeEnabled());
|
||||||
|
}
|
||||||
|
|
||||||
void NativeWindowViews::SetEnabled(bool enable) {
|
void NativeWindowViews::SetEnabled(bool enable) {
|
||||||
// Handle multiple calls of SetEnabled correctly.
|
if (enable != is_enabled_) {
|
||||||
if (enable) {
|
is_enabled_ = enable;
|
||||||
--disable_count_;
|
SetEnabledInternal(ShouldBeEnabled());
|
||||||
if (disable_count_ != 0)
|
}
|
||||||
return;
|
}
|
||||||
} else {
|
|
||||||
++disable_count_;
|
bool NativeWindowViews::ShouldBeEnabled() {
|
||||||
if (disable_count_ != 1)
|
return is_enabled_ && (num_modal_children_ == 0);
|
||||||
return;
|
}
|
||||||
|
|
||||||
|
void NativeWindowViews::SetEnabledInternal(bool enable) {
|
||||||
|
if (enable && IsEnabled()) {
|
||||||
|
return;
|
||||||
|
} else if (!enable && !IsEnabled()) {
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(OS_WIN)
|
#if defined(OS_WIN)
|
||||||
|
@ -1161,10 +1179,10 @@ void NativeWindowViews::OnWidgetBoundsChanged(views::Widget* changed_widget,
|
||||||
}
|
}
|
||||||
|
|
||||||
void NativeWindowViews::DeleteDelegate() {
|
void NativeWindowViews::DeleteDelegate() {
|
||||||
if (is_modal() && NativeWindow::parent()) {
|
if (is_modal() && this->parent()) {
|
||||||
auto* parent = NativeWindow::parent();
|
auto* parent = this->parent();
|
||||||
// Enable parent window after current window gets closed.
|
// Enable parent window after current window gets closed.
|
||||||
parent->SetEnabled(true);
|
static_cast<NativeWindowViews*>(parent)->DecrementChildModals();
|
||||||
// Focus on parent window.
|
// Focus on parent window.
|
||||||
parent->Focus(true);
|
parent->Focus(true);
|
||||||
}
|
}
|
||||||
|
|
|
@ -134,6 +134,9 @@ class NativeWindowViews : public NativeWindow,
|
||||||
|
|
||||||
void UpdateDraggableRegions(std::unique_ptr<SkRegion> region);
|
void UpdateDraggableRegions(std::unique_ptr<SkRegion> region);
|
||||||
|
|
||||||
|
void IncrementChildModals();
|
||||||
|
void DecrementChildModals();
|
||||||
|
|
||||||
#if defined(OS_WIN)
|
#if defined(OS_WIN)
|
||||||
void SetIcon(HICON small_icon, HICON app_icon);
|
void SetIcon(HICON small_icon, HICON app_icon);
|
||||||
#elif defined(USE_X11)
|
#elif defined(USE_X11)
|
||||||
|
@ -190,6 +193,10 @@ class NativeWindowViews : public NativeWindow,
|
||||||
LPARAM l_param);
|
LPARAM l_param);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// Enable/disable:
|
||||||
|
bool ShouldBeEnabled();
|
||||||
|
void SetEnabledInternal(bool enabled);
|
||||||
|
|
||||||
// NativeWindow:
|
// NativeWindow:
|
||||||
void HandleKeyboardEvent(
|
void HandleKeyboardEvent(
|
||||||
content::WebContents*,
|
content::WebContents*,
|
||||||
|
@ -273,8 +280,11 @@ class NativeWindowViews : public NativeWindow,
|
||||||
// has to been explicitly provided.
|
// has to been explicitly provided.
|
||||||
std::unique_ptr<SkRegion> draggable_region_; // used in custom drag.
|
std::unique_ptr<SkRegion> draggable_region_; // used in custom drag.
|
||||||
|
|
||||||
// How many times the Disable has been called.
|
// Whether the window should be enabled based on user calls to SetEnabled()
|
||||||
int disable_count_ = 0;
|
bool is_enabled_ = true;
|
||||||
|
// How many modal children this window has;
|
||||||
|
// used to determine enabled state
|
||||||
|
unsigned int num_modal_children_ = 0;
|
||||||
|
|
||||||
bool use_content_size_ = false;
|
bool use_content_size_ = false;
|
||||||
bool movable_ = true;
|
bool movable_ = true;
|
||||||
|
|
|
@ -3014,7 +3014,7 @@ describe('BrowserWindow module', () => {
|
||||||
c.show()
|
c.show()
|
||||||
assert.strictEqual(w.isEnabled(), false)
|
assert.strictEqual(w.isEnabled(), false)
|
||||||
})
|
})
|
||||||
it('enables parent window when closed', (done) => {
|
it('re-enables an enabled parent window when closed', (done) => {
|
||||||
c.once('closed', () => {
|
c.once('closed', () => {
|
||||||
assert.strictEqual(w.isEnabled(), true)
|
assert.strictEqual(w.isEnabled(), true)
|
||||||
done()
|
done()
|
||||||
|
@ -3022,6 +3022,15 @@ describe('BrowserWindow module', () => {
|
||||||
c.show()
|
c.show()
|
||||||
c.close()
|
c.close()
|
||||||
})
|
})
|
||||||
|
it('does not re-enable a disabled parent window when closed', (done) => {
|
||||||
|
c.once('closed', () => {
|
||||||
|
assert.strictEqual(w.isEnabled(), false)
|
||||||
|
done()
|
||||||
|
})
|
||||||
|
w.setEnabled(false)
|
||||||
|
c.show()
|
||||||
|
c.close()
|
||||||
|
})
|
||||||
it('disables parent window recursively', () => {
|
it('disables parent window recursively', () => {
|
||||||
const c2 = new BrowserWindow({ show: false, parent: w, modal: true })
|
const c2 = new BrowserWindow({ show: false, parent: w, modal: true })
|
||||||
c.show()
|
c.show()
|
||||||
|
|
Loading…
Reference in a new issue