From 72ea48f70be5d86c830431640c9a6e28ce88ef89 Mon Sep 17 00:00:00 2001
From: faiface <faiface@ksp.sk>
Date: Sat, 19 Aug 2017 22:39:58 +0200
Subject: move Layer to layout package

---
 layer/layer.go  | 102 --------------------------------------------------------
 layout/layer.go | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 102 insertions(+), 102 deletions(-)
 delete mode 100644 layer/layer.go
 create mode 100644 layout/layer.go

diff --git a/layer/layer.go b/layer/layer.go
deleted file mode 100644
index 1e84075..0000000
--- a/layer/layer.go
+++ /dev/null
@@ -1,102 +0,0 @@
-package layer
-
-import (
-	"container/list"
-	"errors"
-	"image"
-	"image/draw"
-
-	"github.com/faiface/gui/event"
-)
-
-type ImageFlusher interface {
-	Image() *image.RGBA
-	Flush(r image.Rectangle)
-}
-
-type List struct {
-	event.Dispatch
-	dst    ImageFlusher
-	layers list.List
-}
-
-func (l *List) Dst(dst ImageFlusher) {
-	l.dst = dst
-	for e := l.layers.Back(); e != nil; e = e.Prev() {
-		layer := e.Value.(*Layer)
-		rgba := image.NewRGBA(dst.Image().Bounds())
-		draw.Draw(rgba, layer.rgba.Bounds(), layer.rgba, layer.rgba.Bounds().Min, draw.Src)
-		layer.rgba = rgba
-	}
-}
-
-func (l *List) Push() *Layer {
-	layer := &Layer{
-		l:    l,
-		rgba: image.NewRGBA(l.dst.Image().Bounds()),
-	}
-	layer.e = l.layers.PushFront(layer)
-	return layer
-}
-
-func (l *List) Remove(layer *Layer) {
-	if layer.l == nil {
-		panic(errors.New("layer: Remove: layer already removed"))
-	}
-	l.layers.Remove(layer.e)
-	layer.l = nil
-}
-
-func (l *List) Front(layer *Layer) {
-	if layer.l == nil {
-		panic(errors.New("layer: Front: layer removed"))
-	}
-	l.layers.MoveToFront(layer.e)
-}
-
-func (l *List) Flush(r image.Rectangle) {
-	if l.dst == nil {
-		panic(errors.New("layer: Flush: no destination"))
-	}
-	draw.Draw(l.dst.Image(), r, image.Transparent, r.Min, draw.Src)
-	for e := l.layers.Back(); e != nil; e = e.Prev() {
-		layer := e.Value.(*Layer)
-		draw.Draw(l.dst.Image(), r, layer.rgba, r.Min, draw.Over)
-	}
-	l.dst.Flush(r)
-}
-
-func (l *List) Happen(event string) bool {
-	if l.Dispatch.Happen(event) {
-		return true
-	}
-	for e := l.layers.Front(); e != nil; e = e.Next() {
-		layer := e.Value.(*Layer)
-		if layer.Happen(event) {
-			return true
-		}
-	}
-	return false
-}
-
-type Layer struct {
-	event.Dispatch
-	l    *List
-	e    *list.Element
-	rgba *image.RGBA
-}
-
-func (l *Layer) List() *List {
-	return l.l
-}
-
-func (l *Layer) Image() *image.RGBA {
-	return l.rgba
-}
-
-func (l *Layer) Flush(r image.Rectangle) {
-	if l.l == nil {
-		panic(errors.New("layer: Flush: layer removed"))
-	}
-	l.l.Flush(r)
-}
diff --git a/layout/layer.go b/layout/layer.go
new file mode 100644
index 0000000..ff6d466
--- /dev/null
+++ b/layout/layer.go
@@ -0,0 +1,102 @@
+package layer
+
+import (
+	"container/list"
+	"errors"
+	"image"
+	"image/draw"
+
+	"github.com/faiface/gui/event"
+)
+
+type ImageFlusher interface {
+	Image() *image.RGBA
+	Flush(r image.Rectangle)
+}
+
+type LayerList struct {
+	event.Dispatch
+	dst    ImageFlusher
+	layers list.List
+}
+
+func (l *LayerList) Dst(dst ImageFlusher) {
+	l.dst = dst
+	for e := l.layers.Back(); e != nil; e = e.Prev() {
+		layer := e.Value.(*Layer)
+		rgba := image.NewRGBA(dst.Image().Bounds())
+		draw.Draw(rgba, layer.rgba.Bounds(), layer.rgba, layer.rgba.Bounds().Min, draw.Src)
+		layer.rgba = rgba
+	}
+}
+
+func (l *LayerList) Push() *Layer {
+	layer := &Layer{
+		lst:  l,
+		rgba: image.NewRGBA(l.dst.Image().Bounds()),
+	}
+	layer.elm = l.layers.PushFront(layer)
+	return layer
+}
+
+func (l *LayerList) Remove(layer *Layer) {
+	if layer.lst == nil {
+		panic(errors.New("layer: Remove: layer already removed"))
+	}
+	l.layers.Remove(layer.elm)
+	layer.lst = nil
+}
+
+func (l *LayerList) Front(layer *Layer) {
+	if layer.lst == nil {
+		panic(errors.New("layer: Front: layer removed"))
+	}
+	l.layers.MoveToFront(layer.elm)
+}
+
+func (l *LayerList) Flush(r image.Rectangle) {
+	if l.dst == nil {
+		panic(errors.New("layer: Flush: no destination"))
+	}
+	draw.Draw(l.dst.Image(), r, image.Transparent, r.Min, draw.Src)
+	for e := l.layers.Back(); e != nil; e = e.Prev() {
+		layer := e.Value.(*Layer)
+		draw.Draw(l.dst.Image(), r, layer.rgba, r.Min, draw.Over)
+	}
+	l.dst.Flush(r)
+}
+
+func (l *LayerList) Happen(event string) bool {
+	if l.Dispatch.Happen(event) {
+		return true
+	}
+	for e := l.layers.Front(); e != nil; e = e.Next() {
+		layer := e.Value.(*Layer)
+		if layer.Happen(event) {
+			return true
+		}
+	}
+	return false
+}
+
+type Layer struct {
+	event.Dispatch
+	lst  *LayerList
+	elm  *list.Element
+	rgba *image.RGBA
+}
+
+func (l *Layer) List() *LayerList {
+	return l.lst
+}
+
+func (l *Layer) Image() *image.RGBA {
+	return l.rgba
+}
+
+func (l *Layer) Flush(r image.Rectangle) {
+	if l.lst == nil {
+		panic(errors.New("layer: Flush: layer removed"))
+	}
+	l.lst.Flush(r)
+}
-- 
cgit v1.2.3