debugui: unexport color consts

Author: hajimehoshi

container.go

@@ -119,21 +119,21 @@ func (c *Context) window(title string, bounds image.Rectangle, opt option, f fun
 	// draw frame
 	collapsed := cnt.collapsed
 	if (^opt&optionNoFrame) != 0 && !collapsed {
-		c.drawFrame(bounds, ColorWindowBG)
+		c.drawFrame(bounds, colorWindowBG)
 	}
 
 	// do title bar
 	if (^opt & optionNoTitle) != 0 {
 		tr := bounds
 		tr.Max.Y = tr.Min.Y + c.style().titleHeight
-		c.drawFrame(tr, ColorTitleBG)
+		c.drawFrame(tr, colorTitleBG)
 
 		// do title text
 		if (^opt & optionNoTitle) != 0 {
 			id := c.idFromString("title", id)
 			r := image.Rect(tr.Min.X+tr.Dy()-c.style().padding, tr.Min.Y, tr.Max.X, tr.Max.Y)
 			c.updateControl(id, r, opt)
-			c.drawControlText(title, r, ColorTitleText, opt)
+			c.drawControlText(title, r, colorTitleText, opt)
 			if id == c.focus && ebiten.IsMouseButtonPressed(ebiten.MouseButtonLeft) {
 				cnt.layout.Bounds = cnt.layout.Bounds.Add(c.mouseDelta())
 			}
@@ -148,7 +148,7 @@ func (c *Context) window(title string, bounds image.Rectangle, opt option, f fun
 			if collapsed {
 				icon = iconCollapsed
 			}
-			c.drawIcon(icon, r, c.style().colors[ColorTitleText])
+			c.drawIcon(icon, r, c.style().colors[colorTitleText])
 			c.updateControl(id, r, opt)
 			if inpututil.IsMouseButtonJustPressed(ebiten.MouseButtonLeft) && id == c.focus {
 				cnt.collapsed = !cnt.collapsed

control.go

@@ -161,7 +161,7 @@ func (c *Context) Text(text string) {
 						endIdx = p
 						p++
 					}
-					c.drawControlText(text[startIdx:endIdx], bounds, ColorText, 0)
+					c.drawControlText(text[startIdx:endIdx], bounds, colorText, 0)
 					p = endIdx + 1
 					return false, nil
 				}); err != nil {
@@ -186,9 +186,9 @@ func (c *Context) button(label string, opt option, callerPC uintptr) (controlID,
 			res = true
 		}
 		// draw
-		c.drawControlFrame(id, bounds, ColorButton, opt)
+		c.drawControlFrame(id, bounds, colorButton, opt)
 		if len(label) > 0 {
-			c.drawControlText(label, bounds, ColorText, opt)
+			c.drawControlText(label, bounds, colorText, opt)
 		}
 		return res, nil
 	})
@@ -211,13 +211,13 @@ func (c *Context) Checkbox(state *bool, label string) bool {
 				res = true
 				*state = !*state
 			}
-			c.drawControlFrame(id, box, ColorBase, 0)
+			c.drawControlFrame(id, box, colorBase, 0)
 			if *state {
-				c.drawIcon(iconCheck, box, c.style().colors[ColorText])
+				c.drawIcon(iconCheck, box, c.style().colors[colorText])
 			}
 			if label != "" {
 				bounds = image.Rect(bounds.Min.X+lineHeight(), bounds.Min.Y, bounds.Max.X, bounds.Max.Y)
-				c.drawControlText(label, bounds, ColorText, 0)
+				c.drawControlText(label, bounds, colorText, 0)
 			}
 			return res, nil
 		})
@@ -262,15 +262,15 @@ func (c *Context) slider(value *float64, low, high, step float64, digits int, op
 		}
 
 		// draw base
-		c.drawControlFrame(id, bounds, ColorBase, opt)
+		c.drawControlFrame(id, bounds, colorBase, opt)
 		// draw thumb
 		w := c.style().thumbSize
 		x := int((v - low) * float64(bounds.Dx()-w) / (high - low))
 		thumb := image.Rect(bounds.Min.X+x, bounds.Min.Y, bounds.Min.X+x+w, bounds.Max.Y)
-		c.drawControlFrame(id, thumb, ColorButton, opt)
+		c.drawControlFrame(id, thumb, colorButton, opt)
 		// draw text
 		text := formatNumber(v, digits)
