From 0e9be443b0a7eae518e2fd59bfa8d409934f51a9 Mon Sep 17 00:00:00 2001
From: "Sean E. Russell" <ser@ser1.net>
Date: Wed, 26 Feb 2020 15:51:46 -0600
Subject: Fixes #59: keys not controlling processes widget

Version bump

Version bump
---
 CHANGELOG.md      | 19 ++++++++++++++-----
 cmd/gotop/main.go |  2 +-
 layout/layout.go  | 10 +++++++++-
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f4468be..8644dd6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,13 +15,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [3.4.x] - ??
 
-- Added: metrics. If run with the `--export :2112` flag (`:2112` is a port),
-  metrics are exposed as Prometheus metrics on that port and can be HTTP
-  GET-ted.  
-- Added: a battery gauge as a `power` widget; battery as a bar rather than
+### Added
+
+- Device data export via HTTP. If run with the `--export :2112` flag (`:2112`
+  is a port), metrics are exposed as Prometheus metrics on that port.
+- A battery gauge as a `power` widget; battery as a bar rather than
   a histogram.
+- Temp widget displays degree symbol (merged from BartWillems, thanks
+  also fleaz)
+
+### Fixed
+
+- Keys not controlling process widget, #59
+
+## [3.3.2] - 2020-02-26
 
-## [3.3.2] - ??
+Bugfix release.
 
 - Fixes #15, crash caused by battery widget when some accessories have batteries
 - Fixes #57, colors with dashes in the name not found.
diff --git a/cmd/gotop/main.go b/cmd/gotop/main.go
index 7575655..5029519 100644
--- a/cmd/gotop/main.go
+++ b/cmd/gotop/main.go
@@ -25,7 +25,7 @@ import (
 
 const (
 	appName = "gotop"
-	version = "3.3.1"
+	version = "3.3.2"
 
 	graphHorizontalScaleDelta = 3
 	defaultUI                 = "cpu\ndisk/1 2:mem/2\ntemp\nnet procs"
diff --git a/layout/layout.go b/layout/layout.go
index 1dbcaa4..b8d3226 100644
--- a/layout/layout.go
+++ b/layout/layout.go
@@ -236,7 +236,6 @@ func countMaxHeight(rs [][]widgetRule) int {
 // deepFindProc looks in the UI widget tree for the ProcWidget,
 // and returns it if found or nil if not.
 func deepFindProc(gs interface{}) *widgets.ProcWidget {
-	// FIXME: `procs` layout isn't passing down keystrokes
 	// Recursive function #1.  Recursion is OK here because the number
 	// of UI elements, even in a very complex UI, is going to be
 	// relatively small.
@@ -262,6 +261,15 @@ func deepFindProc(gs interface{}) *widgets.ProcWidget {
 			}
 		}
 	}
+	fs2, ok := gs.([][]interface{})
+	if ok {
+		for _, g := range fs2 {
+			v := deepFindProc(g)
+			if v != nil {
+				return v
+			}
+		}
+	}
 	p, ok := gs.(*widgets.ProcWidget)
 	if ok {
 		return p
-- 
cgit v1.2.3