From 2b2fba1473b414e1ffbeaea01e448fd9ffc28c42 Mon Sep 17 00:00:00 2001 From: Bobby Walker Date: Mon, 30 Mar 2026 13:03:46 -0500 Subject: [PATCH 1/3] add hotkey for probeview --- src/gui/hotkeyConfig.cpp | 2 ++ src/gui/hotkeyConfig.h | 1 + src/screens/crew6/scienceScreen.cpp | 6 ++++++ 3 files changed, 9 insertions(+) diff --git a/src/gui/hotkeyConfig.cpp b/src/gui/hotkeyConfig.cpp index 96981248db..96954f2807 100644 --- a/src/gui/hotkeyConfig.cpp +++ b/src/gui/hotkeyConfig.cpp @@ -229,6 +229,7 @@ Keys::Keys() : // Science crew screen science_scan_object("SCIENCE_SCAN_OBJECT", "S"), science_scan_abort("SCIENCE_SCAN_ABORT", "D"), + science_toggle_probe_view("SCIENCE_TOGGLE_PROBE_VIEW"), science_select_next_scannable("SCIENCE_SELECT_NEXT_SCANNABLE", "C"), science_scan_param_increase{{ {"SCIENCE_SCAN_PARAM_INCREASE_1"}, @@ -430,6 +431,7 @@ void Keys::init() // Science science_scan_object.setLabel(tr("hotkey_menu", "Science"), tr("hotkey_Science", "Scan object")); science_scan_abort.setLabel(tr("hotkey_menu", "Science"), tr("hotkey_Science", "Abort scan")); + science_toggle_probe_view.setLabel(tr("hotkey_menu", "Science"), tr("hotkey_Science", "Toggle probe view")); science_select_next_scannable.setLabel(tr("hotkey_menu", "Science"), tr("hotkey_Science", "Select next scannable object")); for (auto n = 0u; n < science_scan_param_increase.size(); n++) { diff --git a/src/gui/hotkeyConfig.h b/src/gui/hotkeyConfig.h index 5fee57b9d4..914472de56 100644 --- a/src/gui/hotkeyConfig.h +++ b/src/gui/hotkeyConfig.h @@ -119,6 +119,7 @@ class Keys sp::io::Keybinding science_scan_object; sp::io::Keybinding science_scan_abort; sp::io::Keybinding science_select_next_scannable; + sp::io::Keybinding science_toggle_probe_view; std::array science_scan_param_increase; std::array science_scan_param_decrease; std::array science_scan_param_set; diff --git a/src/screens/crew6/scienceScreen.cpp b/src/screens/crew6/scienceScreen.cpp index 416071a0bb..ff9a78b49d 100644 --- a/src/screens/crew6/scienceScreen.cpp +++ b/src/screens/crew6/scienceScreen.cpp @@ -537,6 +537,12 @@ void ScienceScreen::onUpdate() { if (my_spaceship) { + // Toggle probe view from the Science hotkey. + auto rl = my_spaceship.getComponent(); + if (keys.science_toggle_probe_view.getDown() && rl && rl->linked_entity) + { + probe_view_button->setValue(!probe_view_button->getValue()); + } // Initiate a scan on scannable objects. if (keys.science_scan_object.getDown() && my_spaceship.hasComponent() && From 65adb0315e174c8069f597fdb87ccb1391ba687c Mon Sep 17 00:00:00 2001 From: Bobby Walker Date: Mon, 6 Apr 2026 20:56:09 -0500 Subject: [PATCH 2/3] setting up a toggle option to call onclick() --- src/gui/gui2_togglebutton.cpp | 4 ++++ src/screens/crew6/scienceScreen.cpp | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/gui/gui2_togglebutton.cpp b/src/gui/gui2_togglebutton.cpp index 840f914d58..01fbb1f104 100644 --- a/src/gui/gui2_togglebutton.cpp +++ b/src/gui/gui2_togglebutton.cpp @@ -52,6 +52,10 @@ bool GuiToggleButton::getValue() const return value; } +void GuiToggleButton::toggle() { + onClick(); // trigger the click event used to toggle probe view vie key. +} + GuiToggleButton* GuiToggleButton::setValue(bool value) { if (this->value == value) diff --git a/src/screens/crew6/scienceScreen.cpp b/src/screens/crew6/scienceScreen.cpp index ff9a78b49d..aac4e3b7f7 100644 --- a/src/screens/crew6/scienceScreen.cpp +++ b/src/screens/crew6/scienceScreen.cpp @@ -541,7 +541,7 @@ void ScienceScreen::onUpdate() auto rl = my_spaceship.getComponent(); if (keys.science_toggle_probe_view.getDown() && rl && rl->linked_entity) { - probe_view_button->setValue(!probe_view_button->getValue()); + probe_view_button->toggle(); } // Initiate a scan on scannable objects. if (keys.science_scan_object.getDown() && From 0a8543d9679b3f770c796aa4ab4aa8ce26851595 Mon Sep 17 00:00:00 2001 From: Bobby Walker Date: Mon, 6 Apr 2026 21:12:26 -0500 Subject: [PATCH 3/3] forgot to declare the toggle --- src/gui/gui2_togglebutton.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gui/gui2_togglebutton.h b/src/gui/gui2_togglebutton.h index edcb2eed39..65474a6a13 100644 --- a/src/gui/gui2_togglebutton.h +++ b/src/gui/gui2_togglebutton.h @@ -20,6 +20,7 @@ class GuiToggleButton : public GuiButton bool getValue() const; GuiToggleButton* setValue(bool value); + void toggle(); private: void onClick(); };