From ee964ad6b0bd8ee42e903e25b75d9985dc2ff40e Mon Sep 17 00:00:00 2001
From: Tim Culverhouse <tim@timculverhouse.com>
Date: Wed, 19 Oct 2022 12:48:02 -0500
Subject: [PATCH] command/help: remove helpClose function
The helpClose function is used to call UpdateScreen on MessageViewer,
which has the effect of invalidating and redrawing the message view.
This logic is redundant with the addition of tcell-term and the main
event loop.
Remove the helpClose calls. Remove the UpdateScreen methods from
messageviewer: those functions are only used by the helpClose function.
Signed-off-by: Tim Culverhouse <tim@timculverhouse.com>
Acked-by: Koni Marti <koni.marti@gmail.com>
---
commands/help.go | 7 -------
widgets/msgviewer.go | 20 --------------------
2 files changed, 27 deletions(-)
diff --git a/commands/help.go b/commands/help.go
index 9e1d114..498f9bc 100644
--- a/commands/help.go
+++ b/commands/help.go
@@ -50,7 +50,6 @@ func (Help) Execute(aerc *widgets.Aerc, args []string) error {
aerc.HumanReadableBindings(),
aerc.SelectedAccountUiConfig(),
func(_ string) {
- helpClose(aerc)
aerc.CloseDialog()
},
),
@@ -61,9 +60,3 @@ func (Help) Execute(aerc *widgets.Aerc, args []string) error {
return TermCore(aerc, []string{"term", "man", page})
}
-
-func helpClose(aerc *widgets.Aerc) {
- if content, ok := aerc.SelectedTabContent().(*widgets.MessageViewer); ok {
- content.UpdateScreen()
- }
-}
diff --git a/widgets/msgviewer.go b/widgets/msgviewer.go
index f8b2816..7365dc5 100644
--- a/widgets/msgviewer.go
+++ b/widgets/msgviewer.go
@@ -387,22 +387,6 @@ func (mv *MessageViewer) Close() error {
return nil
}
-func (mv *MessageViewer) UpdateScreen() {
- if mv.switcher == nil {
- return
- }
- parts := mv.switcher.parts
- selected := mv.switcher.selected
- if selected < 0 {
- return
- }
- if len(parts) > 0 && selected < len(parts) {
- if part := parts[selected]; part != nil {
- part.UpdateScreen()
- }
- }
-}
-
func (ps *PartSwitcher) Invalidate() {
ui.Invalidate()
}
@@ -638,10 +622,6 @@ func (pv *PartViewer) SetSource(reader io.Reader) {
pv.attemptCopy()
}
-func (pv *PartViewer) UpdateScreen() {
- pv.Invalidate()
-}
-
func (pv *PartViewer) attemptCopy() {
if pv.source == nil ||
pv.filter == nil ||