muskit/spice2x.github.io
0
0
Fork 0
mirror of https://github.com/spice2x/spice2x.github.io.git synced 2026-08-01 14:20:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

overlay: toggle main menu independently (#759)

Browse Source 
Recently there was a change to make the main menu also toggle the
overlay; revert that.
This commit is contained in:
bicarus
2026-06-15 01:45:02 -07:00
committed by GitHub
parent 4af006e869
commit 6fec169347
2 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/spice2x/overlay/overlay.cpp
-5
View File
@@ -832,10 +832,6 @@ void overlay::SpiceOverlay::show_main_menu() {
if (this->window_main_menu->get_active()) { if (this->window_main_menu->get_active()) {
// window already visible - close the window // window already visible - close the window
this->window_main_menu->set_active(false); this->window_main_menu->set_active(false);
// if the overlay was not visible when this came into view, turn off overlay as well
if (!this->overlay_active_when_main_menu_shown) {
this->set_active(false);
}
return; return;
} }
@@ -845,7 +841,6 @@ void overlay::SpiceOverlay::show_main_menu() {
return; return;
} }
this->overlay_active_when_main_menu_shown = this->get_active();
if (this->get_active()) { if (this->get_active()) {
if (!ImGui::IsAnyItemActive() && !ImGui::IsAnyItemFocused()) { if (!ImGui::IsAnyItemActive() && !ImGui::IsAnyItemFocused()) {
this->window_main_menu->set_active(true); this->window_main_menu->set_active(true);
src/spice2x/overlay/overlay.h
-1
View File
@@ -202,7 +202,6 @@ namespace overlay {
bool active = false; bool active = false;
bool toggle_down = false; bool toggle_down = false;
bool main_menu_down = false; bool main_menu_down = false;
bool overlay_active_when_main_menu_shown = false;
bool fps_down = false; bool fps_down = false;
bool hotkey_toggle = false; bool hotkey_toggle = false;
bool hotkey_toggle_last = false; bool hotkey_toggle_last = false;