From 4ac5419276a37480f96a9506e496436378888194 Mon Sep 17 00:00:00 2001 From: Elliot Drees Date: Wed, 25 Jun 2025 13:24:34 -0400 Subject: [PATCH] Label change when clicking on lock in weapons --- src/screenComponents/aimLock.cpp | 4 ++++ src/screens/crew1/singlePilotScreen.cpp | 2 +- src/screens/crew4/tacticalScreen.cpp | 2 +- src/screens/crew6/weaponsScreen.cpp | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/screenComponents/aimLock.cpp b/src/screenComponents/aimLock.cpp index 589218a640..4c15039636 100644 --- a/src/screenComponents/aimLock.cpp +++ b/src/screenComponents/aimLock.cpp @@ -10,6 +10,10 @@ AimLockButton::AimLockButton(GuiContainer* owner, string id, GuiMissileTubeControls* tube_controls, GuiRotationDial* missile_aim) : GuiToggleButton(owner, id, tr("missile","Lock"), [this](bool value) { + if (value) + text = tr("missile","Lock"); + else + text = tr("missile","Manual"); setAimLock(value); }) { diff --git a/src/screens/crew1/singlePilotScreen.cpp b/src/screens/crew1/singlePilotScreen.cpp index 6346025d09..51b2fd3b87 100644 --- a/src/screens/crew1/singlePilotScreen.cpp +++ b/src/screens/crew1/singlePilotScreen.cpp @@ -135,7 +135,7 @@ SinglePilotScreen::SinglePilotScreen(GuiContainer* owner) // Missile lock button near top right of left panel. lock_aim = new AimLockButton(this, "LOCK_AIM", tube_controls, missile_aim); - lock_aim->setPosition(250, 70, sp::Alignment::TopCenter)->setSize(130, 50); + lock_aim->setPosition(250, 70, sp::Alignment::TopCenter)->setSize(145, 50); (new GuiCustomShipFunctions(this, CrewPosition::singlePilot, ""))->setPosition(-20, 120, sp::Alignment::TopRight)->setSize(250, GuiElement::GuiSizeMax); } diff --git a/src/screens/crew4/tacticalScreen.cpp b/src/screens/crew4/tacticalScreen.cpp index 0af7aba692..8b7340bfb3 100644 --- a/src/screens/crew4/tacticalScreen.cpp +++ b/src/screens/crew4/tacticalScreen.cpp @@ -112,7 +112,7 @@ TacticalScreen::TacticalScreen(GuiContainer* owner) }); missile_aim->hide()->setPosition(0, 0, sp::Alignment::Center)->setSize(GuiElement::GuiSizeMatchHeight, 800); lock_aim = new AimLockButton(this, "LOCK_AIM", tube_controls, missile_aim); - lock_aim->setPosition(250, 20, sp::Alignment::TopCenter)->setSize(110, 50); + lock_aim->setPosition(250, 20, sp::Alignment::TopCenter)->setSize(145, 50); // Combat maneuver and propulsion controls in the bottom right corner. (new GuiCombatManeuver(this, "COMBAT_MANEUVER"))->setPosition(-20, -390, sp::Alignment::BottomRight)->setSize(200, 150); diff --git a/src/screens/crew6/weaponsScreen.cpp b/src/screens/crew6/weaponsScreen.cpp index 872625630c..6dec2a4f0a 100644 --- a/src/screens/crew6/weaponsScreen.cpp +++ b/src/screens/crew6/weaponsScreen.cpp @@ -63,7 +63,7 @@ WeaponsScreen::WeaponsScreen(GuiContainer* owner) radar->enableTargetProjections(tube_controls); lock_aim = new AimLockButton(this, "LOCK_AIM", tube_controls, missile_aim); - lock_aim->setPosition(250, 20, sp::Alignment::TopCenter)->setSize(130, 50); + lock_aim->setPosition(250, 20, sp::Alignment::TopCenter)->setSize(145, 50); if (gameGlobalInfo->use_beam_shield_frequencies || gameGlobalInfo->use_system_damage) {