ui: shorten OpReader.Decode for loops

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2019-07-12 11:44:50 +02:00
parent 3c2c404fa9
commit 3a6fda129a
4 changed files with 4 additions and 20 deletions
+1 -5
View File
@@ -659,11 +659,7 @@ func (d *drawOps) collectOps(r *ui.OpsReader, state drawState) int {
var aux []byte var aux []byte
var auxKey ui.OpKey var auxKey ui.OpKey
loop: loop:
for { for encOp, ok := r.Decode(); ok; encOp, ok = r.Decode() {
encOp, ok := r.Decode()
if !ok {
break
}
switch ops.OpType(encOp.Data[0]) { switch ops.OpType(encOp.Data[0]) {
case ops.TypeTransform: case ops.TypeTransform:
var op ui.TransformOp var op ui.TransformOp
+1 -5
View File
@@ -158,11 +158,7 @@ func (w *Window) Draw(root *ui.Ops) {
func collectRedraws(r *ui.OpsReader) (time.Time, bool) { func collectRedraws(r *ui.OpsReader) (time.Time, bool) {
var t time.Time var t time.Time
redraw := false redraw := false
for { for encOp, ok := r.Decode(); ok; encOp, ok = r.Decode() {
encOp, ok := r.Decode()
if !ok {
break
}
switch ops.OpType(encOp.Data[0]) { switch ops.OpType(encOp.Data[0]) {
case ops.TypeInvalidate: case ops.TypeInvalidate:
var op ui.InvalidateOp var op ui.InvalidateOp
+1 -5
View File
@@ -88,11 +88,7 @@ func (q *keyQueue) resolveFocus(events handlerEvents) (Key, listenerPriority, bo
var pri listenerPriority var pri listenerPriority
var hide bool var hide bool
loop: loop:
for { for encOp, ok := q.reader.Decode(); ok; encOp, ok = q.reader.Decode() {
encOp, ok := q.reader.Decode()
if !ok {
break
}
switch ops.OpType(encOp.Data[0]) { switch ops.OpType(encOp.Data[0]) {
case ops.TypeKeyHandler: case ops.TypeKeyHandler:
var op key.HandlerOp var op key.HandlerOp
+1 -5
View File
@@ -63,11 +63,7 @@ const (
) )
func (q *pointerQueue) collectHandlers(r *ui.OpsReader, events handlerEvents, t ui.Transform, area, node int, pass bool) { func (q *pointerQueue) collectHandlers(r *ui.OpsReader, events handlerEvents, t ui.Transform, area, node int, pass bool) {
for { for encOp, ok := r.Decode(); ok; encOp, ok = r.Decode() {
encOp, ok := r.Decode()
if !ok {
return
}
switch ops.OpType(encOp.Data[0]) { switch ops.OpType(encOp.Data[0]) {
case ops.TypePush: case ops.TypePush:
q.collectHandlers(r, events, t, area, node, pass) q.collectHandlers(r, events, t, area, node, pass)