From 81ebabeeff381d40abe7fa2bc2a728d1feac0db0 Mon Sep 17 00:00:00 2001 From: "M. Sz" Date: Sun, 17 Jan 2021 21:00:21 +0100 Subject: [PATCH] party panel: bar positioning --- d2game/d2player/party_panel.go | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/d2game/d2player/party_panel.go b/d2game/d2player/party_panel.go index 9d276ae6..240d7ef5 100644 --- a/d2game/d2player/party_panel.go +++ b/d2game/d2player/party_panel.go @@ -212,12 +212,6 @@ func (s *PartyPanel) Load() { s.Error(err.Error()) } - // nolint:gomnd // test data - s.barX, s.barY = barX, baseBarY+2*nextBar - w, h = s.bar.GetCurrentFrameSize() - v := s.uiManager.NewCustomWidget(s.renderBar, w, h) - s.panelGroup.AddWidget(v) - // example data s.partyIndexes[0] = s.newPartyIndex("PartyMember", d2enum.HeroPaladin, 5, 0, d2enum.PlayerRelationEnemy) s.partyIndexes[1] = s.newPartyIndex("gameMember1", d2enum.HeroPaladin, 99, 1, d2enum.PlayerRelationFriend) @@ -249,6 +243,18 @@ func (s *PartyPanel) Load() { } } + for n, i := range s.partyIndexes { + currentN := n + if i.name == nil { + s.barX, s.barY = barX, baseBarY+currentN*nextBar + break + } + } + + w, h = s.bar.GetCurrentFrameSize() + v := s.uiManager.NewCustomWidget(s.renderBar, w, h) + s.panelGroup.AddWidget(v) + s.panelGroup.SetVisible(false) }