mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-04-04 22:34:39 +02:00
f6f2a52dee
Original commit message of the gocui change:
This fixes View.Size, Width and Height to be the correct (outer) size of a view
including its frame, and InnerSize/InnerWidth/InnerHeight to be the usable
client area exluding the frame. Previously, Size was actually the InnerSize (and
a lot of client code used it as such, so these need to be changed to InnerSize).
InnerSize, on the other hand, was *one* less than Size (not two, as you would
have expected), and in many cases this was made up for at call sites by adding 1
(e.g. in calcRealScrollbarStartEnd, parseInput, and many other places in the
lazygit code).
There are still some weird things left that I didn't address here:
- a view's lower-right coordinates (x1/y1) are one less than you would expect.
For example, a view with a 2x2 client area like this:
╭──╮
│ab│
│cd│
╰──╯
in the top-left corner of the screen (x0 and y0 both zero) has x1/xy at 3, not
4 as would be more natural.
- a view without a frame has its coordinates extended by 1 on all sides; to
illustrate, the same 2x2 view as before but without a frame, sitting in the
top-left corder of the screen, has coordinates x0=-1, y0=-1, x1=2, y1=2. This
is highly confusing and unexpected.
I left these as they are because they would be even more of a breaking change,
and also because they don't have quite as much of an impact on general app code.
44 lines
1.0 KiB
Go
44 lines
1.0 KiB
Go
package gui
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"github.com/jesseduffield/lazygit/pkg/constants"
|
|
"github.com/jesseduffield/lazygit/pkg/gui/style"
|
|
"github.com/jesseduffield/lazygit/pkg/utils"
|
|
)
|
|
|
|
func (gui *Gui) informationStr() string {
|
|
if activeMode, ok := gui.helpers.Mode.GetActiveMode(); ok {
|
|
return activeMode.Description()
|
|
}
|
|
|
|
if gui.g.Mouse {
|
|
donate := style.FgMagenta.Sprint(style.PrintHyperlink(gui.c.Tr.Donate, constants.Links.Donate))
|
|
askQuestion := style.FgYellow.Sprint(style.PrintHyperlink(gui.c.Tr.AskQuestion, constants.Links.Discussions))
|
|
return fmt.Sprintf("%s %s %s", donate, askQuestion, gui.Config.GetVersion())
|
|
} else {
|
|
return gui.Config.GetVersion()
|
|
}
|
|
}
|
|
|
|
func (gui *Gui) handleInfoClick() error {
|
|
if !gui.g.Mouse {
|
|
return nil
|
|
}
|
|
|
|
view := gui.Views.Information
|
|
|
|
cx, _ := view.Cursor()
|
|
width := view.Width()
|
|
|
|
if activeMode, ok := gui.helpers.Mode.GetActiveMode(); ok {
|
|
if width-cx > utils.StringWidth(gui.c.Tr.ResetInParentheses) {
|
|
return nil
|
|
}
|
|
return activeMode.Reset()
|
|
}
|
|
|
|
return nil
|
|
}
|