test with WM_ACTIVATEAPP

electron · Aug 6, 2020 · 30b01b4 · 30b01b4
1 parent 4c11d83
commit 30b01b4
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 22 deletions.
diff --git a/shell/browser/api/electron_api_base_window.cc b/shell/browser/api/electron_api_base_window.cc
@@ -296,7 +296,6 @@ void BaseWindow::OnNewWindowForTab() {
 
 #if defined(OS_WIN)
 void BaseWindow::OnWindowMessage(UINT message, WPARAM w_param, LPARAM l_param) {
-  LOG(INFO) << "GOT MESSAGE " << (int)message;
   if (IsWindowMessageHooked(message)) {
     v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
     v8::Locker locker(isolate);

diff --git a/spec-main/api-browser-window-spec.ts b/spec-main/api-browser-window-spec.ts
@@ -4292,15 +4292,16 @@ describe('BrowserWindow module', () => {
   ifdescribe(process.platform === 'win32')('window message hooks', () => {
     afterEach(closeAllWindows);
 
-    const WM_GETICON = 0x7f;
+    const WM_ACTIVATEAPP = 0x1C;
 
     it('can hook a window message with hookWindowMessage', async () => {
       const w = new BrowserWindow({ show: true, width: 256, height: 256 });
       const messageReceived = new Promise<[Buffer, Buffer]>((resolve) => {
-        w.hookWindowMessage(WM_GETICON, (wparam: Buffer, lparam: Buffer) => {
+        w.hookWindowMessage(WM_ACTIVATEAPP, (wparam: Buffer, lparam: Buffer) => {
           resolve([wparam, lparam]);
         });
       });
+      w.minimize();
       const [wparam, lparam] = await messageReceived;
       expect(wparam).to.be.an.instanceOf(Buffer);
       expect(lparam).to.be.an.instanceOf(Buffer);
@@ -4311,24 +4312,22 @@ describe('BrowserWindow module', () => {
       let timesCalled = 0;
       {
         const messageReceived = new Promise<[Buffer, Buffer]>((resolve) => {
-          w.hookWindowMessage(WM_GETICON, (wparam: Buffer, lparam: Buffer) => {
+          w.hookWindowMessage(WM_ACTIVATEAPP, (wparam: Buffer, lparam: Buffer) => {
             timesCalled++;
             resolve([wparam, lparam]);
           });
         });
+        w.blur();
         await messageReceived;
         expect(timesCalled).to.equal(1);
       }
-      console.log('before hide/show');
-      w.hide();
-      w.show();
-      console.log('after hide/show');
-      await delay(100);
-      console.log('after delay');
+      const p = emittedOnce(w, 'focus');
+      w.focus();
+      await p;
       expect(timesCalled).to.equal(2);
-      w.unhookWindowMessage(WM_GETICON);
-      w.hide();
-      w.show();
+      w.unhookWindowMessage(WM_ACTIVATEAPP);
+      w.blur();
+      w.focus();
       expect(timesCalled).to.equal(2);
     });
 
@@ -4337,24 +4336,22 @@ describe('BrowserWindow module', () => {
       let timesCalled = 0;
       {
         const messageReceived = new Promise<[Buffer, Buffer]>((resolve) => {
-          w.hookWindowMessage(WM_GETICON, (wparam: Buffer, lparam: Buffer) => {
+          w.hookWindowMessage(WM_ACTIVATEAPP, (wparam: Buffer, lparam: Buffer) => {
             timesCalled++;
             resolve([wparam, lparam]);
           });
         });
+        w.minimize();
         await messageReceived;
         expect(timesCalled).to.equal(1);
       }
-      console.log('before hide/show');
-      w.hide();
-      w.show();
-      console.log('after hide/show');
-      await delay(100);
-      console.log('after delay');
+      const p = emittedOnce(w, 'restore');
+      w.restore();
+      await p;
       expect(timesCalled).to.equal(2);
       w.unhookAllWindowMessages();
-      w.hide();
-      w.show();
+      w.minimize();
+      w.restore();
       expect(timesCalled).to.equal(2);
     });
   });