Add Linux icon #11
Add Linux icon #11
Conversation
script/build.ts
Outdated
| @@ -178,6 +181,12 @@ function copyStaticResources() { | |||
| fs.copySync(common, destination, { clobber: false }) | |||
| } | |||
|
|
|||
| function copyLogo() { | |||
| const logoImage = path.join(projectRoot, 'app', 'static', 'logos', '512x512.png') | |||
There was a problem hiding this comment.
We actually have a folder of dedicated Linux content at app/static/linux/ that already gets copied across.
For the sake of simplicity I'd just copy this file into that location with the name you want it to be, rather than have a separate method that runs on all platforms.
|
Oh, and run |
7d169fc to
f696118
Compare
|
@shiftkey updated the PR, moved the icon to the linux static directory and using that instead. Thanks! |
app/src/main-process/app-window.ts
Outdated
| @@ -59,6 +60,10 @@ export class AppWindow { | |||
| windowOptions.frame = false | |||
| } | |||
|
|
|||
| if (__LINUX__) { | |||
| windowOptions.icon = path.join(__dirname, 'icon-logo.png') | |||
There was a problem hiding this comment.
I think you had this right previously with looking in the static subdirectory, like this:
windowOptions.icon = path.join(__dirname, 'static', 'icon-logo.png')Here's what the app directory looks like after building:
$ pwd
/home/parallels/src/desktop/dist/desktop-linux-x64/resources/app
$ ls
ask-pass.js crash.html highlighter.js node_modules ui.css
ask-pass.js.map crash.js highlighter.js.map package.json ui.css.map
cli.js crash.js.map index.html renderer.js yarn.lock
cli.js.map emoji keytar.node renderer.js.map
crash.css emoji.json main.js runas.node
crash.css.map git main.js.map static
$ ls static
ask-pass-trampoline.sh empty-no-repo.svg
choosealicense.com gitignore
default-avatar.png icon-logo.png
empty-no-branches.svg licenses.json
empty-no-commit.svg welcome-illustration-left-bottom.svg
empty-no-file-selected.svg welcome-illustration-left-top.svg
empty-no-pull-requests.svg welcome-illustration-right.svgBut on my Ubuntu 16.04 VM I got a generic icon when running the app in development mode:
Same thing with the installed AppImage:
Maybe there's something off with my setup?
There was a problem hiding this comment.
@shiftkey that's odd. When running yarn dev:build on my machine, a icon-logo.png file is being copied to dist/desktop-linux-x64/resources/app/. Are you building it a different way? I'm not that familiar with yarn yet, so there might be a different release task.
Anyway, changing it back to static/icon-logo.png works too, I've updated the PR.
There was a problem hiding this comment.
@picandocodigo I'm only doing yarn build:dev or yarn build:prod
There was a problem hiding this comment.
Just tried yarn build:prod too, and in both cases (prod and dev) for some reason the logo is being copied to both /dist/desktop-linux-x64/resources/app and /dist/desktop-linux-x64/resources/app/static.
If it doesn't happen in your VM, it might be an issue with my setup or something. The icon still shows up using windowOptions.icon = path.join(__dirname, 'static', 'icon-logo.png') . And I rm -rf the dist directory before every yarn build.
There was a problem hiding this comment.
I think this might have been some caching in the out directory to blame. We're not as aggressive with cleaning that directory up between builds - we should be nuking dist.
f696118 to
7eca4e1
Compare
|
I'll take this in an prepare another release candidate sometime this week to see if it's addressed. Thanks for the work @picandocodigo! |
An initial attempt that fixes #8. Not sure if the paths and the modifications in the build script are ok. But as you can see, this makes it work with
yarn startin the alt-tab menu:And in the activities panel:
Let me know if anything needs to be modified or improved. Thanks!