fix: call SetCanActivate in setFocusable (#21854)

Co-authored-by: Cheng Zhao <zcbenz@github.com>
This commit is contained in:
trop[bot]
2020-01-22 14:45:27 +09:00
committed by Cheng Zhao
parent 71a31d553f
commit a6121f527c
2 changed files with 12 additions and 0 deletions

View File

@@ -976,6 +976,7 @@ void NativeWindowViews::SetContentProtection(bool enable) {
}
void NativeWindowViews::SetFocusable(bool focusable) {
widget()->widget_delegate()->SetCanActivate(focusable);
#if defined(OS_WIN)
LONG ex_style = ::GetWindowLong(GetAcceleratedWidget(), GWL_EXSTYLE);
if (focusable)

View File

@@ -697,6 +697,17 @@ describe('BrowserWindow module', () => {
await closeWindow(w2, { assertNotWindows: false })
})
})
describe('BrowserWindow.setFocusable()', () => {
it('can set unfocusable window to focusable', async () => {
const w2 = new BrowserWindow({ focusable: false })
const w2Focused = emittedOnce(w2, 'focus')
w2.setFocusable(true)
w2.focus()
await w2Focused
await closeWindow(w2, { assertNotWindows: false })
})
})
})
describe('sizing', () => {