From 61fb8af716eeeeee59418d7377b0bfae808d2ad4 Mon Sep 17 00:00:00 2001
From: Zsolt Tasnadi <rastasi@gmail.com>
Date: Tue, 4 Jul 2023 13:29:44 +0200
Subject: [PATCH] move menu color to layout

---
 konstructor/menu.go | 22 +++++++++++++---------
 main.go             | 13 +++++++++----
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/konstructor/menu.go b/konstructor/menu.go
index f36eb88..4bd5bf0 100644
--- a/konstructor/menu.go
+++ b/konstructor/menu.go
@@ -13,9 +13,11 @@ import (
 type MenuMap map[string]Menu
 
 type MenuLayout struct {
-	Background string
-	DPI        float64
-	Size       float64
+	Background    string
+	DPI           float64
+	Size          float64
+	Color         color.Color
+	SelectedColor color.Color
 }
 
 type MenuItem struct {
@@ -37,24 +39,26 @@ func (e *Engine) MenuDraw(screen *ebiten.Image) {
 	for i, menu_item := range menu.MenuItems {
 		var c color.Color
 		if menu.CurrentSelected == i {
-			c = color.RGBA{R: 0, G: 255, B: 0, A: 100}
+			c = menu.MenuLayout.SelectedColor
 		} else {
-			c = color.White
+			c = menu.MenuLayout.Color
 		}
-		text.Draw(screen, menu_item.Label+"\n", face, 8, 24*(i+1), c)
+		offset := int(menu.MenuLayout.Size) * (i + 1)
+		text.Draw(screen, menu_item.Label+"\n", face, 8, offset, c)
 	}
 }
 
 func (e *Engine) MenuUpdate() {
 	menu := e.MenuMap[e.KContext.Screen.Value]
-	if e.Controller.DownPressed() && menu.CurrentSelected != len(menu.MenuItems)-1 {
-		menu.CurrentSelected++
-	}
 
 	if e.Controller.UpPressed() && menu.CurrentSelected != 0 {
 		menu.CurrentSelected--
 	}
 
+	if e.Controller.DownPressed() && menu.CurrentSelected != len(menu.MenuItems)-1 {
+		menu.CurrentSelected++
+	}
+
 	if e.Controller.Action0Pressed() {
 		menu.MenuItems[menu.CurrentSelected].Handler()
 	}
diff --git a/main.go b/main.go
index 5554e30..c5cdfa0 100644
--- a/main.go
+++ b/main.go
@@ -3,6 +3,7 @@ package main
 import (
 	"game/domain"
 	"game/konstructor"
+	"image/color"
 
 	"github.com/hajimehoshi/ebiten"
 )
@@ -32,8 +33,10 @@ func main() {
 			"MainMenu": {
 				CurrentSelected: 0,
 				MenuLayout: konstructor.MenuLayout{
-					DPI:  72,
-					Size: 24,
+					DPI:           72,
+					Size:          24,
+					Color:         color.White,
+					SelectedColor: color.RGBA{R: 0, G: 255, B: 0, A: 100},
 				},
 				MenuItems: []konstructor.MenuItem{
 					{
@@ -56,8 +59,10 @@ func main() {
 			"GameMenu": {
 				CurrentSelected: 0,
 				MenuLayout: konstructor.MenuLayout{
-					DPI:  72,
-					Size: 24,
+					DPI:           72,
+					Size:          24,
+					Color:         color.White,
+					SelectedColor: color.RGBA{R: 0, G: 255, B: 0, A: 100},
 				},
 				MenuItems: []konstructor.MenuItem{
 					{