Additional colour deprecations removed

internal/ui/switcher.go

@@ -112,7 +112,7 @@ func (s switchIconRenderer) MinSize() fyne.Size {
 
 func (s switchIconRenderer) Refresh() {
 	if s.icon.current {
-		s.bg.FillColor = theme.PrimaryColor()
+		s.bg.FillColor = theme.Color(theme.ColorNamePrimary)
 	} else {
 		s.bg.FillColor = color.Transparent
 	}

internal/ui/widgetpanel.go

@@ -48,8 +48,9 @@ func (w *widgetRenderer) Refresh() {
 		w.panel.clocks.Objects[0].Show()
 		w.panel.clocks.Objects[1].Hide()
 	}
-	w.panel.clock.Color = theme.ForegroundColor()
-	w.panel.vClock.Color = theme.ForegroundColor()
+	fg := theme.Color(theme.ColorNamePrimary)
+	w.panel.clock.Color = fg
+	w.panel.vClock.Color = fg
 	canvas.Refresh(w.panel.clock)
 }
 
@@ -116,15 +117,16 @@ func (w *widgetPanel) createClock() {
 	var style fyne.TextStyle
 	style.Monospace = true
 
+	fg := theme.Color(theme.ColorNamePrimary)
 	w.clock = &canvas.Text{
-		Color:     theme.ForegroundColor(),
+		Color:     fg,
 		Text:      w.formattedTime(),
 		Alignment: fyne.TextAlignCenter,
 		TextStyle: style,
 		TextSize:  3 * theme.TextSize(),
 	}
 	w.vClock = &canvas.Text{
-		Color:     theme.ForegroundColor(),
+		Color:     fg,
 		Text:      w.formattedTime(),
 		Alignment: fyne.TextAlignCenter,
 		TextStyle: style,

internal/x11/win/client.go

@@ -266,8 +266,8 @@ func (c *client) NotifyMouseMotion(x, y int16) {
 	c.frame.mouseMotion(x, y)
 }
 
-func (c *client) NotifyMousePress(x, y int16, b xproto.Button) {
-	c.frame.mousePress(x, y, b)
+func (c *client) NotifyMousePress(x, y int16, b xproto.Button, s uint16) {
+	c.frame.mousePress(x, y, b, s)
 }
 
 func (c *client) NotifyMouseRelease(x, y int16, b xproto.Button) {

internal/x11/win/frame.go

@@ -313,9 +313,9 @@ func (f *frame) createPixmaps(depth byte) error {
 		xproto.Drawable(f.client.wm.X().Screen().Root), rightWidthPix, heightPix)
 	f.borderTopRight = pid
 
-	backR, backG, backB, _ := theme.DisabledButtonColor().RGBA()
+	backR, backG, backB, _ := theme.Color(theme.ColorNameDisabledButton).RGBA()
 	if f.client.Focused() {
-		backR, backG, backB, _ = theme.BackgroundColor().RGBA()
+		backR, backG, backB, _ = theme.Color(theme.ColorNameBackground).RGBA()
 	}
 	bgColor := uint32(uint8(backR))<<16 | uint32(uint8(backG))<<8 | uint32(uint8(backB))
 

modules/desktops/pager.go

@@ -103,7 +103,7 @@ func (p *pager) refreshFrom(oldID int) {
 		}
 
 		var obj fyne.CanvasObject
-		obj = canvas.NewRectangle(theme.DisabledColor())
+		obj = canvas.NewRectangle(theme.Color(theme.ColorNameDisabled))
 		if win.Properties().Icon() != nil {
 			obj = container.NewStack(obj,
 				canvas.NewImageFromResource(win.Properties().Icon()))

modules/quaketerm/term.go

@@ -51,7 +51,7 @@ func (t *term) createTerm() {
 	win := fyne.CurrentApp().Driver().(desktop.Driver).CreateSplashWindow()
 	win.SetTitle(termTitle)
 
-	bg := canvas.NewRectangle(theme.BackgroundColor())
+	bg := canvas.NewRectangle(theme.Color(theme.ColorNameBackground))
 	img := canvas.NewImageFromResource(theme.NewDisabledResource(theme.ComputerIcon()))
 	img.FillMode = canvas.ImageFillContain
 	img.SetMinSize(fyne.NewSize(200, 200))
@@ -153,7 +153,7 @@ func matchTheme(bg, over *canvas.Rectangle) {
 		for {
 			<-ch
 
-			bg.FillColor = theme.BackgroundColor()
+			bg.FillColor = theme.Color(theme.ColorNameBackground)
 			bg.Refresh()
 			over.FillColor = wmTheme.WidgetPanelBackground()
 			over.Refresh()

modules/status/battery.go

@@ -61,7 +61,7 @@ func (b *battery) StatusAreaWidget() fyne.CanvasObject {
 
 	b.bar = widget.NewProgressBar()
 	b.icon = widget.NewIcon(wmtheme.BatteryIcon)
-	b.fill = canvas.NewRectangle(theme.ForegroundColor())
+	b.fill = canvas.NewRectangle(theme.Color(theme.ColorNameForeground))
 	prop := canvas.NewRectangle(color.Transparent)
 	prop.SetMinSize(b.icon.MinSize().Add(fyne.NewSize(theme.Padding()*4, 0)))
 	icon := container.NewStack(container.NewCenter(prop, b.icon), container.NewWithoutLayout(b.fill))
@@ -88,12 +88,12 @@ func (b *battery) setValue(val float64) {
 		b.fill.Hide()
 	} else if val < 0.1 {
 		b.icon.SetResource(theme.NewErrorThemedResource(wmtheme.BatteryIcon))
-		b.fill.FillColor = theme.ErrorColor()
+		b.fill.FillColor = theme.Color(theme.ColorNameError)
 		b.fill.Refresh()
 		b.fill.Show()
 	} else {
 		b.icon.SetResource(wmtheme.BatteryIcon)
-		b.fill.FillColor = theme.ForegroundColor()
+		b.fill.FillColor = theme.Color(theme.ColorNameForeground)
 		b.fill.Refresh()
 		b.fill.Show()
 	}

wm/auth.go

@@ -128,7 +128,7 @@ func (a *auth) BeginAuthentication(actionID, message, iconName string, details m
 				layout.NewSpacer()), bottomPad),
 		nil, nil, f)
 
-	r, g, b, _ := theme.OverlayBackgroundColor().RGBA()
+	r, g, b, _ := theme.Color(theme.ColorNameOverlayBackground).RGBA()
 	bgCol := &color.NRGBA{R: uint8(r), G: uint8(g), B: uint8(b), A: 230}
 
 	bg := canvas.NewRectangle(bgCol)

wm/border.go

@@ -54,7 +54,7 @@ func NewBorder(win fynedesk.Window, icon fyne.Resource, canMaximize bool) *Borde
 		win.Iconify()
 	}}
 
-	title := canvas.NewText(win.Properties().Title(), theme.ForegroundColor())
+	title := canvas.NewText(win.Properties().Title(), theme.Color(theme.ColorNameForeground))
 	buttonPos := fynedesk.Instance().Settings().BorderButtonPosition()
 
 	var titleBar *Border
@@ -199,7 +199,7 @@ func (c *Border) makeDesktopMenu(pos fyne.Position) *fyne.MenuItem {
 //
 // Implements: fyne.Widget
 func (c *Border) CreateRenderer() fyne.WidgetRenderer {
-	render := &coloredBoxRenderer{b: c, bg: canvas.NewRectangle(theme.BackgroundColor())}
+	render := &coloredBoxRenderer{b: c, bg: canvas.NewRectangle(theme.Color(theme.ColorNameBackground))}
 	return render
 }
 
@@ -259,12 +259,12 @@ func (r *coloredBoxRenderer) Objects() []fyne.CanvasObject {
 func (r *coloredBoxRenderer) Refresh() {
 	r.bg.Resize(r.b.Size()) // Not sure why this resize is needed, but it is...
 	if r.b.win.Focused() {
-		r.bg.FillColor = theme.BackgroundColor()
+		r.bg.FillColor = theme.Color(theme.ColorNameBackground)
 	} else {
-		r.bg.FillColor = theme.DisabledButtonColor()
+		r.bg.FillColor = theme.Color(theme.ColorNameDisabledButton)
 	}
 	r.bg.Refresh()
 
-	r.b.title.Color = theme.ForegroundColor()
+	r.b.title.Color = theme.Color(theme.ColorNameForeground)
 	r.b.content.Refresh()
 }

wm/button.go

@@ -29,7 +29,7 @@ func (c *closeButton) Cursor() desktop.Cursor {
 }
 
 func (c *closeButton) MouseIn(*desktop.MouseEvent) {
-	c.bg.FillColor = theme.ErrorColor()
+	c.bg.FillColor = theme.Color(theme.ColorNameError)
 	c.bg.Refresh()
 }