From 606fc028acdfb1456a531d31f19cfdd168565a07 Mon Sep 17 00:00:00 2001 From: juander Date: Wed, 11 Nov 2020 15:01:36 +0100 Subject: [PATCH] Revert "d2ui/label: Refactor Render() to RenderNoError()" This reverts commit f2a55312e41a774e2d2bcb6e070547c888021b3f. Since we removed the return of errors from the Render() method, we no longer require the RenderNoError() method. --- d2core/d2ui/button.go | 4 ++-- d2core/d2ui/label.go | 10 +--------- d2core/d2ui/textbox.go | 6 +++--- d2core/d2ui/tooltip.go | 2 +- d2game/d2gamescreen/character_select.go | 11 ++++++----- d2game/d2gamescreen/credits.go | 2 +- d2game/d2gamescreen/main_menu.go | 18 +++++++++--------- d2game/d2gamescreen/select_hero_class.go | 16 ++++++++-------- d2game/d2player/help_overlay.go | 2 +- d2game/d2player/hero_stats_panel.go | 4 ++-- d2game/d2player/hud.go | 4 ++-- d2game/d2player/skilltree.go | 2 +- 12 files changed, 37 insertions(+), 44 deletions(-) diff --git a/d2core/d2ui/button.go b/d2core/d2ui/button.go index e7d98fe7..01cacd65 100644 --- a/d2core/d2ui/button.go +++ b/d2core/d2ui/button.go @@ -340,7 +340,7 @@ func (v *Button) prerenderStates(btnSprite *Sprite, btnLayout *ButtonLayout, lab xOffset := half(v.width) label.SetPosition(xOffset, textY) - label.RenderNoError(v.normalSurface) + label.Render(v.normalSurface) if !btnLayout.HasImage || !btnLayout.AllowFrameChange { return @@ -411,7 +411,7 @@ func (v *Button) prerenderStates(btnSprite *Sprite, btnLayout *ButtonLayout, lab btnSprite.RenderSegmented(*state.prerenderdestination, xSeg, ySeg, state.baseFrame) label.SetPosition(state.offsetX, state.offsetY) - label.RenderNoError(*state.prerenderdestination) + label.Render(*state.prerenderdestination) } } diff --git a/d2core/d2ui/label.go b/d2core/d2ui/label.go index 8f51e9b5..aa768ee1 100644 --- a/d2core/d2ui/label.go +++ b/d2core/d2ui/label.go @@ -13,9 +13,6 @@ import ( "github.com/OpenDiablo2/OpenDiablo2/d2core/d2gui" ) -// static check that UIFrame implements Widget -var _ Widget = &Label{} - // Label represents a user interface label type Label struct { *BaseWidget @@ -48,13 +45,8 @@ func (ui *UIManager) NewLabel(fontPath, palettePath string) *Label { return result } -// Render draws the label on the screen +// Render draws the label on the screen, respliting the lines to allow for other alignments. func (v *Label) Render(target d2interface.Surface) { - v.RenderNoError(target) -} - -// RenderNoError draws the label on the screen, respliting the lines to allow for other alignments. -func (v *Label) RenderNoError(target d2interface.Surface) { target.PushTranslation(v.GetPosition()) lines := strings.Split(v.text, "\n") diff --git a/d2core/d2ui/textbox.go b/d2core/d2ui/textbox.go index e5b503a9..17edfe80 100644 --- a/d2core/d2ui/textbox.go +++ b/d2core/d2ui/textbox.go @@ -61,11 +61,11 @@ func (v *TextBox) Render(target d2interface.Surface) { return } - v.bgSprite.RenderNoError(target) - v.textLabel.RenderNoError(target) + v.bgSprite.Render(target) + v.textLabel.Render(target) if (time.Now().UnixNano()/1e6)&(1<<8) > 0 { - v.lineBar.RenderNoError(target) + v.lineBar.Render(target) } } diff --git a/d2core/d2ui/tooltip.go b/d2core/d2ui/tooltip.go index a69e9ebc..1f1e1216 100644 --- a/d2core/d2ui/tooltip.go +++ b/d2core/d2ui/tooltip.go @@ -187,7 +187,7 @@ func (t *Tooltip) Render(target d2interface.Surface) { for i := range t.lines { t.label.SetText(t.lines[i]) _, h := t.label.GetTextMetrics(t.lines[i]) - t.label.RenderNoError(target) + t.label.Render(target) target.PushTranslation(0, h) } diff --git a/d2game/d2gamescreen/character_select.go b/d2game/d2gamescreen/character_select.go index 45c6e1fa..3c951568 100644 --- a/d2game/d2gamescreen/character_select.go +++ b/d2game/d2gamescreen/character_select.go @@ -370,7 +370,8 @@ func (v *CharacterSelect) onExitButtonClicked() { // Render renders the Character Select screen func (v *CharacterSelect) Render(screen d2interface.Surface) { v.background.RenderSegmented(screen, 4, 3, 0) - v.d2HeroTitle.RenderNoError(screen) + v.d2HeroTitle.Render(screen) + actualSelectionIndex := v.selectedCharacter - (v.charScrollbar.GetCurrentOffset() * 2) if v.selectedCharacter > -1 && actualSelectionIndex >= 0 && actualSelectionIndex < 8 { @@ -383,9 +384,9 @@ func (v *CharacterSelect) Render(screen d2interface.Surface) { continue } - v.characterNameLabel[i].RenderNoError(screen) - v.characterStatsLabel[i].RenderNoError(screen) - v.characterExpLabel[i].RenderNoError(screen) + v.characterNameLabel[i].Render(screen) + v.characterStatsLabel[i].Render(screen) + v.characterExpLabel[i].Render(screen) x, y := v.characterNameLabel[i].GetPosition() charImgX := x - selectionBoxImageOffsetX @@ -398,7 +399,7 @@ func (v *CharacterSelect) Render(screen d2interface.Surface) { if v.showDeleteConfirmation { screen.DrawRect(screenWidth, screenHeight, rgbaColor(blackHalfOpacity)) v.okCancelBox.RenderSegmented(screen, 2, 1, 0) - v.deleteCharConfirmLabel.RenderNoError(screen) + v.deleteCharConfirmLabel.Render(screen) } } diff --git a/d2game/d2gamescreen/credits.go b/d2game/d2gamescreen/credits.go index f66f5484..a71b4e8b 100644 --- a/d2game/d2gamescreen/credits.go +++ b/d2game/d2gamescreen/credits.go @@ -136,7 +136,7 @@ func (v *Credits) Render(screen d2interface.Surface) { continue } - label.Label.RenderNoError(screen) + label.Label.Render(screen) } } diff --git a/d2game/d2gamescreen/main_menu.go b/d2game/d2gamescreen/main_menu.go index 2e30f07f..7acfc652 100644 --- a/d2game/d2gamescreen/main_menu.go +++ b/d2game/d2gamescreen/main_menu.go @@ -460,21 +460,21 @@ func (v *MainMenu) renderLogos(screen d2interface.Surface) { func (v *MainMenu) renderLabels(screen d2interface.Surface) { switch v.screenMode { case ScreenModeServerIP: - v.tcpIPOptionsLabel.RenderNoError(screen) - v.tcpJoinGameLabel.RenderNoError(screen) + v.tcpIPOptionsLabel.Render(screen) + v.tcpJoinGameLabel.Render(screen) case ScreenModeTCPIP: - v.tcpIPOptionsLabel.RenderNoError(screen) + v.tcpIPOptionsLabel.Render(screen) case ScreenModeTrademark: - v.copyrightLabel.RenderNoError(screen) - v.copyrightLabel2.RenderNoError(screen) + v.copyrightLabel.Render(screen) + v.copyrightLabel2.Render(screen) if v.errorLabel != nil { - v.errorLabel.RenderNoError(screen) + v.errorLabel.Render(screen) } case ScreenModeMainMenu: - v.openDiabloLabel.RenderNoError(screen) - v.versionLabel.RenderNoError(screen) - v.commitLabel.RenderNoError(screen) + v.openDiabloLabel.Render(screen) + v.versionLabel.Render(screen) + v.commitLabel.Render(screen) } } diff --git a/d2game/d2gamescreen/select_hero_class.go b/d2game/d2gamescreen/select_hero_class.go index aee4e7d9..d224086d 100644 --- a/d2game/d2gamescreen/select_hero_class.go +++ b/d2game/d2gamescreen/select_hero_class.go @@ -512,13 +512,13 @@ func (v *SelectHeroClass) onOkButtonClicked() { // Render renders the Select Hero Class screen func (v *SelectHeroClass) Render(screen d2interface.Surface) { v.bgImage.RenderSegmented(screen, 4, 3, 0) - v.headingLabel.RenderNoError(screen) + v.headingLabel.Render(screen) if v.selectedHero != d2enum.HeroNone { - v.heroClassLabel.RenderNoError(screen) - v.heroDesc1Label.RenderNoError(screen) - v.heroDesc2Label.RenderNoError(screen) - v.heroDesc3Label.RenderNoError(screen) + v.heroClassLabel.Render(screen) + v.heroDesc1Label.Render(screen) + v.heroDesc2Label.Render(screen) + v.heroDesc3Label.Render(screen) } for heroClass, heroInfo := range v.heroRenderInfo { @@ -536,9 +536,9 @@ func (v *SelectHeroClass) Render(screen d2interface.Surface) { v.campfire.RenderNoError(screen) if v.heroNameTextbox.GetVisible() { - v.heroNameLabel.RenderNoError(screen) - v.expansionCharLabel.RenderNoError(screen) - v.hardcoreCharLabel.RenderNoError(screen) + v.heroNameLabel.Render(screen) + v.expansionCharLabel.Render(screen) + v.hardcoreCharLabel.Render(screen) } } diff --git a/d2game/d2player/help_overlay.go b/d2game/d2player/help_overlay.go index 2608e266..e54b12f6 100644 --- a/d2game/d2player/help_overlay.go +++ b/d2game/d2player/help_overlay.go @@ -624,7 +624,7 @@ func (h *HelpOverlay) Render(target d2interface.Surface) error { } for _, t := range h.text { - t.RenderNoError(target) + t.Render(target) } for _, l := range h.lines { diff --git a/d2game/d2player/hero_stats_panel.go b/d2game/d2player/hero_stats_panel.go index f054156a..8428a6d6 100644 --- a/d2game/d2player/hero_stats_panel.go +++ b/d2game/d2player/hero_stats_panel.go @@ -293,7 +293,7 @@ func (s *HeroStatsPanel) renderStaticLabels(target d2interface.Surface) { cfg.centerAlign, }) - label.RenderNoError(target) + label.Render(target) } } @@ -346,7 +346,7 @@ func (s *HeroStatsPanel) renderStatValues(target d2interface.Surface) { func (s *HeroStatsPanel) renderStatValueNum(label *d2ui.Label, value int, target d2interface.Surface) { label.SetText(strconv.Itoa(value)) - label.RenderNoError(target) + label.Render(target) } func (s *HeroStatsPanel) createStatValueLabel(stat, x, y int) *d2ui.Label { diff --git a/d2game/d2player/hud.go b/d2game/d2player/hud.go index 2f7486d4..d3d04063 100644 --- a/d2game/d2player/hud.go +++ b/d2game/d2player/hud.go @@ -754,7 +754,7 @@ func (h *HUD) renderForSelectableEntitiesHovered(target d2interface.Surface) { xLabel, yLabel := entScreenX-xOff, entScreenY-yOff-entityHeight-hoverLabelOuterPad h.nameLabel.SetPosition(xLabel, yLabel) - h.nameLabel.RenderNoError(target) + h.nameLabel.Render(target) entity.Highlight() break @@ -776,7 +776,7 @@ func (h *HUD) Render(target d2interface.Surface) error { if h.isZoneTextShown { h.zoneChangeText.SetPosition(zoneChangeTextX, zoneChangeTextY) - h.zoneChangeText.RenderNoError(target) + h.zoneChangeText.Render(target) } h.renderHealthTooltip(target) diff --git a/d2game/d2player/skilltree.go b/d2game/d2player/skilltree.go index bc7a73ea..cbed3818 100644 --- a/d2game/d2player/skilltree.go +++ b/d2game/d2player/skilltree.go @@ -427,7 +427,7 @@ func (s *skillTree) renderTabCommon(target d2interface.Surface) { s.renderPanelSegment(target, frameCommonTabBottomRight) // available skill points label - s.availSPLabel.RenderNoError(target) + s.availSPLabel.Render(target) } func (s *skillTree) renderTab(target d2interface.Surface, tab int) {