-		c.drawControlText(text, bounds, ColorText, opt)
+		c.drawControlText(text, bounds, colorText, opt)
 
 		return res, nil
 	})
@@ -299,10 +299,10 @@ func (c *Context) header(label string, isTreeNode bool, opt option, callerPC uin
 		}
 		if isTreeNode {
 			if c.hover == id {
-				c.drawFrame(bounds, ColorButtonHover)
+				c.drawFrame(bounds, colorButtonHover)
 			}
 		} else {
-			c.drawControlFrame(id, bounds, ColorButton, 0)
+			c.drawControlFrame(id, bounds, colorButton, 0)
 		}
 		var icon icon
 		if expanded {
@@ -313,10 +313,10 @@ func (c *Context) header(label string, isTreeNode bool, opt option, callerPC uin
 		c.drawIcon(
 			icon,
 			image.Rect(bounds.Min.X, bounds.Min.Y, bounds.Min.X+bounds.Dy(), bounds.Max.Y),
-			c.style().colors[ColorText],
+			c.style().colors[colorText],
 		)
 		bounds.Min.X += bounds.Dy() - c.style().padding
-		c.drawControlText(label, bounds, ColorText, 0)
+		c.drawControlText(label, bounds, colorText, 0)
 
 		return expanded, nil
 	})
