Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 7 additions & 18 deletions electron/windows.ts
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ function getHudOverlayBounds() {
const { workArea } = getHudOverlayDisplay();
return getHudOverlayWindowBounds(
workArea,
isHudOverlayMousePassthroughSupported() && !hudOverlayRecordingActive,
isHudOverlayMousePassthroughSupported(),
hudOverlayFallbackExpanded,
);
}
Expand Down Expand Up @@ -278,11 +278,7 @@ function setHudOverlayFallbackExpanded(expanded: boolean) {

function setHudOverlayMousePassthrough(ignore: boolean) {
hudOverlayIgnoringMouse =
hudOverlaySourceSelectionActive && !hudOverlayRecordingActive
? true
: hudOverlayRecordingActive
? false
: ignore;
hudOverlaySourceSelectionActive && !hudOverlayRecordingActive ? true : ignore;

if (hudOverlayMouseReassertTimer) {
clearTimeout(hudOverlayMouseReassertTimer);
Expand All @@ -293,9 +289,7 @@ function setHudOverlayMousePassthrough(ignore: boolean) {
return;
}

if (hudOverlayRecordingActive) {
hudOverlayFallbackExpanded = false;
applyHudOverlayBounds();
if (hudOverlayRecordingActive && !isHudOverlayMousePassthroughSupported()) {
hudOverlayWindow.setIgnoreMouseEvents(false);
return;
}
Expand Down Expand Up @@ -480,13 +474,8 @@ export function createHudOverlayWindow(): BrowserWindow {
}

if (isHudOverlayMousePassthroughSupported()) {
if (hudOverlayRecordingActive) {
hudOverlayIgnoringMouse = false;
win.setIgnoreMouseEvents(false);
} else {
hudOverlayIgnoringMouse = true;
win.setIgnoreMouseEvents(true, { forward: true });
}
hudOverlayIgnoringMouse = true;
win.setIgnoreMouseEvents(true, { forward: true });
}

// On Windows 11+, focus changes (e.g. showing a native notification) can break
Expand Down Expand Up @@ -616,7 +605,7 @@ export function reassertHudOverlayMousePassthrough(): void {
}

if (hudOverlayRecordingActive) {
hud.setIgnoreMouseEvents(false);
setHudOverlayMousePassthrough(hudOverlayIgnoringMouse);
return;
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}

Expand All @@ -638,7 +627,7 @@ export function setHudOverlayRecordingActive(recording: boolean): void {
hudOverlayRecordingActive = Boolean(recording);
hudOverlayFallbackExpanded = false;
applyHudOverlayBounds();
setHudOverlayMousePassthrough(!hudOverlayRecordingActive);
setHudOverlayMousePassthrough(hudOverlayIgnoringMouse);
}

export function createUpdateToastWindow(): BrowserWindow {
Expand Down
7 changes: 4 additions & 3 deletions src/components/launch/LaunchWindow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -442,12 +442,13 @@ function LaunchWindowContent() {
className="flex items-center overflow-visible flex-col-reverse pointer-events-none"
>
<div
className="flex flex-col items-center pointer-events-auto p-2"
onMouseEnter={handleHudMouseEnter}
onMouseLeave={handleHudMouseLeave}
className="flex flex-col items-center p-2"
>
<div
ref={hudBarTransformRef}
className="pointer-events-auto"
onMouseEnter={handleHudMouseEnter}
onMouseLeave={handleHudMouseLeave}
style={{
transform: `translate3d(${recordingHudOffset.x}px, ${recordingHudOffset.y}px, 0)`,
}}
Expand Down