Skip to content

[#55] 아이콘 경로 변경 #60

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
zzzRYT merged 2 commits into from
Nov 23, 2025
Merged

[#55] 아이콘 경로 변경 #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93b4fc2
fix(icon): 아이콘 경로 변경
zzzRYT Nov 23, 2025
5352025
fix(icon): window create시 아이콘 경로 변경
zzzRYT Nov 23, 2025
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
2 changes: 1 addition & 1 deletion electron/windows/mainWindow.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export function createMainWindow(
preloadPath?: string
) {
mainWin = new BrowserWindow({
icon: path.join(process.env.VITE_PUBLIC ?? RENDERER_DIST, 'electron-vite.svg'),
icon: path.join(process.env.VITE_PUBLIC ?? RENDERER_DIST, 'matmal-icon.png'),
webPreferences: {
preload: preloadPath ?? path.join(RENDERER_DIST, 'preload.mjs'),
},
Expand Down
15 changes: 9 additions & 6 deletions forge.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,38 +4,41 @@ import { FuseV1Options, FuseVersion } from '@electron/fuses';
export default {
packagerConfig: {
asar: true,
icon: './src/assets/matmal-icon',
executableName: 'matmal',
icon: './public/matmal-icon.png',
executableName: '/src/assets/matmal-icon',
name: 'MATMAL',
},
rebuildConfig: {},
makers: [
{
name: '@electron-forge/maker-squirrel',
config: {
setupIcon: './src/assets/matmal-icon.ico',
setupIcon: '/src/assets/matmal-icon.ico',
},
},
{
name: '@electron-forge/maker-zip',
platforms: ['darwin'],
config: {
icon: './src/assets/matmal-icon.png',
},
},
{
name: '@electron-forge/maker-deb',
config: {
icon: '/src/assets/matmal-icon.png',
icon: './public/matmal-icon.png',
},
},
{
name: '@electron-forge/maker-dmg',
config: {
icon: '/src/assets/matmal-icon.icns',
icon: './src/assets/matmal-icon.icns',
},
},
{
name: '@electron-forge/maker-rpm',
config: {
icon: '/src/assets/matmal-icon.png',
icon: './src/assets/matmal-icon.png',
},
},
],
Expand Down
Binary file added src/assets/matmal-icon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/shared/components/ui/Loading.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
export function LoadingSpinner() {
return (
<div className="grid min-h-[140px] w-full place-items-center overflow-x-scroll rounded-lg p-6 lg:overflow-visible">
<div className="grid min-h-[140px] w-full place-items-center overflow-x-hidden rounded-lg p-6">
<svg
className="text-gray-300 animate-spin"
viewBox="0 0 64 64"
Expand Down