Skip to content
This repository was archived by the owner on Sep 29, 2023. It is now read-only.

macOS: Fix crash when using --tray (fix #527), and invisible icon (fix #942, fix #668)#1156

Merged
ronjouch merged 6 commits into
nativefier:masterfrom
fabiwlf:mac-tray-icon
Apr 29, 2021
Merged

macOS: Fix crash when using --tray (fix #527), and invisible icon (fix #942, fix #668)#1156
ronjouch merged 6 commits into
nativefier:masterfrom
fabiwlf:mac-tray-icon

Conversation

@fabiwlf

@fabiwlf fabiwlf commented Apr 25, 2021 •
edited
Loading

Copy link
Copy Markdown
Contributor

This PR is meant to fix a startup crash on macOS when using the --tray cli option, it's mentioned in #527.

image

It will also accomplish to correctly display the tray icon on macOS, which would close #942 and #668.

image

Example:

nativefier "web.whatsapp.com" --tray

fabiwlf
fabiwlf commented Apr 26, 2021
View reviewed changes

@fabiwlf fabiwlf left a comment

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed CI

TheCleric
TheCleric suggested changes Apr 26, 2021
View reviewed changes
Comment thread icon-scripts/convertToTrayIcon
Comment thread src/build/buildIcon.ts
Comment thread src/build/buildIcon.ts Outdated
Comment thread src/build/buildNativefierApp.ts Outdated
fabiwlf
fabiwlf commented Apr 27, 2021
View reviewed changes

@fabiwlf fabiwlf left a comment

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

☑️ Requested changes

@TheCleric

TheCleric commented Apr 28, 2021

Copy link
Copy Markdown
Collaborator

@fabiwlf can we update the api.md to document this new limitation of the --tray parameter?

@fabiwlf fabiwlf requested a review from TheCleric April 28, 2021 22:35
@ronjouch ronjouch changed the title macOS: Fix for --tray option and invisible icon macOS: Fix crash when using --tray (fix #527), and invisible icon (fix #942, fix #668) Apr 29, 2021
ronjouch
ronjouch approved these changes Apr 29, 2021
View reviewed changes

@ronjouch ronjouch left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome! Thanks everybody! Merging.

Comment thread docs/api.md Outdated
@ronjouch ronjouch merged commit cf8e51e into nativefier:master Apr 29, 2021
TheCleric pushed a commit to TheCleric/nativefier that referenced this pull request Apr 29, 2021
@fabiwlf @ronjouch @TheCleric
macOS: Fix crash when using --tray (fix nativefier#527), and invisibl…
1c20e9f 
…e icon (fix nativefier#942, fix nativefier#668) (nativefier#1156)

This fixes:

1. A startup crash on macOS when using the `--tray` option; see nativefier#527.
  ![image](https://user-images.githubusercontent.com/22625791/115987741-99544600-a5b6-11eb-866a-dadb5640eecb.png)
2. Invisible tray icon on macOS; see nativefier#942 and nativefier#668.  
   ![image](https://user-images.githubusercontent.com/22625791/115988276-24364000-a5b9-11eb-80c3-561a8a646754.png)

Co-authored-by: Ronan Jouchet <ronan@jouchet.fr>
TheCleric added a commit that referenced this pull request Apr 30, 2021
@TheCleric @ronjouch
@Fmstrat @fabiwlf
Fix injecting multiple css/js files (fix #458) (#1162)
dd6e15f 
* Add ability to inject multiple css/js files

* API doc: Move misplaced macOS shortcuts doc (PR #1158)

When I added this documentation originally, I guess I placed it in the wrong location.

* README: use quotes in example, to divert users from shell globbing pitfalls

Follow-up of #1159 (comment)

* Support opening URLs passed as arg to Nativefied application (fix #405) (PR #1154)

Co-authored-by: Ronan Jouchet <ronan@jouchet.fr>

* macOS: Fix crash when using --tray (fix #527), and invisible icon (fix #942, fix #668) (#1156)

This fixes:

1. A startup crash on macOS when using the `--tray` option; see #527.
  ![image](https://user-images.githubusercontent.com/22625791/115987741-99544600-a5b6-11eb-866a-dadb5640eecb.png)
2. Invisible tray icon on macOS; see #942 and #668.  
   ![image](https://user-images.githubusercontent.com/22625791/115988276-24364000-a5b9-11eb-80c3-561a8a646754.png)

Co-authored-by: Ronan Jouchet <ronan@jouchet.fr>

* API.md / --widevine: document signing apps to make some sites like HBO Max & Udemy work (fix #1147)

* Prompt to confirm when page is attempting to prevent unload (#1163)

Should alleviate part of the issue in #1151

* Add an option to upgrade an existing app (fix #1131) (PR #1138)

This adds a `--upgrade` option to upgrade-in-place an old app, re-using its options it can.
Should help fix #1131

Co-authored-by: Ronan Jouchet <ronan@jouchet.fr>

* Bump to Electron 12.0.5 with Chrome 89.0.4389.128

* Add newly discovered Google internal login page (#1167)

* Fix Widevine by properly listening to widevine-... events, and update docs (fix #1153) (PR #1164)

As documented in #1153, for Widevine support to work properly, we need to listen for the Widevine ready event, and as well for certain sites the app must be signed.

This PR adds the events, and as well adds better documentation on the signing limitation.

This may also help resolve #1147

* Improve suffix creation + tests

* API: clarif in existing doc by the way

* Typo

Co-authored-by: Ronan Jouchet <ronan@jouchet.fr>
Co-authored-by: Ben Curtis <github@nosolutions.com>
Co-authored-by: Fabian Wolf <22625791+fabiwlf@users.noreply.github.com>
@fabiwlf fabiwlf deleted the mac-tray-icon branch May 1, 2021 07:20
Adam777Z pushed a commit to Adam777Z/nativefier that referenced this pull request Nov 9, 2022
@fabiwlf @ronjouch
macOS: Fix crash when using --tray (fix nativefier#527), and invisibl…
b9bce6f 
…e icon (fix nativefier#942, fix nativefier#668) (nativefier#1156)

This fixes:

1. A startup crash on macOS when using the `--tray` option; see nativefier#527.
  ![image](https://user-images.githubusercontent.com/22625791/115987741-99544600-a5b6-11eb-866a-dadb5640eecb.png)
2. Invisible tray icon on macOS; see nativefier#942 and nativefier#668.  
   ![image](https://user-images.githubusercontent.com/22625791/115988276-24364000-a5b9-11eb-80c3-561a8a646754.png)

Co-authored-by: Ronan Jouchet <ronan@jouchet.fr>
Adam777Z pushed a commit to Adam777Z/nativefier that referenced this pull request Nov 9, 2022
@TheCleric @ronjouch
@Fmstrat @fabiwlf
Fix injecting multiple css/js files (fix nativefier#458) (nativefier#…
0e58f8e 
…1162)

* Add ability to inject multiple css/js files

* API doc: Move misplaced macOS shortcuts doc (PR nativefier#1158)

When I added this documentation originally, I guess I placed it in the wrong location.

* README: use quotes in example, to divert users from shell globbing pitfalls

Follow-up of nativefier#1159 (comment)

* Support opening URLs passed as arg to Nativefied application (fix nativefier#405) (PR nativefier#1154)

Co-authored-by: Ronan Jouchet <ronan@jouchet.fr>

* macOS: Fix crash when using --tray (fix nativefier#527), and invisible icon (fix nativefier#942, fix nativefier#668) (nativefier#1156)

This fixes:

1. A startup crash on macOS when using the `--tray` option; see nativefier#527.
  ![image](https://user-images.githubusercontent.com/22625791/115987741-99544600-a5b6-11eb-866a-dadb5640eecb.png)
2. Invisible tray icon on macOS; see nativefier#942 and nativefier#668.  
   ![image](https://user-images.githubusercontent.com/22625791/115988276-24364000-a5b9-11eb-80c3-561a8a646754.png)

Co-authored-by: Ronan Jouchet <ronan@jouchet.fr>

* API.md / --widevine: document signing apps to make some sites like HBO Max & Udemy work (fix nativefier#1147)

* Prompt to confirm when page is attempting to prevent unload (nativefier#1163)

Should alleviate part of the issue in nativefier#1151

* Add an option to upgrade an existing app (fix nativefier#1131) (PR nativefier#1138)

This adds a `--upgrade` option to upgrade-in-place an old app, re-using its options it can.
Should help fix nativefier#1131

Co-authored-by: Ronan Jouchet <ronan@jouchet.fr>

* Bump to Electron 12.0.5 with Chrome 89.0.4389.128

* Add newly discovered Google internal login page (nativefier#1167)

* Fix Widevine by properly listening to widevine-... events, and update docs (fix nativefier#1153) (PR nativefier#1164)

As documented in nativefier#1153, for Widevine support to work properly, we need to listen for the Widevine ready event, and as well for certain sites the app must be signed.

This PR adds the events, and as well adds better documentation on the signing limitation.

This may also help resolve nativefier#1147

* Improve suffix creation + tests

* API: clarif in existing doc by the way

* Typo

Co-authored-by: Ronan Jouchet <ronan@jouchet.fr>
Co-authored-by: Ben Curtis <github@nosolutions.com>
Co-authored-by: Fabian Wolf <22625791+fabiwlf@users.noreply.github.com>
@bouyagas bouyagas mentioned this pull request Jun 20, 2023
Open
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@TheCleric TheCleric Awaiting requested review from TheCleric
1 more reviewer
@ronjouch ronjouch ronjouch approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Tray icon is blank on macOS

3 participants

@fabiwlf @TheCleric @ronjouch