From 0e674c3ab36a5406eafadd6937aece714d4db03c Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Sun, 5 May 2019 17:05:26 +0200
Subject: ui: attach shortcuts to their windows

---
 ui/logpage.go     | 2 ++
 ui/tunnelspage.go | 3 +++
 ui/ui.go          | 3 +++
 3 files changed, 8 insertions(+)

(limited to 'ui')

diff --git a/ui/logpage.go b/ui/logpage.go
index ddd0a70e..6aa22698 100644
--- a/ui/logpage.go
+++ b/ui/logpage.go
@@ -69,6 +69,8 @@ func NewLogPage() (*LogPage, error) {
 		selectAllAction.SetEnabled(len(lp.logView.SelectedIndexes()) < len(lp.model.items))
 	}
 	lp.logView.SelectedIndexesChanged().Attach(setSelectionStatus)
+	contextMenu.Actions().AttachShortcuts(lp.logView)
+	contextMenu.Actions().AttachShortcuts(lp)
 
 	stampCol := walk.NewTableViewColumn()
 	stampCol.SetName("Stamp")
diff --git a/ui/tunnelspage.go b/ui/tunnelspage.go
index 6069aee2..8bcf6aaa 100644
--- a/ui/tunnelspage.go
+++ b/ui/tunnelspage.go
@@ -220,6 +220,9 @@ func (tp *TunnelsPage) CreateToolbar() {
 	contextMenu.Actions().Add(selectAllAction)
 	tp.listView.SetContextMenu(contextMenu)
 
+	contextMenu.Actions().AttachShortcuts(tp.listView)
+	contextMenu.Actions().AttachShortcuts(tp)
+
 	setSelectionOrientedOptions := func() {
 		selected := len(tp.listView.SelectedIndexes())
 		all := len(tp.listView.model.tunnels)
diff --git a/ui/ui.go b/ui/ui.go
index 14b6cbb4..f9519282 100644
--- a/ui/ui.go
+++ b/ui/ui.go
@@ -90,6 +90,9 @@ func RunUI() {
 		}
 	}()
 
+	mtw.Starting().Attach(func() {
+		mtw.tunnelsPage.SetFocus()
+	})
 	mtw.Run()
 	tray.Dispose()
 	mtw.Dispose()
-- 
cgit v1.2.3-59-g8ed1b