window - improved notify on focus (microsoft#255973)

Author: bpasero

src/vs/platform/windows/electron-main/windowImpl.ts

@@ -8,7 +8,7 @@ import { DeferredPromise, RunOnceScheduler, timeout, Delayer } from '../../../ba
 import { CancellationToken } from '../../../base/common/cancellation.js';
 import { toErrorMessage } from '../../../base/common/errorMessage.js';
 import { Emitter, Event } from '../../../base/common/event.js';
-import { Disposable, IDisposable, MutableDisposable } from '../../../base/common/lifecycle.js';
+import { Disposable, DisposableStore, IDisposable, MutableDisposable, toDisposable } from '../../../base/common/lifecycle.js';
 import { FileAccess, Schemas } from '../../../base/common/network.js';
 import { getMarks, mark } from '../../../base/common/performance.js';
 import { isBigSurOrNewer, isLinux, isMacintosh, isWindows } from '../../../base/common/platform.js';
@@ -173,7 +173,7 @@ export abstract class BaseWindow extends Disposable implements IBaseWindow {
 			this.dispose();
 		}));
 		this._register(Event.fromNodeEventEmitter(win, 'focus')(() => {
-			this.clearFocusNotificationBadge();
+			this.clearNotifyFocus();
 
 			this._lastFocusTime = Date.now();
 		}));
@@ -347,23 +347,7 @@ export abstract class BaseWindow extends Disposable implements IBaseWindow {
 				break;
 
 			case FocusMode.Notify:
-				if (isMacintosh) {
-					this.showFocusNotificationBadge();
-
-					// On macOS we have direct API to bounce the dock icon
-					electron.app.dock?.bounce('informational');
-				} else if (isWindows) {
-					this.showFocusNotificationBadge();
-
-					// On Windows, calling focus() will bounce the taskbar icon
-					// https://github.com/electron/electron/issues/2867
-					this.win?.focus();
-				} else if (isLinux) {
-					this.showFocusNotificationBadge();
-
-					// On Linux, there seems to be no way to bounce the taskbar icon
-					// as calling focus() will actually steal focus away.
-				}
+				this.showNotifyFocus();
 				break;
 
 			case FocusMode.Force:
@@ -375,16 +359,26 @@ export abstract class BaseWindow extends Disposable implements IBaseWindow {
 		}
 	}
 
-	private readonly focusNotificationBadgeDisposable = this._register(new MutableDisposable());
+	private readonly notifyFocusDisposable = this._register(new MutableDisposable());
+
+	private showNotifyFocus(): void {
+		const disposables = new DisposableStore();
+		this.notifyFocusDisposable.value = disposables;
+
+		// Badge
+		disposables.add(DockBadgeManager.INSTANCE.acquireBadge(this));
 
-	private showFocusNotificationBadge(): void {
-		if (!this.focusNotificationBadgeDisposable.value) {
-			this.focusNotificationBadgeDisposable.value = DockBadgeManager.INSTANCE.acquireBadge(this);
+		// Flash/Bounce
+		if (isWindows) {
+			this.win?.flashFrame(true);
+			disposables.add(toDisposable(() => this.win?.flashFrame(false)));
+		} else if (isMacintosh) {
+			electron.app.dock?.bounce('informational');
 		}
 	}
 
-	private clearFocusNotificationBadge(): void {
-		this.focusNotificationBadgeDisposable.clear();
+	private clearNotifyFocus(): void {
+		this.notifyFocusDisposable.clear();
 	}
 
 	private doFocusWindow() {

src/vs/workbench/contrib/chat/browser/chatContentParts/chatConfirmationWidget.ts

@@ -204,8 +204,7 @@ abstract class BaseChatConfirmationWidget extends Disposable {
 		const title = renderStringAsPlaintext(this.title);
 		const notification = await dom.triggerNotification(title ? localize('notificationTitle', "Chat: {0}", title) : localize('defaultTitle', "Chat: Confirmation Required"),
 			{
-				detail: localize('notificationDetail', "The current chat session requires your confirmation to proceed."),
-				sticky: true
+				detail: localize('notificationDetail', "The current chat session requires your confirmation to proceed.")
 			}
 		);
 		if (notification) {