Skip to content

Commit ed700c2

Browse files
committed
fix(style): fix fullscreen style and in-app-menu
1 parent 9769544 commit ed700c2

File tree

3 files changed

+25
-9
lines changed

3 files changed

+25
-9
lines changed

src/plugins/album-color-theme/style.css

-6
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,6 @@ yt-page-navigation-progress {
2424
background-color 300ms cubic-bezier(0.2, 0, 0.6, 1) !important;
2525
}
2626

27-
#img,
28-
#player,
29-
.song-media-controls.style-scope.ytmusic-player {
30-
border-radius: 2% !important;
31-
}
32-
3327
#items {
3428
border-radius: 10px !important;
3529
}

src/plugins/in-app-menu/renderer/TitleBar.tsx

+19-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Menu, MenuItem } from 'electron';
2-
import { createEffect, createResource, createSignal, Index, Match, onMount, Show, Switch } from 'solid-js';
2+
import { createEffect, createResource, createSignal, Index, Match, onCleanup, onMount, Show, Switch } from 'solid-js';
33
import { css } from 'solid-styled-components';
44
import { TransitionGroup } from 'solid-transition-group';
55

@@ -38,11 +38,16 @@ const titleStyle = cache(() => css`
3838
user-select: none;
3939
4040
transition: opacity 200ms ease 0s,
41+
transform 300ms cubic-bezier(0.2, 0, 0.6, 1) 0s,
4142
background-color 300ms cubic-bezier(0.2, 0, 0.6, 1) 0s;
4243
4344
&[data-macos="true"] {
4445
padding: 4px 4px 4px 74px;
4546
}
47+
48+
ytmusic-app:has(ytmusic-player[player-ui-state=FULLSCREEN]) ~ &:not([data-show="true"]) {
49+
transform: translateY(calc(-1 * var(--menu-bar-height, 32px)));
50+
}
4651
`);
4752

4853
const separatorStyle = cache(() => css`
@@ -162,6 +167,7 @@ export const TitleBar = (props: TitleBarProps) => {
162167
const [ignoreTransition, setIgnoreTransition] = createSignal(false);
163168
const [openTarget, setOpenTarget] = createSignal<HTMLElement | null>(null);
164169
const [menu, setMenu] = createSignal<Menu | null>(null);
170+
const [mouseY, setMouseY] = createSignal(0);
165171

166172
const [data, { refetch }] = createResource(async () => await props.ipc.invoke('get-menu') as Promise<Menu | null>);
167173
const [isMaximized, { refetch: refetchMaximize }] = createResource(async () => await props.ipc.invoke('window-is-maximized') as Promise<boolean>);
@@ -224,6 +230,10 @@ export const TitleBar = (props: TitleBarProps) => {
224230
setMenu(await refreshMenuItem(menuData, commandId));
225231
};
226232

233+
const listener = (e: MouseEvent) => {
234+
setMouseY(e.clientY);
235+
};
236+
227237
onMount(() => {
228238
props.ipc.on('close-all-in-app-menu-panel', async () => {
229239
setIgnoreTransition(true);
@@ -257,6 +267,9 @@ export const TitleBar = (props: TitleBarProps) => {
257267
setOpenTarget(null);
258268
}
259269
});
270+
271+
// tracking mouse position
272+
window.addEventListener('mousemove', listener);
260273
});
261274

262275
createEffect(() => {
@@ -265,8 +278,12 @@ export const TitleBar = (props: TitleBarProps) => {
265278
}
266279
});
267280

281+
onCleanup(() => {
282+
window.removeEventListener('mousemove', listener);
283+
});
284+
268285
return (
269-
<nav data-ytmd-main-panel={true} class={titleStyle()} data-macos={props.isMacOS}>
286+
<nav data-ytmd-main-panel={true} class={titleStyle()} data-macos={props.isMacOS} data-show={mouseY() < 32}>
270287
<IconButton
271288
onClick={() => setCollapsed(!collapsed())}
272289
style={{

src/youtube-music.css

+6-1
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,17 @@ tp-yt-paper-item.ytmusic-guide-entry-renderer::before {
6565
border-radius: 8px !important;
6666
}
6767

68+
/* fix video player align */
6869
#av-id {
6970
padding-bottom: 0;
7071
}
7172

72-
#av-id ~ #player.ytmusic-player-page {
73+
#av-id ~ #player.ytmusic-player-page:not([player-ui-state="FULLSCREEN"]) {
7374
margin-top: auto !important;
7475
margin-bottom: auto !important;
7576
max-height: calc(100% - (var(--ytmusic-player-page-vertical-padding) * 2));
7677
}
78+
79+
ytmusic-player[player-ui-state=FULLSCREEN] {
80+
top: calc(var(--menu-bar-height, 32px) * -1) !important;
81+
}

0 commit comments

Comments
 (0)