summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2019-03-03 14:28:16 +1100
committerJesse Duffield <jessedduffield@gmail.com>2019-03-03 15:21:20 +1100
commit8305d8e72f5f941da0b1404376057052054db307 (patch)
treeb28cc393aa52769c718f9ad791e1c5bbf63914ac
parentf68166e85883fbeb61dde72e74e18a9317ef449b (diff)
hide donate button if mouse events are disabled
-rw-r--r--pkg/gui/gui.go21
-rw-r--r--pkg/gui/keybindings.go2
2 files changed, 14 insertions, 9 deletions
diff --git a/pkg/gui/gui.go b/pkg/gui/gui.go
index c82986ee5..116345876 100644
--- a/pkg/gui/gui.go
+++ b/pkg/gui/gui.go
@@ -275,14 +275,17 @@ func (gui *Gui) onFocus(v *gocui.View) error {
func (gui *Gui) layout(g *gocui.Gui) error {
g.Highlight = true
width, height := g.Size()
- donate := color.New(color.FgMagenta, color.Underline).Sprint(gui.Tr.SLocalize("Donate"))
- version := donate + " " + gui.Config.GetVersion()
+ information := gui.Config.GetVersion()
+ if gui.g.Mouse {
+ donate := color.New(color.FgMagenta, color.Underline).Sprint(gui.Tr.SLocalize("Donate"))
+ information = donate + " " + information
+ }
leftSideWidth := width / 3
statusFilesBoundary := 2
filesBranchesBoundary := 2 * height / 5 // height - 20
commitsBranchesBoundary := 3 * height / 5 // height - 10
commitsStashBoundary := height - 5 // height - 5
- optionsVersionBoundary := width - max(len(utils.Decolorise(version)), 1)
+ optionsVersionBoundary := width - max(len(utils.Decolorise(information)), 1)
minimumHeight := 16
minimumWidth := 10
@@ -308,10 +311,8 @@ func (gui *Gui) layout(g *gocui.Gui) error {
g.SetViewOnTop("limit")
}
return nil
- } else {
- _, _ = g.SetViewOnBottom("limit")
}
-
+ _, _ = g.SetViewOnBottom("limit")
g.DeleteView("limit")
optionsTop := height - 2
@@ -428,14 +429,14 @@ func (gui *Gui) layout(g *gocui.Gui) error {
}
}
- if v, err := g.SetView("version", optionsVersionBoundary-1, optionsTop, width, optionsTop+2, 0); err != nil {
+ if v, err := g.SetView("information", optionsVersionBoundary-1, optionsTop, width, optionsTop+2, 0); err != nil {
if err.Error() != "unknown view" {
return err
}
v.BgColor = gocui.ColorDefault
v.FgColor = gocui.ColorGreen
v.Frame = false
- if err := gui.renderString(g, "version", version); err != nil {
+ if err := gui.renderString(g, "information", information); err != nil {
return err
}
@@ -637,6 +638,10 @@ func (gui *Gui) quit(g *gocui.Gui, v *gocui.View) error {
}
func (gui *Gui) handleDonate(g *gocui.Gui, v *gocui.View) error {
+ if !gui.g.Mouse {
+ return nil
+ }
+
cx, _ := v.Cursor()
if cx > len(gui.Tr.SLocalize("Donate")) {
return nil
diff --git a/pkg/gui/keybindings.go b/pkg/gui/keybindings.go
index 3504d8e03..eb3e765c4 100644
--- a/pkg/gui/keybindings.go
+++ b/pkg/gui/keybindings.go
@@ -437,7 +437,7 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
Modifier: gocui.ModNone,
Handler: gui.handleMenuClose,
}, {
- ViewName: "version",
+ ViewName: "information",
Key: gocui.MouseLeft,
Modifier: gocui.ModNone,
Handler: gui.handleDonate,