Added the scrollbar. (#152)

d2common/d2resource/resource_paths.go

@@ -122,6 +122,7 @@ const (
 	TextBox2          = "/data/global/ui/FrontEnd/textbox2.dc6"
 	TallButtonBlank   = "/data/global/ui/CharSelect/TallButtonBlank.dc6"
 	Checkbox          = "/data/global/ui/FrontEnd/clickbox.dc6"
+	Scrollbar         = "/data/global/ui/PANEL/scrollbar.dc6"
 
 	// --- GAME UI ---
 

d2core/d2scene/character_select.go

@@ -2,6 +2,7 @@ package d2scene
 
 import (
 	"image/color"
+	"math"
 	"os"
 	"strings"
 
@@ -37,12 +38,12 @@ type CharacterSelect struct {
 	okCancelBox            d2render.Sprite
 	d2HeroTitle            d2ui.Label
 	deleteCharConfirmLabel d2ui.Label
+	charScrollbar          d2ui.Scrollbar
 	characterNameLabel     [8]d2ui.Label
 	characterStatsLabel    [8]d2ui.Label
 	characterExpLabel      [8]d2ui.Label
 	characterImage         [8]*d2core.NPC
 	gameStates             []*d2core.GameState
-	scrollOffset           int
 	selectedCharacter      int
 	mouseButtonPressed     bool
 	showDeleteConfirmation bool
@@ -134,6 +135,11 @@ func (v *CharacterSelect) Load() []func() {
 			v.okCancelBox = d2render.CreateSprite(v.fileProvider.LoadFile(d2resource.PopUpOkCancel), d2datadict.Palettes[d2enum.Fechar])
 			v.okCancelBox.MoveTo(270, 175)
 		},
+		func() {
+			v.charScrollbar = d2ui.CreateScrollbar(v.fileProvider, 586, 87, 369)
+			v.charScrollbar.OnActivated(func() { v.onScrollUpdate() })
+			v.uiManager.AddWidget(&v.charScrollbar)
+		},
 		func() {
 			for i := 0; i < 8; i++ {
 				xOffset := 115
@@ -154,10 +160,15 @@ func (v *CharacterSelect) Load() []func() {
 	}
 }
 
+func (v *CharacterSelect) onScrollUpdate() {
+	v.moveSelectionBox()
+	v.updateCharacterBoxes()
+}
+
 func (v *CharacterSelect) updateCharacterBoxes() {
 	expText := d2common.TranslateString("expansionchar2x")
 	for i := 0; i < 8; i++ {
-		idx := i + (v.scrollOffset * 2)
+		idx := i + (v.charScrollbar.GetCurrentOffset() * 2)
 		if idx >= len(v.gameStates) {
 			v.characterNameLabel[i].SetText("")
 			v.characterStatsLabel[i].SetText("")
@@ -189,18 +200,18 @@ func (v *CharacterSelect) Unload() {
 func (v *CharacterSelect) Render(screen *ebiten.Image) {
 	v.background.DrawSegments(screen, 4, 3, 0)
 	v.d2HeroTitle.Draw(screen)
-	if v.selectedCharacter > -1 {
+	actualSelectionIndex := v.selectedCharacter - (v.charScrollbar.GetCurrentOffset() * 2)
+	if v.selectedCharacter > -1 && actualSelectionIndex >= 0 && actualSelectionIndex < 8 {
 		v.selectionBox.DrawSegments(screen, 2, 1, 0)
 	}
 	for i := 0; i < 8; i++ {
-		idx := i + (v.scrollOffset * 2)
+		idx := i + (v.charScrollbar.GetCurrentOffset() * 2)
 		if idx >= len(v.gameStates) {
 			continue
 		}
 		v.characterNameLabel[i].Draw(screen)
 		v.characterStatsLabel[i].Draw(screen)
 		v.characterExpLabel[i].Draw(screen)
-
 		v.characterImage[i].Render(screen, v.characterNameLabel[i].X-40, v.characterNameLabel[i].Y+30)
 	}
 	if v.showDeleteConfirmation {
@@ -211,9 +222,13 @@ func (v *CharacterSelect) Render(screen *ebiten.Image) {
 }
 
 func (v *CharacterSelect) moveSelectionBox() {
+	if v.selectedCharacter == -1 {
+		v.d2HeroTitle.SetText("")
+		return
+	}
 	bw := 272
 	bh := 92
-	selectedIndex := v.selectedCharacter - (v.scrollOffset * 2)
+	selectedIndex := v.selectedCharacter - (v.charScrollbar.GetCurrentOffset() * 2)
 	v.selectionBox.MoveTo(37+((selectedIndex&1)*int(bw)), 86+(int(bh)*(selectedIndex/2)))
 	v.d2HeroTitle.SetText(v.gameStates[v.selectedCharacter].HeroName)
 }
@@ -234,8 +249,8 @@ func (v *CharacterSelect) Update(tickTime float64) {
 					if localMouseX > int(bw) {
 						selectedIndex += 1
 					}
-					if (v.scrollOffset*2)+selectedIndex < len(v.gameStates) {
+					if (v.charScrollbar.GetCurrentOffset()*2)+selectedIndex < len(v.gameStates) {
-						v.selectedCharacter = (v.scrollOffset * 2) + selectedIndex
+						v.selectedCharacter = (v.charScrollbar.GetCurrentOffset() * 2) + selectedIndex
 						v.moveSelectionBox()
 					}
 				}
@@ -252,9 +267,11 @@ func (v *CharacterSelect) onDeleteCharButtonClicked() {
 
 func (v *CharacterSelect) onDeleteCharacterConfirmClicked() {
 	_ = os.Remove(v.gameStates[v.selectedCharacter].FilePath)
-	v.selectedCharacter = -1
+	v.charScrollbar.SetCurrentOffset(0)
 	v.refreshGameStates()
 	v.toggleDeleteCharacterDialog(false)
+	v.deleteCharButton.SetEnabled(len(v.gameStates) > 0)
+	v.okButton.SetEnabled(len(v.gameStates) > 0)
 }
 
 func (v *CharacterSelect) onDeleteCharacterCancelClicked() {
@@ -277,11 +294,11 @@ func (v *CharacterSelect) refreshGameStates() {
 	if len(v.gameStates) > 0 {
 		v.selectedCharacter = 0
 		v.d2HeroTitle.SetText(v.gameStates[0].HeroName)
+		v.charScrollbar.SetMaxOffset(int(math.Ceil(float64(len(v.gameStates)-8) / float64(2))))
 	} else {
 		v.selectedCharacter = -1
+		v.charScrollbar.SetMaxOffset(0)
 	}
-	v.deleteCharButton.SetEnabled(v.selectedCharacter > -1)
-	v.okButton.SetEnabled(v.selectedCharacter > -1)
 	v.moveSelectionBox()
 
 }

d2core/game_state.go

@@ -81,6 +81,7 @@ func LoadGameState(path string) *GameState {
 	if err != nil {
 		log.Panicf(err.Error())
 	}
+	defer f.Close()
 	sr := d2common.CreateStreamReader(bytes)
 	if sr.GetUInt32() > GameStateVersion {
 		// Unknown game version

d2render/d2ui/Scrollbar.go

@@ -0,0 +1,144 @@
+package d2ui
+
+import (
+	"github.com/OpenDiablo2/OpenDiablo2/d2common/d2enum"
+	"github.com/OpenDiablo2/OpenDiablo2/d2common/d2interface"
+	"github.com/OpenDiablo2/OpenDiablo2/d2common/d2resource"
+	"github.com/OpenDiablo2/OpenDiablo2/d2data/d2datadict"
+	"github.com/OpenDiablo2/OpenDiablo2/d2render"
+	"github.com/hajimehoshi/ebiten"
+)
+
+type Scrollbar struct {
+	x, y, height    int
+	visible         bool
+	enabled         bool
+	currentOffset   int
+	maxOffset       int
+	lastDirChange   int
+	onActivate      func()
+	scrollbarSprite d2render.Sprite
+}
+
+func CreateScrollbar(fileProvider d2interface.FileProvider, x, y, height int) Scrollbar {
+	result := Scrollbar{
+		visible:         true,
+		enabled:         true,
+		x:               x,
+		y:               y,
+		height:          height,
+		scrollbarSprite: d2render.CreateSprite(fileProvider.LoadFile(d2resource.Scrollbar), d2datadict.Palettes[d2enum.Sky]),
+	}
+	return result
+}
+
+func (v Scrollbar) GetEnabled() bool {
+	return v.enabled
+}
+
+func (v *Scrollbar) SetEnabled(enabled bool) {
+	v.enabled = enabled
+}
+
+func (v *Scrollbar) SetPressed(pressed bool) {}
+func (v *Scrollbar) GetPressed() bool        { return false }
+
+func (v *Scrollbar) OnActivated(callback func()) {
+	v.onActivate = callback
+}
+
+func (v Scrollbar) getBarPosition() int {
+	return int((float32(v.currentOffset) / float32(v.maxOffset)) * float32(v.height-30))
+}
+
+func (v *Scrollbar) Activate() {
+	_, my := ebiten.CursorPosition()
+	barPosition := v.getBarPosition()
+	if my <= v.y+barPosition+15 {
+		if v.currentOffset > 0 {
+			v.currentOffset--
+			v.lastDirChange = -1
+		}
+	} else {
+		if v.currentOffset < v.maxOffset {
+			v.currentOffset++
+			v.lastDirChange = 1
+		}
+	}
+	if v.onActivate != nil {
+		v.onActivate()
+	}
+}
+
+func (v Scrollbar) GetLastDirChange() int {
+	return v.lastDirChange
+}
+
+func (v *Scrollbar) Draw(target *ebiten.Image) {
+	if !v.visible || v.maxOffset == 0 {
+		return
+	}
+	offset := 0
+	if !v.enabled {
+		offset = 2
+	}
+	v.scrollbarSprite.MoveTo(v.x, v.y)
+	v.scrollbarSprite.DrawSegments(target, 1, 1, 0+offset)
+	v.scrollbarSprite.MoveTo(v.x, v.y+v.height-10)
+	v.scrollbarSprite.DrawSegments(target, 1, 1, 1+offset)
+	if v.maxOffset == 0 || v.currentOffset < 0 || v.currentOffset > v.maxOffset {
+		return
+	}
+	v.scrollbarSprite.MoveTo(v.x, v.y+10+v.getBarPosition())
+	offset = 0
+	if !v.enabled {
+		offset = 1
+	}
+	v.scrollbarSprite.DrawSegments(target, 1, 1, 4+offset)
+}
+
+func (v *Scrollbar) GetSize() (width, height uint32) {
+	return 10, uint32(v.height)
+}
+
+func (v *Scrollbar) MoveTo(x, y int) {
+	v.x = x
+	v.y = y
+}
+
+func (v *Scrollbar) GetLocation() (x, y int) {
+	return v.x, v.y
+}
+
+func (v *Scrollbar) GetVisible() bool {
+	return v.visible
+}
+
+func (v *Scrollbar) SetVisible(visible bool) {
+	v.visible = visible
+}
+
+func (v *Scrollbar) SetMaxOffset(maxOffset int) {
+	v.maxOffset = maxOffset
+	if v.maxOffset < 0 {
+		v.maxOffset = 0
+	}
+	if v.currentOffset > v.maxOffset {
+		v.currentOffset = v.maxOffset
+	}
+	if v.maxOffset == 0 {
+		v.currentOffset = 0
+	}
+}
+
+func (v *Scrollbar) SetCurrentOffset(currentOffset int) {
+	v.currentOffset = currentOffset
+}
+
+func (v Scrollbar) GetMaxOffset() int {
+	return v.maxOffset
+}
+
+func (v Scrollbar) GetCurrentOffset() int {
+	return v.currentOffset
+}