From beaa919c80256a479da879dae5c48fb2138a6309 Mon Sep 17 00:00:00 2001
From: Zamitto <167933696+zamitto@users.noreply.github.com>
Date: Wed, 2 Oct 2024 18:01:58 -0300
Subject: [PATCH] feat: refactoring notification window
---
src/main/services/achievements/merge-achievements.ts | 6 ------
src/main/services/window-manager.ts | 6 ++++--
src/renderer/index.html | 2 +-
src/renderer/src/app.css.ts | 1 -
src/renderer/src/main.tsx | 4 ++--
src/renderer/src/pages/achievement/achievement.tsx | 6 ++++--
yarn.lock | 7 ++++++-
7 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/src/main/services/achievements/merge-achievements.ts b/src/main/services/achievements/merge-achievements.ts
index 31ffc767..a5f3d369 100644
--- a/src/main/services/achievements/merge-achievements.ts
+++ b/src/main/services/achievements/merge-achievements.ts
@@ -85,12 +85,6 @@ export const mergeAchievements = async (
shop,
achievementsInfo
);
-
- WindowManager.notificationWindow?.setBounds({ y: 50 });
-
- setTimeout(() => {
- WindowManager.notificationWindow?.setBounds({ y: -9999 });
- }, 4000);
}
const mergedLocalAchievements = unlockedAchievements.concat(newAchievements);
diff --git a/src/main/services/window-manager.ts b/src/main/services/window-manager.ts
index 70ad783d..e28e8b3a 100644
--- a/src/main/services/window-manager.ts
+++ b/src/main/services/window-manager.ts
@@ -104,19 +104,21 @@ export class WindowManager {
maximizable: false,
autoHideMenuBar: true,
minimizable: false,
- focusable: true,
+ focusable: false,
skipTaskbar: true,
frame: false,
width: 240,
height: 60,
x: 25,
- y: -9999,
+ y: 25,
webPreferences: {
preload: path.join(__dirname, "../preload/index.mjs"),
sandbox: false,
},
});
+ this.notificationWindow.setIgnoreMouseEvents(true);
+ this.notificationWindow.webContents.openDevTools();
this.notificationWindow.setVisibleOnAllWorkspaces(true, {
visibleOnFullScreen: true,
});
diff --git a/src/renderer/index.html b/src/renderer/index.html
index e2eea62c..b53595ff 100644
--- a/src/renderer/index.html
+++ b/src/renderer/index.html
@@ -9,7 +9,7 @@
content="default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; img-src 'self' data: local: *; media-src 'self' local: data: *;"
/>
-
+
diff --git a/src/renderer/src/app.css.ts b/src/renderer/src/app.css.ts
index 4e0cf7a0..40e15835 100644
--- a/src/renderer/src/app.css.ts
+++ b/src/renderer/src/app.css.ts
@@ -35,7 +35,6 @@ globalStyle("body", {
userSelect: "none",
fontFamily: "Noto Sans, sans-serif",
fontSize: vars.size.body,
- background: vars.color.background,
color: vars.color.body,
margin: "0",
});
diff --git a/src/renderer/src/main.tsx b/src/renderer/src/main.tsx
index 3478273b..bcb8fe80 100644
--- a/src/renderer/src/main.tsx
+++ b/src/renderer/src/main.tsx
@@ -28,7 +28,7 @@ import {
import { store } from "./store";
import resources from "@locales";
-import { Achievemnt } from "./pages/achievement/achievement";
+import { Achievement } from "./pages/achievement/achievement";
import "./workers";
import { RepacksContextProvider } from "./context";
@@ -70,7 +70,7 @@ ReactDOM.createRoot(document.getElementById("root")!).render(
-
+
diff --git a/src/renderer/src/pages/achievement/achievement.tsx b/src/renderer/src/pages/achievement/achievement.tsx
index 7bc625d3..fbdcaa89 100644
--- a/src/renderer/src/pages/achievement/achievement.tsx
+++ b/src/renderer/src/pages/achievement/achievement.tsx
@@ -1,8 +1,9 @@
import { useEffect, useMemo, useState } from "react";
import achievementSound from "@renderer/assets/audio/achievement.wav";
import { useTranslation } from "react-i18next";
+import { vars } from "@renderer/theme.css";
-export function Achievemnt() {
+export function Achievement() {
const { t } = useTranslation("achievement");
const [achievementInfo, setAchievementInfo] = useState<{
@@ -39,7 +40,7 @@ export function Achievemnt() {
};
}, [audio]);
- if (!achievementInfo) return Nada
;
+ if (!achievementInfo) return null;
return (