From 04275eb8b6eb76f7daf086969e31e315cf407caa Mon Sep 17 00:00:00 2001 From: lord Date: Wed, 5 Aug 2020 10:51:19 -0700 Subject: [PATCH] fixed lint errors in d2gui (#692) --- d2core/d2gui/button.go | 4 ++-- d2core/d2gui/common.go | 7 +++---- d2core/d2gui/d2gui.go | 2 +- d2core/d2gui/style.go | 38 +++++++++++++++++++++++--------------- d2core/d2gui/widget.go | 4 ++-- 5 files changed, 31 insertions(+), 24 deletions(-) diff --git a/d2core/d2gui/button.go b/d2core/d2gui/button.go index a1265927..3d669a87 100644 --- a/d2core/d2gui/button.go +++ b/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] - if !ok { + config := getButtonStyleConfig(buttonStyle) + if config == nil { return nil, errors.New("invalid button style") } diff --git a/d2core/d2gui/common.go b/d2core/d2gui/common.go index 23865550..1d9b5743 100644 --- a/d2core/d2gui/common.go +++ b/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] - if !ok { + config := getFontStyleConfig(fontStyle) + if config == nil { return nil, errors.New("invalid font style") } diff --git a/d2core/d2gui/d2gui.go b/d2core/d2gui/d2gui.go index efa6c455..6f68967c 100644 --- a/d2core/d2gui/d2gui.go +++ b/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 { diff --git a/d2core/d2gui/style.go b/d2core/d2gui/style.go index ea8256db..4b35096d 100644 --- a/d2core/d2gui/style.go +++ b/d2core/d2gui/style.go @@ -24,15 +24,19 @@ type fontStyleConfig struct { palettePath string } -var fontStyleConfigs = map[FontStyle]fontStyleConfig{ - FontStyle16Units: {d2resource.Font16, d2resource.PaletteUnits}, - FontStyle30Units: {d2resource.Font30, d2resource.PaletteUnits}, - FontStyle42Units: {d2resource.Font42, d2resource.PaletteUnits}, - FontStyleExocet10: {d2resource.FontExocet10, d2resource.PaletteUnits}, - FontStyleFormal10Static: {d2resource.FontFormal10, d2resource.PaletteStatic}, - FontStyleFormal11Units: {d2resource.FontFormal11, d2resource.PaletteUnits}, - FontStyleFormal12Static: {d2resource.FontFormal12, d2resource.PaletteStatic}, - FontStyleRediculous: {d2resource.FontRediculous, d2resource.PaletteUnits}, +func getFontStyleConfig(f FontStyle) *fontStyleConfig { + fontStyles := map[FontStyle]*fontStyleConfig{ + FontStyle16Units: {d2resource.Font16, d2resource.PaletteUnits}, + FontStyle30Units: {d2resource.Font30, d2resource.PaletteUnits}, + FontStyle42Units: {d2resource.Font42, d2resource.PaletteUnits}, + FontStyleExocet10: {d2resource.FontExocet10, d2resource.PaletteUnits}, + FontStyleFormal10Static: {d2resource.FontFormal10, d2resource.PaletteStatic}, + FontStyleFormal11Units: {d2resource.FontFormal11, d2resource.PaletteUnits}, + FontStyleFormal12Static: {d2resource.FontFormal12, d2resource.PaletteStatic}, + FontStyleRediculous: {d2resource.FontRediculous, d2resource.PaletteUnits}, + } + + return fontStyles[f] } // ButtonStyle is a representation of a button style. Button styles have @@ -58,10 +62,14 @@ type buttonStyleConfig struct { textOffset int } -var 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}, +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] } diff --git a/d2core/d2gui/widget.go b/d2core/d2gui/widget.go index 273d061d..94ee7aa4 100644 --- a/d2core/d2gui/widget.go +++ 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 }