Skip to content

Commit

Permalink
fix: windows-related fixes
Browse files Browse the repository at this point in the history
- Move MacOS-related dependencies behind cfg flag
- Use hires icon for windows
- Remove duplicate icon from config
- Show dialog windows on update
  • Loading branch information
G07cha committed Nov 2, 2024
1 parent cd34c13 commit 0616c45
Show file tree
Hide file tree
Showing 7 changed files with 32 additions and 31 deletions.
2 changes: 2 additions & 0 deletions src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ tauri-plugin-dialog = "2"
tauri-plugin-shell = "2"
tauri-plugin-global-shortcut = "2"
tauri-plugin-positioner = { version = "2.0.2", features = ["tray-icon"] }

[target.'cfg(target_os = "macos")'.dependencies]
tauri-nspanel = { git = "https://github.com/ahkohd/tauri-nspanel", branch = "v2" }
monitor = { git = "https://github.com/ahkohd/tauri-toolkit", branch = "v2" }

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
2 changes: 0 additions & 2 deletions src-tauri/src/helpers/updater.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ use tauri::{AppHandle, Runtime};
use tauri_plugin_updater::UpdaterExt;

pub async fn update<R: Runtime>(app: &AppHandle<R>) -> Result<bool> {
println!("checking for updates");

if let Some(update) = app.updater()?.check().await? {
let mut downloaded = 0;

Expand Down
30 changes: 16 additions & 14 deletions src-tauri/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -141,20 +141,22 @@ fn create_app<R: tauri::Runtime>(builder: tauri::Builder<R>) -> tauri::App<R> {
}

fn main() {
let app = create_app(
tauri::Builder::default()
.plugin(tauri_plugin_autostart::init(
MacosLauncher::LaunchAgent,
None,
))
.plugin(tauri_plugin_shell::init())
.plugin(tauri_plugin_dialog::init())
.plugin(tauri_plugin_fs::init())
.plugin(tauri_plugin_global_shortcut::Builder::default().build())
.plugin(tauri_plugin_positioner::init())
.plugin(tauri_nspanel::init())
.plugin(tauri_plugin_updater::Builder::new().build()),
);
let builder = tauri::Builder::default()
.plugin(tauri_plugin_autostart::init(
MacosLauncher::LaunchAgent,
None,
))
.plugin(tauri_plugin_shell::init())
.plugin(tauri_plugin_dialog::init())
.plugin(tauri_plugin_fs::init())
.plugin(tauri_plugin_global_shortcut::Builder::default().build())
.plugin(tauri_plugin_positioner::init())
.plugin(tauri_plugin_updater::Builder::new().build());

#[cfg(target_os = "macos")]
let builder = builder.plugin(tauri_nspanel::init());

let app = create_app(builder);

app.run(move |app_handle, e| {
if matches!(e, RunEvent::Ready) {
Expand Down
22 changes: 14 additions & 8 deletions src-tauri/src/ui/tray.rs
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,17 @@ fn handle_menu_event<R: Runtime>(app_handle: &AppHandle<R>, event: MenuEvent) {
.dialog()
.message("You are already using the latest version of Pomodoro!")
.kind(MessageDialogKind::Info)
.title("The app is up-to-date");
.title("The app is up-to-date")
.show(|_| {});
}
}
Err(_) => {
Err(err) => {
handle
.dialog()
.message("You are already using the latest version of Pomodoro!")
.message(err.to_string())
.kind(MessageDialogKind::Error)
.title("Failed to retrieve update");
.title("Failed to retrieve update")
.show(|_| {});
}
}
});
Expand Down Expand Up @@ -173,10 +175,14 @@ pub fn setup_tray<R: Runtime>(app: &mut App<R>) -> Result<()> {

let tray = TrayIconBuilder::with_id(TRAY_ID)
.menu(&menu)
.icon(app.default_window_icon().unwrap().clone());

#[cfg(target_os = "macos")]
let tray = tray.menu_on_left_click(false).icon_as_template(true);
.icon(app.default_window_icon().unwrap().clone())
.menu_on_left_click(false)
.icon_as_template(true);

#[cfg(target_os = "windows")]
let tray = tray.icon(tauri::include_image!(
"resources/icons/128x128-inverted-outlined.png"
));

tray
.on_menu_event(handle_menu_event)
Expand Down
7 changes: 0 additions & 7 deletions src-tauri/tauri.windows.conf.json5

This file was deleted.

0 comments on commit 0616c45

Please sign in to comment.