From Nicolai Dagestad to ~sircmpwn/aerc
Ha, I see why it is done this way, the msgviewer widget is in fact not like you drew it but like this |-------------------------------| | y msg viewer | ||-----------------------------|| || z HeaderLayout || ||-----------------------------|| || Content of message part || || || || x part switcher || ||-----------------------------|| |-------------------------------|
From Nicolai Dagestad to ~sircmpwn/aerc
I was going to explain why I did it in this way but I now see how strange the logic in the mouse event handling is... I see I messed up a little bit in the content of the two other commits as well, so I think I'll fix that and change the mouse event handling at the same time.
From Nicolai Dagestad to ~sircmpwn/aerc
--- widgets/msgviewer.go | 4 ++-- widgets/terminal.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/widgets/msgviewer.go b/widgets/msgviewer.go index 406185e..ffc0161 100644 --- a/widgets/msgviewer.go +++ b/widgets/msgviewer.go @@ -403,7 +403,7 @@ func (ps *PartSwitcher) MouseEvent(localX int, localY int, event tcell.Event) { case tcell.WheelDown: height := len(ps.parts) y := ps.height - height if localY < y && ps.parts[ps.selected].term != nil { [message trimmed]
From Nicolai Dagestad to ~sircmpwn/aerc
--- v1 -> v2 Remove the non exported MouseMove function widgets/terminal.go | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/widgets/terminal.go b/widgets/terminal.go index 77da71e..2e6f4a7 100644 --- a/widgets/terminal.go +++ b/widgets/terminal.go @@ -324,6 +324,21 @@ func (term *Terminal) MouseEvent(localX int, localY int, event tcell.Event) { if term.closed { return } [message trimmed]
From Nicolai Dagestad to ~sircmpwn/aerc
--- widgets/msgviewer.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/widgets/msgviewer.go b/widgets/msgviewer.go index 6c69577..406185e 100644 --- a/widgets/msgviewer.go +++ b/widgets/msgviewer.go @@ -405,6 +405,7 @@ func (ps *PartSwitcher) MouseEvent(localX int, localY int, event tcell.Event) { y := ps.height - height if localY < y && ps.parts[ps.selected].term != nil { ps.parts[ps.selected].term.MouseEvent(localX, localY, event) return } [message trimmed]
From Nicolai Dagestad to ~sircmpwn/aerc
--- The example doesn't compile due to a missing method though, but that was already the case before. _example/color/main.go | 2 +- go.mod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/_example/color/main.go b/_example/color/main.go index 0c87572..63172d5 100644 --- a/_example/color/main.go +++ b/_example/color/main.go @@ -8,7 +8,7 @@ import ( [message trimmed]
From Nicolai Dagestad to ~sircmpwn/aerc
Ha, now that you mention it, the exemple needs to be updated. Didn't really think of that sorry, I can send a v2 with the update.
From Nicolai Dagestad to ~sircmpwn/aerc
--- widgets/msgviewer.go | 4 ++-- widgets/terminal.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/widgets/msgviewer.go b/widgets/msgviewer.go index 406185e..ffc0161 100644 --- a/widgets/msgviewer.go +++ b/widgets/msgviewer.go @@ -403,7 +403,7 @@ func (ps *PartSwitcher) MouseEvent(localX int, localY int, event tcell.Event) { case tcell.WheelDown: height := len(ps.parts) y := ps.height - height if localY < y && ps.parts[ps.selected].term != nil { [message trimmed]
From Nicolai Dagestad to ~sircmpwn/aerc
--- widgets/terminal.go | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/widgets/terminal.go b/widgets/terminal.go index 77da71e..5342891 100644 --- a/widgets/terminal.go +++ b/widgets/terminal.go @@ -324,6 +324,22 @@ func (term *Terminal) MouseEvent(localX int, localY int, event tcell.Event) { if term.closed { return } button := event.Buttons() internal_value := int(button) [message trimmed]
From Nicolai Dagestad to ~sircmpwn/aerc
--- widgets/msgviewer.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/widgets/msgviewer.go b/widgets/msgviewer.go index 6c69577..406185e 100644 --- a/widgets/msgviewer.go +++ b/widgets/msgviewer.go @@ -405,6 +405,7 @@ func (ps *PartSwitcher) MouseEvent(localX int, localY int, event tcell.Event) { y := ps.height - height if localY < y && ps.parts[ps.selected].term != nil { ps.parts[ps.selected].term.MouseEvent(localX, localY, event) return } [message trimmed]