go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-09-16 09:16:26 +02:00
Code Issues Releases Activity

fix: fix collision of Donate and Ask Question

Browse Source
This commit is contained in:
Ryooooooga
2022-05-07 18:02:09 +09:00
parent 04babdfb82
commit 540d2e379a
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/gui/information_panel.go
View File

@@ -6,6 +6,7 @@ import (
"github.com/jesseduffield/generics/slices" "github.com/jesseduffield/generics/slices"
"github.com/jesseduffield/lazygit/pkg/constants" "github.com/jesseduffield/lazygit/pkg/constants"
"github.com/jesseduffield/lazygit/pkg/gui/style" "github.com/jesseduffield/lazygit/pkg/gui/style"
"github.com/mattn/go-runewidth"
) )
func (gui *Gui) informationStr() string { func (gui *Gui) informationStr() string {
@@ -45,16 +46,16 @@ func (gui *Gui) handleInfoClick() error {
width, _ := view.Size() width, _ := view.Size()
if activeMode, ok := gui.getActiveMode(); ok { if activeMode, ok := gui.getActiveMode(); ok {
if width-cx > len(gui.c.Tr.ResetInParentheses) { if width-cx > runewidth.StringWidth(gui.c.Tr.ResetInParentheses) {
return nil return nil
} }
return activeMode.reset() return activeMode.reset()
} }
// if we're not in an active mode we show the donate button // if we're not in an active mode we show the donate button
if cx <= len(gui.c.Tr.Donate) { if cx <= runewidth.StringWidth(gui.c.Tr.Donate) {
return gui.os.OpenLink(constants.Links.Donate) return gui.os.OpenLink(constants.Links.Donate)
} else if cx <= len(gui.c.Tr.Donate)+1+len(gui.c.Tr.AskQuestion) { } else if cx <= runewidth.StringWidth(gui.c.Tr.Donate)+1+runewidth.StringWidth(gui.c.Tr.AskQuestion) {
return gui.os.OpenLink(constants.Links.Discussions) return gui.os.OpenLink(constants.Links.Discussions)
} }
return nil return nil