Skip to content

feat(macOS): Implement tray icon template#2322

Merged
lemarier merged 24 commits into
devfrom
feat/macos-tray-image
Jul 29, 2021
Merged

feat(macOS): Implement tray icon template#2322
lemarier merged 24 commits into
devfrom
feat/macos-tray-image

Conversation

@lemarier

@lemarier lemarier commented Jul 29, 2021

Copy link
Copy Markdown
Member

What kind of change does this PR introduce? (check at least one)

  • Bugfix
  • Feature
  • Docs
  • New Binding Issue #___
  • Code style update
  • Refactor
  • Build-related changes
  • Other, please describe:

Does this PR introduce a breaking change? (check one)

  • Yes. Issue #___
  • No

The PR fulfills these requirements:

  • When resolving a specific issue, it's referenced in the PR's title (e.g. fix: #xxx[,#xxx], where "xxx" is the issue number)
  • A change file is added if any packages will require a version bump due to this PR per the instructions in the readme.

If adding a new feature, the PR's description includes:

  • A convincing reason for adding this feature (to avoid wasting your time, it's best to open a suggestion issue first and wait for approval before working on it)

Other information:

lucasfernog and others added 17 commits July 26, 2021 10:43
@lemarier

lemarier commented Jul 29, 2021

Copy link
Copy Markdown
Member Author

Should be merged AFTER #2321

@lucasfernog

lucasfernog commented Jul 29, 2021

Copy link
Copy Markdown
Member

I was just finishing this too :P gonna see how it looks.

@lemarier

lemarier commented Jul 29, 2021

Copy link
Copy Markdown
Member Author

I was just finishing this too :P gonna see how it looks.

feel free to redoit

not sure it was the right way

lucasfernog
lucasfernog reviewed Jul 29, 2021
View reviewed changes
Comment thread core/tauri-utils/src/config.rs
lemarier and others added 7 commits July 29, 2021 13:44
@lemarier
Merge remote-tracking branch 'origin/dev' into feat/macos-tray-image
9782ade 
Signed-off-by: David Lemarier <david@lemarier.ca>

# Conflicts:
#	core/tauri-runtime-wry/src/lib.rs
@lemarier
fix clippy
a4da6b3 
Signed-off-by: David Lemarier <david@lemarier.ca>
@lemarier
add cli.rs definition
ca6c6de 
Signed-off-by: David Lemarier <david@lemarier.ca>
@lemarier
fix context
c1816c2 
Signed-off-by: David Lemarier <david@lemarier.ca>
@lemarier
fmt
3460987 
Signed-off-by: David Lemarier <david@lemarier.ca>
@lucasfernog
refactor: remove icon_as_template from codegen context
24e10c2
@lemarier
fix icon name for windows
3f48300 
Signed-off-by: David Lemarier <david@lemarier.ca>
lucasfernog
lucasfernog approved these changes Jul 29, 2021
View reviewed changes

@lucasfernog lucasfernog left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM

@lemarier lemarier mentioned this pull request Jul 29, 2021
Merged
@lucasfernog lucasfernog marked this pull request as ready for review July 29, 2021 18:35
@lucasfernog lucasfernog requested a review from a team as a code owner July 29, 2021 18:35
@lucasfernog lucasfernog requested review from a team July 29, 2021 18:35
@lemarier lemarier merged commit 426a6b4 into dev Jul 29, 2021
@lemarier lemarier deleted the feat/macos-tray-image branch July 29, 2021 19:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lucasfernog lucasfernog lucasfernog approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@lemarier @lucasfernog