Skip to content

TT-7044 don't ignore zoom inside more menu, fix zoom width reset when… #200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sarahentzel merged 1 commit into from
Feb 4, 2026
Merged

TT-7044 don't ignore zoom inside more menu, fix zoom width reset when… #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 16 additions & 3 deletions src/renderer/src/components/WSAudioPlayer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1328,11 +1328,16 @@ function WSAudioPlayer(props: IProps) {
flexDirection: 'column',
whiteSpace: 'nowrap',
width: '100%',
minWidth: 0,
overflowX: 'auto',
}}
style={style}
>
<>
<Grid container sx={toolbarProp}>
<Grid
container
sx={{ ...toolbarProp, minWidth: 0, flexWrap: 'nowrap' }}
>
<Grid sx={{ ml: 1 }}>
<LightTooltip id="wsAudioPlayTip" title={playTooltipTitle}>
<span>
Expand Down Expand Up @@ -1485,8 +1490,16 @@ function WSAudioPlayer(props: IProps) {
>
{allowZoom && (
<MenuItem
onClick={handleMoreMenuClose}
sx={{ pointerEvents: 'none' }}
onClick={(e) => {//don't close menu if zoom in or out button is clicked
const target = e.target as HTMLElement;
if (
target.closest?.(
'[id="wsZoomIn"], [id="wsZoomOut"]'
)
)
return;
handleMoreMenuClose();
}}
>
<WSAudioPlayerZoom
ready={ready && !recording && !waitingForAI}
Expand Down
13 changes: 10 additions & 3 deletions src/renderer/src/components/WSAudioPlayerZoom.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ function WSAudioPlayerZoom(props: IProps) {

const t: IWsAudioPlayerZoomStrings = useSelector(audioPlayerZoomSelector);
const readyRef = useRef(ready);
const prevFillPxRef = useRef<number | undefined>(undefined);

const ZOOMIN_KEY = 'CTRL+1';
const ZOOMOUT_KEY = 'CTRL+3';
Expand All @@ -51,8 +52,16 @@ function WSAudioPlayerZoom(props: IProps) {
if (tellParent) onZoom(value);
};
useEffect(() => {
setZoom(fillPx);
setZoomMin(fillPx);
// Only sync zoom to fillPx when fillPx actually changes (e.g. resize), not on mount.
// On mount, curPx effect sets zoom; avoid overwriting with fillPx so menu reopen keeps zoom.
if (
prevFillPxRef.current !== undefined &&
prevFillPxRef.current !== fillPx
) {
setZoom(fillPx);
}
prevFillPxRef.current = fillPx;
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [fillPx]);

Expand All @@ -79,12 +88,10 @@ function WSAudioPlayerZoom(props: IProps) {
];
keys.forEach((k) => subscribe(k.key, k.cb));
return () => {
// eslint-disable-next-line react-hooks/exhaustive-deps
keys.forEach((k) => unsubscribe(k.key));
};
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);

return (
<GrowingDiv>
<ToolbarGrid container>
Expand Down