From 298b631cf1cfaa2e35c896c5f4aa6544941864e2 Mon Sep 17 00:00:00 2001 From: Apo Date: Wed, 12 Mar 2025 10:06:36 -0400 Subject: [PATCH] dix input focus when adding anime, fix not released anime --- src/addingAnime.go | 1 + src/curdIntegration.go | 15 +++++++++++++-- src/main.go | 1 + 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/addingAnime.go b/src/addingAnime.go index a86f986..1e88b16 100644 --- a/src/addingAnime.go +++ b/src/addingAnime.go @@ -176,4 +176,5 @@ func setDialogAddAnime(radiobox *widget.RadioGroup) { })) dialogAdd.Show() + window.Canvas().Focus(inputSearch) } diff --git a/src/curdIntegration.go b/src/curdIntegration.go index be7007e..bf24007 100644 --- a/src/curdIntegration.go +++ b/src/curdIntegration.go @@ -289,12 +289,16 @@ func deleteTokenFile() { func displayLocalProgress() { localDbAnime := SearchFromLocalAniId(animeSelected.Media.ID) - currentEp := min(*animeSelected.Progress+1, *animeSelected.Media.Episodes) + fmt.Println(*animeSelected) + AnimeProgress := IntPointerFallback(animeSelected.Progress, 0) + AnimeEpisode := IntPointerFallback(animeSelected.Media.Episodes, 0) + + currentEp := min(AnimeProgress+1, AnimeEpisode) playButton.Text = fmt.Sprint("Play Ep", currentEp) fmt.Println("Current Ep:", currentEp) if localDbAnime != nil { episodeLastPlayback.Show() - if localDbAnime.Ep.Number == *animeSelected.Progress { + if localDbAnime.Ep.Number == AnimeProgress { if localDbAnime.Ep.Player.PlaybackTime == 0 { episodeLastPlayback.SetText(fmt.Sprintf("Just finished Episode %d", localDbAnime.Ep.Number)) } else { @@ -318,3 +322,10 @@ func setPlayButtonVisibility() { } playButton.Show() } + +func IntPointerFallback(ptr *int, value int) int { + if ptr == nil { + return value + } + return *ptr +} diff --git a/src/main.go b/src/main.go index 3c6d2d2..50eab42 100644 --- a/src/main.go +++ b/src/main.go @@ -331,4 +331,5 @@ func initMainApp() { initMenuOption() window.SetContent(fynetooltip.AddWindowToolTipLayer(container.NewBorder(nil, nil, nil, imageContainer, leftSide), window.Canvas())) + //window.Canvas().Focus(input) }