Skip to content

Commit

Permalink
Use different crate for Linux and platform generic tray icon struct
Browse files Browse the repository at this point in the history
  • Loading branch information
dastansam committed Aug 14, 2024
1 parent 61f9f75 commit 56d7e33
Show file tree
Hide file tree
Showing 4 changed files with 298 additions and 101 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,11 @@ jobs:
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

- name: Install GTK4 (Ubuntu)
run: sudo apt-get update && sudo apt-get install --no-install-recommends -y libgtk-4-dev libatk1.0-dev
run: sudo apt-get update && sudo apt-get install --no-install-recommends -y libgtk-4-dev libgtk-3-dev libxdo-dev libappindicator3-dev libdbus-1-dev pkg-config
if: runner.os == 'Linux'

- name: Install GTK4 (macOS)
run: brew install gtk4 atk
run: brew install gtk4
if: runner.os == 'macOS'

- name: Configure GTK4 cache (Windows)
Expand Down Expand Up @@ -165,11 +165,11 @@ jobs:
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

- name: Install GTK4 (Ubuntu)
run: sudo apt-get update && sudo apt-get install --no-install-recommends -y libgtk-4-dev libatk1.0-dev
run: sudo apt-get update && sudo apt-get install --no-install-recommends -y libgtk-4-dev libgtk-3-dev libxdo-dev libappindicator3-dev libdbus-1-dev pkg-config
if: runner.os == 'Linux'

- name: Install GTK4 (macOS)
run: brew install gtk4 atk
run: brew install gtk4
if: runner.os == 'macOS'

- name: Configure GTK4 cache (Windows)
Expand Down
122 changes: 98 additions & 24 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 7 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ async-lock = "3.4.0"
async-oneshot = "0.5.9"
async-trait = "0.1.80"
backoff = { version = "0.4.0", features = ["futures", "tokio"] }
tray-icon = "0.14.3"
bytesize = "1.3.0"
clap = { version = "4.5.8", features = ["derive"] }
dark-light = "1.1.1"
Expand All @@ -54,7 +53,7 @@ futures = "0.3.30"
futures-timer = "3.0.3"
gtk = { version = "0.7.3", package = "gtk4" }
hex = "0.4.3"
image = "0.24"
image = { version = "0.25", features = ["png"] }
mimalloc = "0.1.41"
names = "0.14.0"
notify-rust = { version = "4.11.1", features = ["images"] }
Expand Down Expand Up @@ -116,6 +115,12 @@ tracker = "0.2.2"
native-dialog = "0.7.0"
tracing-panic = "0.1.2"

[target.'cfg(any(target_os = "macos", target_os = "windows"))'.dependencies]
tray-icon = "0.14.3"

[target.'cfg(all(unix, not(target_os = "macos")))'.dependencies]
ksni = "0.2.2"

[build-dependencies]
fluent-static-codegen = "0.3.2"

Expand Down
Loading

0 comments on commit 56d7e33

Please sign in to comment.