mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
Change spectator UI toggle to include help window
With new layout of help window the toggle UX also changes. User expects help window to toggle as part of overall UI.
This commit is contained in:
parent
043c5c47c5
commit
485f9438bb
@ -31,17 +31,8 @@ _map = _display displayCtrl IDC_MAP;
|
|||||||
_tool = _display displayCtrl IDC_TOOL;
|
_tool = _display displayCtrl IDC_TOOL;
|
||||||
_unit = _display displayCtrl IDC_UNIT;
|
_unit = _display displayCtrl IDC_UNIT;
|
||||||
|
|
||||||
// Map and help operate outside of interface
|
// Map operates outside of interface
|
||||||
GVAR(showHelp) = [GVAR(showHelp), !GVAR(showHelp)] select _toggleHelp;
|
|
||||||
GVAR(showMap) = [GVAR(showMap), !GVAR(showMap)] select _toggleMap;
|
GVAR(showMap) = [GVAR(showMap), !GVAR(showMap)] select _toggleMap;
|
||||||
|
|
||||||
// When help changes with map open, minimise the map
|
|
||||||
if (GVAR(showMap) && _toggleHelp) then {
|
|
||||||
GVAR(showHelp) = true;
|
|
||||||
GVAR(showMap) = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
_help ctrlShow GVAR(showHelp);
|
|
||||||
_map ctrlShow GVAR(showMap);
|
_map ctrlShow GVAR(showMap);
|
||||||
|
|
||||||
if (GVAR(showMap)) then {
|
if (GVAR(showMap)) then {
|
||||||
@ -62,16 +53,18 @@ if (GVAR(showMap)) then {
|
|||||||
if (GVAR(showInterface)) then {
|
if (GVAR(showInterface)) then {
|
||||||
// Can only toggle interface elements with interface shown
|
// Can only toggle interface elements with interface shown
|
||||||
GVAR(showComp) = [GVAR(showComp), !GVAR(showComp)] select _toggleComp;
|
GVAR(showComp) = [GVAR(showComp), !GVAR(showComp)] select _toggleComp;
|
||||||
|
GVAR(showHelp) = [GVAR(showHelp), !GVAR(showHelp)] select _toggleHelp;
|
||||||
GVAR(showTool) = [GVAR(showTool), !GVAR(showTool)] select _toggleTool;
|
GVAR(showTool) = [GVAR(showTool), !GVAR(showTool)] select _toggleTool;
|
||||||
GVAR(showUnit) = [GVAR(showUnit), !GVAR(showUnit)] select _toggleUnit;
|
GVAR(showUnit) = [GVAR(showUnit), !GVAR(showUnit)] select _toggleUnit;
|
||||||
|
|
||||||
_comp ctrlShow GVAR(showComp);
|
_comp ctrlShow GVAR(showComp);
|
||||||
|
_help ctrlShow GVAR(showHelp);
|
||||||
_tool ctrlShow GVAR(showTool);
|
_tool ctrlShow GVAR(showTool);
|
||||||
_unit ctrlShow GVAR(showUnit);
|
_unit ctrlShow GVAR(showUnit);
|
||||||
} else {
|
} else {
|
||||||
{
|
{
|
||||||
_x ctrlShow false;
|
_x ctrlShow false;
|
||||||
} forEach [_comp,_tool,_unit];
|
} forEach [_comp,_help,_tool,_unit];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user