From ce76bc5b6b0f19295fa100a9b56343cf2be71d1b Mon Sep 17 00:00:00 2001 From: Chubby Granny Chaser Date: Mon, 6 Jan 2025 20:50:09 +0000 Subject: [PATCH] feat: updating title bar z-index --- src/renderer/src/app.css.ts | 2 +- src/renderer/src/app.tsx | 12 ++++++++++-- .../src/pages/downloads/download-group.tsx | 19 ++++++++++--------- src/renderer/src/scss/globals.scss | 2 +- src/renderer/src/theme.css.ts | 2 +- 5 files changed, 23 insertions(+), 14 deletions(-) diff --git a/src/renderer/src/app.css.ts b/src/renderer/src/app.css.ts index 25c453c8..b5c4740e 100644 --- a/src/renderer/src/app.css.ts +++ b/src/renderer/src/app.css.ts @@ -123,7 +123,7 @@ export const titleBar = style({ alignItems: "center", padding: `0 ${SPACING_UNIT * 2}px`, WebkitAppRegion: "drag", - zIndex: "4", + zIndex: vars.zIndex.titleBar, borderBottom: `1px solid ${vars.color.border}`, } as ComplexStyleRule); diff --git a/src/renderer/src/app.tsx b/src/renderer/src/app.tsx index 5fefe90c..8d38b7ad 100644 --- a/src/renderer/src/app.tsx +++ b/src/renderer/src/app.tsx @@ -239,7 +239,7 @@ export function App() { return ( <> - {window.electron.platform === "win32" && ( + {/* {window.electron.platform === "win32" && (

Hydra @@ -248,7 +248,15 @@ export function App() { )}

- )} + )} */} +
+

+ Hydra + {hasActiveSubscription && ( + Cloud + )} +

+
-

{t("seeding")}

- {uploadSpeed &&

{uploadSpeed}/s

} - - ) : ( -

{t("completed")}

- ); + if (game.status === "seeding" && game.downloader === Downloader.Torrent) { + return ( + <> +

{t("seeding")}

+ {uploadSpeed &&

{uploadSpeed}/s

} + + ); + } else { + return

{t("completed")}

; + } } if (game.status === "paused") { diff --git a/src/renderer/src/scss/globals.scss b/src/renderer/src/scss/globals.scss index cc01c197..792abf86 100644 --- a/src/renderer/src/scss/globals.scss +++ b/src/renderer/src/scss/globals.scss @@ -16,6 +16,6 @@ $spacing-unit: 8px; $toast-z-index: 5; $bottom-panel-z-index: 3; -$title-bar-z-index: 4; +$title-bar-z-index: 1900000001; $backdrop-z-index: 4; $modal-z-index: 5; diff --git a/src/renderer/src/theme.css.ts b/src/renderer/src/theme.css.ts index b9fbaf55..7cd92ef3 100644 --- a/src/renderer/src/theme.css.ts +++ b/src/renderer/src/theme.css.ts @@ -24,7 +24,7 @@ export const vars = createGlobalTheme(":root", { zIndex: { toast: "5", bottomPanel: "3", - titleBar: "4", + titleBar: "1900000001", backdrop: "4", }, });