diff options
author | Kae <80987908+Novaenia@users.noreply.github.com> | 2023-06-28 01:07:55 +1000 |
---|---|---|
committer | Kae <80987908+Novaenia@users.noreply.github.com> | 2023-06-28 01:07:55 +1000 |
commit | 59ab7dabe6b24fe998764f23d0da15aa7d4af3f9 (patch) | |
tree | c3a318aa247027be531227f1d71238dbb0bee94b /source/frontend/StarTeamBar.cpp | |
parent | a1e428fafa61b98d5405914290f251978cd9ac31 (diff) |
Misc internal UI fixes
Diffstat (limited to 'source/frontend/StarTeamBar.cpp')
-rw-r--r-- | source/frontend/StarTeamBar.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/source/frontend/StarTeamBar.cpp b/source/frontend/StarTeamBar.cpp index 6091d9c..8bdd3b3 100644 --- a/source/frontend/StarTeamBar.cpp +++ b/source/frontend/StarTeamBar.cpp @@ -40,7 +40,7 @@ TeamBar::TeamBar(MainInterface* mainInterface, UniverseClientPtr client) { return; auto position = jsonToVec2I(Root::singleton().assets()->json("/interface/windowconfig/teambar.config:selfMenuOffset")); position[1] += windowHeight() / m_guiContext->interfaceScale(); - showMemberMenu(m_client->mainPlayer()->uuid(), position); + showMemberMenu(m_client->mainPlayer()->clientContext()->serverUuid(), position); }); reader.construct(assets->json("/interface/windowconfig/teambar.config:paneLayout"), this); @@ -48,6 +48,7 @@ TeamBar::TeamBar(MainInterface* mainInterface, UniverseClientPtr client) { m_healthBar = fetchChild<ProgressWidget>("healthBar"); m_energyBar = fetchChild<ProgressWidget>("energyBar"); m_foodBar = fetchChild<ProgressWidget>("foodBar"); + m_nameLabel = fetchChild<LabelWidget>("name"); m_energyBarColor = jsonToColor(assets->json("/interface/windowconfig/teambar.config:energyBarColor")); m_energyBarRegenMixColor = jsonToColor(assets->json("/interface/windowconfig/teambar.config:energyBarRegenMixColor")); @@ -58,8 +59,7 @@ TeamBar::TeamBar(MainInterface* mainInterface, UniverseClientPtr client) { auto playerPortrait = fetchChild<PortraitWidget>("portrait"); playerPortrait->setEntity(as<PortraitEntity>(m_client->mainPlayer())); - fetchChild<LabelWidget>("name")->setText(m_client->mainPlayer()->name()); - + updatePlayerResources(); disableScissoring(); } @@ -131,6 +131,8 @@ void TeamBar::updatePlayerResources() { } else { m_energyBar->setColor(m_energyBarColor.mix(m_energyBarRegenMixColor, player->energyRegenBlockPercent())); } + + m_nameLabel->setText(m_client->mainPlayer()->name()); } void TeamBar::inviteButton() { @@ -153,8 +155,9 @@ void TeamBar::buildTeamBar() { int memberSize = assets->json("/interface/windowconfig/teambar.config:memberSize").toInt(); int memberSpacing = assets->json("/interface/windowconfig/teambar.config:memberSpacing").toInt(); + Uuid myUuid = player->clientContext()->serverUuid(); for (auto member : teamClient->members()) { - if (member.uuid == player->uuid()) { + if (member.uuid == myUuid) { memberIndex++; continue; } @@ -357,7 +360,7 @@ void TeamMemberMenu::update() { void TeamMemberMenu::updateWidgets() { bool isLeader = m_owner->m_client->teamClient()->isTeamLeader(); - bool isSelf = m_owner->m_client->mainPlayer()->uuid() == m_memberUuid; + bool isSelf = m_owner->m_client->mainPlayer()->clientContext()->serverUuid() == m_memberUuid; fetchChild<ButtonWidget>("beamToShip")->setEnabled(m_canBeam); fetchChild<ButtonWidget>("makeLeader")->setEnabled(isLeader && !isSelf); |