bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2026-02-02 09:43:29 +00:00
Code Issues Releases Wiki Activity

Move macOS-specific position quirk to native code

Browse Source
This commit is contained in:
Isaiah Inuwa
2025-11-10 15:00:53 -06:00
parent d6db3504e1
commit d85a5ce100
2 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
apps/desktop/macos/autofill-extension/CredentialProviderViewController.swift
View File

@@ -190,19 +190,24 @@ class CredentialProviderViewController: ASCredentialProviderViewController {
logger.log("[autofill-extension] position: Final window frame: \(NSStringFromRect(finalWindowFrame))")
// Use stabilized window frame if available, otherwise fallback to mouse position
let x, y: Int32
if finalWindowFrame.origin.x != 0 || finalWindowFrame.origin.y != 0 {
let centerX = Int32(round(finalWindowFrame.origin.x))
let centerY = Int32(round(screenHeight - finalWindowFrame.origin.y))
logger.log("[autofill-extension] position: Using window position: x=\(centerX), y=\(centerY)")
return Position(x: centerX, y: centerY)
x = centerX
y = centerY
} else {
// Fallback to mouse position
let mouseLocation = NSEvent.mouseLocation
let mouseX = Int32(round(mouseLocation.x))
let mouseY = Int32(round(screenHeight - mouseLocation.y))
logger.log("[autofill-extension] position: Using mouse position fallback: x=\(mouseX), y=\(mouseY)")
return Position(x: mouseX, y: mouseY)
x = mouseX
y = mouseY
}
// Add 100 pixels to the x-coordinate to offset the native OS dialog positioning.
return Position(x: x + 100, y: y)
}
override func viewDidLoad() {

16
apps/desktop/src/autofill/services/desktop-autofill.service.ts
View File

@@ -213,7 +213,7 @@ export class DesktopAutofillService implements OnDestroy {
try {
const response = await this.fido2AuthenticatorService.makeCredential(
this.convertRegistrationRequest(request),
{ windowXy: normalizePosition(request.windowXy) },
{ windowXy: request.windowXy },
controller,
);
@@ -281,7 +281,7 @@ export class DesktopAutofillService implements OnDestroy {
const response = await this.fido2AuthenticatorService.getAssertion(
this.convertAssertionRequest(request, true),
{ windowXy: normalizePosition(request.windowXy) },
{ windowXy: request.windowXy },
controller,
);
@@ -309,7 +309,7 @@ export class DesktopAutofillService implements OnDestroy {
try {
const response = await this.fido2AuthenticatorService.getAssertion(
this.convertAssertionRequest(request),
{ windowXy: normalizePosition(request.windowXy) },
{ windowXy: request.windowXy },
controller,
);
@@ -442,14 +442,4 @@ export class DesktopAutofillService implements OnDestroy {
this.destroy$.next();
this.destroy$.complete();
}
}
function normalizePosition(position: { x: number; y: number }): { x: number; y: number } {
// Add 100 pixels to the x-coordinate to offset the native OS dialog positioning.
const xPostionOffset = 100;
return {
x: Math.round(position.x + xPostionOffset),
y: Math.round(position.y),
};
}