@@ -373,11 +373,11 @@ func (c *Context) scrollbarVertical(cnt *container, b image.Rectangle, cs image.
 		cnt.layout.ScrollOffset.Y = clamp(cnt.layout.ScrollOffset.Y, 0, maxscroll)
 
 		// draw base and thumb
-		c.drawFrame(base, ColorScrollBase)
+		c.drawFrame(base, colorScrollBase)
 		thumb := base
 		thumb.Max.Y = thumb.Min.Y + max(c.style().thumbSize, base.Dy()*b.Dy()/cs.Y)
 		thumb = thumb.Add(image.Pt(0, cnt.layout.ScrollOffset.Y*(base.Dy()-thumb.Dy())/maxscroll))
-		c.drawFrame(thumb, ColorScrollThumb)
+		c.drawFrame(thumb, colorScrollThumb)
 
 		// set this as the scroll_target (will get scrolled on mousewheel)
 		// if the mouse is over it
@@ -408,11 +408,11 @@ func (c *Context) scrollbarHorizontal(cnt *container, b image.Rectangle, cs imag
 		cnt.layout.ScrollOffset.X = clamp(cnt.layout.ScrollOffset.X, 0, maxscroll)
 
 		// draw base and thumb
-		c.drawFrame(base, ColorScrollBase)
+		c.drawFrame(base, colorScrollBase)
 		thumb := base
 		thumb.Max.X = thumb.Min.X + max(c.style().thumbSize, base.Dx()*b.Dx()/cs.X)
 		thumb = thumb.Add(image.Pt(cnt.layout.ScrollOffset.X*(base.Dx()-thumb.Dx())/maxscroll, 0))
-		c.drawFrame(thumb, ColorScrollThumb)
+		c.drawFrame(thumb, colorScrollThumb)
 
 		// set this as the scroll_target (will get scrolled on mousewheel)
 		// if the mouse is over it

draw.go

@@ -206,12 +206,12 @@ func (c *Context) DrawControl(f func(screen *ebiten.Image)) {
 
 func (c *Context) drawFrame(rect image.Rectangle, colorid int) {
 	c.drawRect(rect, c.style().colors[colorid])
-	if colorid == ColorScrollBase || colorid == ColorScrollThumb || colorid == ColorTitleBG {
+	if colorid == colorScrollBase || colorid == colorScrollThumb || colorid == colorTitleBG {
 		return
 	}
 	// draw border
-	if c.style().colors[ColorBorder].A != 0 {
-		c.drawBox(rect.Inset(-1), c.style().colors[ColorBorder])
+	if c.style().colors[colorBorder].A != 0 {
+		c.drawBox(rect.Inset(-1), c.style().colors[colorBorder])
 	}
 }
 

panel.go

@@ -22,7 +22,7 @@ func (c *Context) panel(name string, opt option, f func(layout ContainerLayout))
 	}
 	cnt.layout.Bounds = l
 	if (^opt & optionNoFrame) != 0 {
-		c.drawFrame(cnt.layout.Bounds, ColorPanelBG)
+		c.drawFrame(cnt.layout.Bounds, colorPanelBG)
 	}
 
 	c.pushContainer(cnt)

style.go

@@ -15,25 +15,25 @@ type style struct {
 	titleHeight   int
 	scrollbarSize int
 	thumbSize     int
-	colors        [ColorMax + 1]color.RGBA
+	colors        [colorCount]color.RGBA
 }
 
 const (
-	ColorText = iota
-	ColorBorder
-	ColorWindowBG
-	ColorTitleBG
-	ColorTitleText
-	ColorPanelBG
-	ColorButton
-	ColorButtonHover
-	ColorButtonFocus
-	ColorBase
-	ColorBaseHover
-	ColorBaseFocus
-	ColorScrollBase
-	ColorScrollThumb
-	ColorMax = ColorScrollThumb
+	colorText = iota
+	colorBorder
+	colorWindowBG
+	colorTitleBG
+	colorTitleText
+	colorPanelBG
+	colorButton
+	colorButtonHover
+	colorButtonFocus
+	colorBase
+	colorBaseHover
+	colorBaseFocus
+	colorScrollBase
+	colorScrollThumb
+	colorCount
 )
 
 var defaultStyle style = style{
@@ -45,19 +45,19 @@ var defaultStyle style = style{
 	scrollbarSize: 12,
 	thumbSize:     8,
 	colors: [...]color.RGBA{
-		ColorText:        {230, 230, 230, 255},
-		ColorBorder:      {25, 25, 25, 255},
-		ColorWindowBG:    {45, 45, 45, 230},
-		ColorTitleBG:     {23, 23, 23, 230},
-		ColorTitleText:   {240, 240, 240, 255},
-		ColorPanelBG:     {0, 0, 0, 0},
-		ColorButton:      {75, 75, 75, 255},
-		ColorButtonHover: {95, 95, 95, 255},
-		ColorButtonFocus: {115, 115, 115, 255},
-		ColorBase:        {30, 30, 30, 255},
-		ColorBaseHover:   {35, 35, 35, 255},
-		ColorBaseFocus:   {40, 40, 40, 255},
-		ColorScrollBase:  {43, 43, 43, 255},
-		ColorScrollThumb: {30, 30, 30, 255},
+		colorText:        {230, 230, 230, 255},
+		colorBorder:      {25, 25, 25, 255},
+		colorWindowBG:    {45, 45, 45, 230},
+		colorTitleBG:     {23, 23, 23, 230},
+		colorTitleText:   {240, 240, 240, 255},
+		colorPanelBG:     {0, 0, 0, 0},
+		colorButton:      {75, 75, 75, 255},
+		colorButtonHover: {95, 95, 95, 255},
+		colorButtonFocus: {115, 115, 115, 255},
+		colorBase:        {30, 30, 30, 255},
+		colorBaseHover:   {35, 35, 35, 255},
+		colorBaseFocus:   {40, 40, 40, 255},
+		colorScrollBase:  {43, 43, 43, 255},
+		colorScrollThumb: {30, 30, 30, 255},
 	},
 }

textfield.go

@@ -72,9 +72,9 @@ func (c *Context) textFieldRaw(buf *string, id controlID, opt option) (bool, err
 		}
 
 		// draw
-		c.drawControlFrame(id, bounds, ColorBase, opt)
+		c.drawControlFrame(id, bounds, colorBase, opt)
 		if c.focus == id {
-			color := c.style().colors[ColorText]
+			color := c.style().colors[colorText]
 			textw := textWidth(*buf)
 			texth := lineHeight()
 			ofx := bounds.Dx() - c.style().padding - textw - 1
@@ -85,7 +85,7 @@ func (c *Context) textFieldRaw(buf *string, id controlID, opt option) (bool, err
 			c.drawRect(image.Rect(textx+textw, texty, textx+textw+1, texty+texth), color)
 			c.popClipRect()
 		} else {
-			c.drawControlText(*buf, bounds, ColorText, opt)
+			c.drawControlText(*buf, bounds, colorText, opt)
 		}
 		return res, nil
 	})
@@ -153,10 +153,10 @@ func (c *Context) numberField(value *float64, step float64, digits int, opt opti
 		}
 
 		// draw base
-		c.drawControlFrame(id, bounds, ColorBase, opt)
+		c.drawControlFrame(id, bounds, colorBase, opt)
 		// draw text
 		text := formatNumber(*value, digits)
-		c.drawControlText(text, bounds, ColorText, opt)
+		c.drawControlText(text, bounds, colorText, opt)
 
 		return res, nil
 	})