From 3a6fda129a638467efe6ed5f06d6c603b88caf39 Mon Sep 17 00:00:00 2001
From: Elias Naur <mail@eliasnaur.com>
Date: Fri, 12 Jul 2019 11:44:50 +0200
Subject: [PATCH] ui: shorten OpReader.Decode for loops

Signed-off-by: Elias Naur <mail@eliasnaur.com>
---
 ui/app/internal/gpu/gpu.go | 6 +-----
 ui/app/window.go           | 6 +-----
 ui/input/key.go            | 6 +-----
 ui/input/pointer.go        | 6 +-----
 4 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/ui/app/internal/gpu/gpu.go b/ui/app/internal/gpu/gpu.go
index 622f09ed..cf17a456 100644
--- a/ui/app/internal/gpu/gpu.go
+++ b/ui/app/internal/gpu/gpu.go
@@ -659,11 +659,7 @@ func (d *drawOps) collectOps(r *ui.OpsReader, state drawState) int {
 	var aux []byte
 	var auxKey ui.OpKey
 loop:
-	for {
-		encOp, ok := r.Decode()
-		if !ok {
-			break
-		}
+	for encOp, ok := r.Decode(); ok; encOp, ok = r.Decode() {
 		switch ops.OpType(encOp.Data[0]) {
 		case ops.TypeTransform:
 			var op ui.TransformOp
diff --git a/ui/app/window.go b/ui/app/window.go
index 82c3b083..da49406b 100644
--- a/ui/app/window.go
+++ b/ui/app/window.go
@@ -158,11 +158,7 @@ func (w *Window) Draw(root *ui.Ops) {
 func collectRedraws(r *ui.OpsReader) (time.Time, bool) {
 	var t time.Time
 	redraw := false
-	for {
-		encOp, ok := r.Decode()
-		if !ok {
-			break
-		}
+	for encOp, ok := r.Decode(); ok; encOp, ok = r.Decode() {
 		switch ops.OpType(encOp.Data[0]) {
 		case ops.TypeInvalidate:
 			var op ui.InvalidateOp
diff --git a/ui/input/key.go b/ui/input/key.go
index 54afb390..7a23dca9 100644
--- a/ui/input/key.go
+++ b/ui/input/key.go
@@ -88,11 +88,7 @@ func (q *keyQueue) resolveFocus(events handlerEvents) (Key, listenerPriority, bo
 	var pri listenerPriority
 	var hide bool
 loop:
-	for {
-		encOp, ok := q.reader.Decode()
-		if !ok {
-			break
-		}
+	for encOp, ok := q.reader.Decode(); ok; encOp, ok = q.reader.Decode() {
 		switch ops.OpType(encOp.Data[0]) {
 		case ops.TypeKeyHandler:
 			var op key.HandlerOp
diff --git a/ui/input/pointer.go b/ui/input/pointer.go
index 6fc3eaa4..70da98fd 100644
--- a/ui/input/pointer.go
+++ b/ui/input/pointer.go
@@ -63,11 +63,7 @@ const (
 )
 
 func (q *pointerQueue) collectHandlers(r *ui.OpsReader, events handlerEvents, t ui.Transform, area, node int, pass bool) {
-	for {
-		encOp, ok := r.Decode()
-		if !ok {
-			return
-		}
+	for encOp, ok := r.Decode(); ok; encOp, ok = r.Decode() {
 		switch ops.OpType(encOp.Data[0]) {
 		case ops.TypePush:
 			q.collectHandlers(r, events, t, area, node, pass)