Skip to content

Commit 38f59e2

Browse files
committed
refactor: improve formatting and readability of menu item creation in tray menu
1 parent 1084e49 commit 38f59e2

File tree

1 file changed

+47
-34
lines changed

1 file changed

+47
-34
lines changed

src-tauri/src/lib.rs

Lines changed: 47 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -791,16 +791,29 @@ pub fn run() {
791791

792792
let show_item =
793793
MenuItem::with_id(app, "show", "Mostra Presto", true, None::<&str>)?;
794-
let start_session_item =
795-
MenuItem::with_id(app, "start_session", "Inizia sessione", false, None::<&str>)?;
796-
let pause_item =
797-
MenuItem::with_id(app, "pause", "Pausa", false, None::<&str>)?;
794+
let start_session_item = MenuItem::with_id(
795+
app,
796+
"start_session",
797+
"Inizia sessione",
798+
false,
799+
None::<&str>,
800+
)?;
801+
let pause_item = MenuItem::with_id(app, "pause", "Pausa", false, None::<&str>)?;
798802
let skip_item =
799803
MenuItem::with_id(app, "skip", "Salta sessione", false, None::<&str>)?;
800-
let cancel_item =
801-
MenuItem::with_id(app, "cancel", "Annulla", false, None::<&str>)?;
804+
let cancel_item = MenuItem::with_id(app, "cancel", "Annulla", false, None::<&str>)?;
802805
let quit_item = MenuItem::with_id(app, "quit", "Esci", true, None::<&str>)?;
803-
let menu = Menu::with_items(app, &[&show_item, &start_session_item, &pause_item, &skip_item, &cancel_item, &quit_item])?;
806+
let menu = Menu::with_items(
807+
app,
808+
&[
809+
&show_item,
810+
&start_session_item,
811+
&pause_item,
812+
&skip_item,
813+
&cancel_item,
814+
&quit_item,
815+
],
816+
)?;
804817

805818
let app_handle = app.handle().clone();
806819
let app_handle_for_click = app_handle.clone();
@@ -920,63 +933,63 @@ async fn update_tray_menu(
920933
current_mode: String,
921934
) -> Result<(), String> {
922935
let tray = app.tray_by_id("main");
923-
936+
924937
if let Some(tray) = tray {
925938
let show_item = MenuItem::with_id(&app, "show", "Mostra Presto", true, None::<&str>)
926939
.map_err(|e| format!("Failed to create show item: {}", e))?;
927-
940+
928941
// Inizia sessione: abilitato solo se non è in esecuzione
929942
let start_session_item = MenuItem::with_id(
930943
&app,
931944
"start_session",
932945
"Inizia sessione",
933946
!is_running,
934947
None::<&str>,
935-
).map_err(|e| format!("Failed to create start session item: {}", e))?;
936-
948+
)
949+
.map_err(|e| format!("Failed to create start session item: {}", e))?;
950+
937951
// Pausa: abilitata solo se è in esecuzione e non in pausa
938952
let pause_item = MenuItem::with_id(
939953
&app,
940954
"pause",
941955
"Pausa",
942956
is_running && !is_paused,
943957
None::<&str>,
944-
).map_err(|e| format!("Failed to create pause item: {}", e))?;
945-
958+
)
959+
.map_err(|e| format!("Failed to create pause item: {}", e))?;
960+
946961
// Skip: abilitato solo se è in esecuzione
947-
let skip_item = MenuItem::with_id(
948-
&app,
949-
"skip",
950-
"Salta sessione",
951-
is_running,
952-
None::<&str>,
953-
).map_err(|e| format!("Failed to create skip item: {}", e))?;
954-
962+
let skip_item = MenuItem::with_id(&app, "skip", "Salta sessione", is_running, None::<&str>)
963+
.map_err(|e| format!("Failed to create skip item: {}", e))?;
964+
955965
// Annulla: abilitato se è in modalità focus, disabilitato in break/longBreak (undo)
956966
let cancel_text = if current_mode == "focus" {
957967
"Annulla"
958968
} else {
959969
"Annulla ultima"
960970
};
961-
let cancel_item = MenuItem::with_id(
962-
&app,
963-
"cancel",
964-
cancel_text,
965-
true,
966-
None::<&str>,
967-
).map_err(|e| format!("Failed to create cancel item: {}", e))?;
968-
971+
let cancel_item = MenuItem::with_id(&app, "cancel", cancel_text, true, None::<&str>)
972+
.map_err(|e| format!("Failed to create cancel item: {}", e))?;
973+
969974
let quit_item = MenuItem::with_id(&app, "quit", "Esci", true, None::<&str>)
970975
.map_err(|e| format!("Failed to create quit item: {}", e))?;
971-
976+
972977
let new_menu = Menu::with_items(
973978
&app,
974-
&[&show_item, &start_session_item, &pause_item, &skip_item, &cancel_item, &quit_item],
975-
).map_err(|e| format!("Failed to create menu: {}", e))?;
976-
979+
&[
980+
&show_item,
981+
&start_session_item,
982+
&pause_item,
983+
&skip_item,
984+
&cancel_item,
985+
&quit_item,
986+
],
987+
)
988+
.map_err(|e| format!("Failed to create menu: {}", e))?;
989+
977990
tray.set_menu(Some(new_menu))
978991
.map_err(|e| format!("Failed to set tray menu: {}", e))?;
979992
}
980-
993+
981994
Ok(())
982995
}

0 commit comments

Comments
 (0)