fixed lint errors in d2gui (#692)

d2core/d2gui/button.go

@@ -31,8 +31,8 @@ type Button struct {
 }
 
 func createButton(renderer d2interface.Renderer, text string, buttonStyle ButtonStyle) (*Button, error) {
-	config, ok := buttonStyleConfigs[buttonStyle]
+	config := getButtonStyleConfig(buttonStyle)
-	if !ok {
+	if config == nil {
 		return nil, errors.New("invalid button style")
 	}
 

d2core/d2gui/common.go

@@ -2,17 +2,16 @@ package d2gui
 
 import (
 	"errors"
-	"github.com/OpenDiablo2/OpenDiablo2/d2common/d2math"
 	"image/color"
 
 	"github.com/OpenDiablo2/OpenDiablo2/d2common/d2interface"
-
+	"github.com/OpenDiablo2/OpenDiablo2/d2common/d2math"
 	"github.com/OpenDiablo2/OpenDiablo2/d2core/d2asset"
 )
 
 func loadFont(fontStyle FontStyle) (d2interface.Font, error) {
-	config, ok := fontStyleConfigs[fontStyle]
+	config := getFontStyleConfig(fontStyle)
-	if !ok {
+	if config == nil {
 		return nil, errors.New("invalid font style")
 	}
 

d2core/d2gui/d2gui.go

@@ -11,7 +11,7 @@ var (
 	errNotInit = errors.New("gui system is not initialized")
 )
 
-var singleton *manager
+var singleton *manager // nolint:gochecknoglobals // currently global by design
 
 // Initialize creates a singleton gui manager
 func Initialize(inputManager d2interface.InputManager) error {

d2core/d2gui/style.go

@@ -24,7 +24,8 @@ type fontStyleConfig struct {
 	palettePath  string
 }
 
-var fontStyleConfigs = map[FontStyle]fontStyleConfig{
+func getFontStyleConfig(f FontStyle) *fontStyleConfig {
+	fontStyles := map[FontStyle]*fontStyleConfig{
 		FontStyle16Units:        {d2resource.Font16, d2resource.PaletteUnits},
 		FontStyle30Units:        {d2resource.Font30, d2resource.PaletteUnits},
 		FontStyle42Units:        {d2resource.Font42, d2resource.PaletteUnits},
@@ -35,6 +36,9 @@ var fontStyleConfigs = map[FontStyle]fontStyleConfig{
 		FontStyleRediculous:     {d2resource.FontRediculous, d2resource.PaletteUnits},
 	}
 
+	return fontStyles[f]
+}
+
 // ButtonStyle is a representation of a button style. Button styles have
 // x and y sebment counts, an image, a palette, a font, and a text offset
 type ButtonStyle int
@@ -58,10 +62,14 @@ type buttonStyleConfig struct {
 	textOffset    int
 }
 
-var buttonStyleConfigs = map[ButtonStyle]buttonStyleConfig{
+func getButtonStyleConfig(b ButtonStyle) *buttonStyleConfig {
+	buttonStyleConfigs := map[ButtonStyle]*buttonStyleConfig{
 		ButtonStyleMedium:   {1, 1, d2resource.MediumButtonBlank, d2resource.PaletteUnits, FontStyleExocet10, 0},
 		ButtonStyleOkCancel: {1, 1, d2resource.CancelButton, d2resource.PaletteUnits, FontStyleRediculous, 0},
 		ButtonStyleShort:    {1, 1, d2resource.ShortButtonBlank, d2resource.PaletteUnits, FontStyleRediculous, -1},
 		ButtonStyleTall:     {1, 1, d2resource.TallButtonBlank, d2resource.PaletteUnits, FontStyleExocet10, 5},
 		ButtonStyleWide:     {2, 1, d2resource.WideButtonBlank, d2resource.PaletteUnits, FontStyleExocet10, 1},
 	}
+
+	return buttonStyleConfigs[b]
+}

d2core/d2gui/widget.go

@@ -110,11 +110,11 @@ func (w *widgetBase) SetMouseClickHandler(handler MouseHandler) {
 	w.mouseClickHandler = handler
 }
 
-func (w *widgetBase) getPosition() (int, int) {
+func (w *widgetBase) getPosition() (x, y int) {
 	return w.x, w.y
 }
 
-func (w *widgetBase) getSize() (int, int) {
+func (w *widgetBase) getSize() (width, height int) {
 	return 0, 0
 }