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

fix: correctly emit BrowserWindow alwaysOnTop status in change event (#19463)

Browse source 
* fix: correctly emit alwaysOnTop in change event

* add a test for emitted alwaysOnTop value
This commit is contained in:
Shelley Vohr 2019-07-26 15:53:31 -07:00 committed by GitHub
parent 4d23b9e031
commit 504407c5df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
shell/browser/native_window_views.cc
View file

@ -756,9 +756,7 @@ void NativeWindowViews::SetAlwaysOnTop(ui::ZOrderLevel z_order,
const std::string& level, const std::string& level,
int relativeLevel, int relativeLevel,
std::string* error) { std::string* error) {
if (z_order != widget()->GetZOrderLevel()) bool level_changed = z_order != widget()->GetZOrderLevel();
NativeWindow::NotifyWindowAlwaysOnTopChanged();
widget()->SetZOrderLevel(z_order); widget()->SetZOrderLevel(z_order);
#if defined(OS_WIN) #if defined(OS_WIN)
@ -773,6 +771,11 @@ void NativeWindowViews::SetAlwaysOnTop(ui::ZOrderLevel z_order,
} }
#endif #endif
MoveBehindTaskBarIfNeeded(); MoveBehindTaskBarIfNeeded();
// This must be notified at the very end or IsAlwaysOnTop
// will not yet have been updated to reflect the new status
if (level_changed)
NativeWindow::NotifyWindowAlwaysOnTopChanged();
} }
ui::ZOrderLevel NativeWindowViews::GetZOrderLevel() { ui::ZOrderLevel NativeWindowViews::GetZOrderLevel() {

28
spec-main/api-browser-window-spec.ts
View file

@ -1040,22 +1040,24 @@ describe('BrowserWindow module', () => {
describe('BrowserWindow.setAlwaysOnTop(flag, level)', () => { describe('BrowserWindow.setAlwaysOnTop(flag, level)', () => {
let w = null as unknown as BrowserWindow let w = null as unknown as BrowserWindow
beforeEach(() => { beforeEach(() => {
w = new BrowserWindow({show: false}) w = new BrowserWindow({show: false})
}) })
afterEach(async () => { afterEach(async () => {
await closeWindow(w) await closeWindow(w)
w = null as unknown as BrowserWindow w = null as unknown as BrowserWindow
}) })
it('sets the window as always on top', () => { it('sets the window as always on top', () => {
expect(w.isAlwaysOnTop()).to.equal(false) expect(w.isAlwaysOnTop()).to.be.false('is alwaysOnTop')
w.setAlwaysOnTop(true, 'screen-saver') w.setAlwaysOnTop(true, 'screen-saver')
expect(w.isAlwaysOnTop()).to.equal(true) expect(w.isAlwaysOnTop()).to.be.true('is not alwaysOnTop')
w.setAlwaysOnTop(false) w.setAlwaysOnTop(false)
expect(w.isAlwaysOnTop()).to.equal(false) expect(w.isAlwaysOnTop()).to.be.false('is alwaysOnTop')
w.setAlwaysOnTop(true) w.setAlwaysOnTop(true)
expect(w.isAlwaysOnTop()).to.equal(true) expect(w.isAlwaysOnTop()).to.be.true('is not alwaysOnTop')
}) })
ifit(process.platform === 'darwin')('raises an error when relativeLevel is out of bounds', () => { ifit(process.platform === 'darwin')('raises an error when relativeLevel is out of bounds', () => {
@ -1069,13 +1071,23 @@ describe('BrowserWindow module', () => {
}) })
ifit(process.platform === 'darwin')('resets the windows level on minimize', () => { ifit(process.platform === 'darwin')('resets the windows level on minimize', () => {
expect(w.isAlwaysOnTop()).to.equal(false) expect(w.isAlwaysOnTop()).to.be.false('is alwaysOnTop')
w.setAlwaysOnTop(true, 'screen-saver') w.setAlwaysOnTop(true, 'screen-saver')
expect(w.isAlwaysOnTop()).to.equal(true) expect(w.isAlwaysOnTop()).to.be.true('is not alwaysOnTop')
w.minimize() w.minimize()
expect(w.isAlwaysOnTop()).to.equal(false) expect(w.isAlwaysOnTop()).to.be.false('is alwaysOnTop')
w.restore() w.restore()
expect(w.isAlwaysOnTop()).to.equal(true) expect(w.isAlwaysOnTop()).to.be.true('is not alwaysOnTop')
})
ifit(process.platform !== 'darwin')('causes the right value to be emitted on `always-on-top-changed`', (done) => {
w.on('always-on-top-changed', (e, alwaysOnTop) => {
expect(alwaysOnTop).to.be.true('is not alwaysOnTop')
done()
})
expect(w.isAlwaysOnTop()).to.be.false('is alwaysOnTop')
w.setAlwaysOnTop(true)
}) })
}) })