Tweak spectator interface layout

- Swap the FOV and vision mode tools into a more logical order.
- Shorten the unit list to prevent overlay with main UI
- Fix name tool on dead units
This commit is contained in:
SilentSpike 2015-08-05 21:11:25 +01:00
parent 42b5abae11
commit c808021c7c
2 changed files with 13 additions and 13 deletions

View File

@ -121,11 +121,11 @@ class GVAR(interface) {
idc = -1;
style = 64;
};
class fovTool: viewTool {
idc = IDC_TOOL_FOV;
class visionTool: viewTool {
idc = IDC_TOOL_VISION;
x = TOOL_W * 3 + MARGIN * 2;
};
class fovFrame: fovTool {
class visionFrame: visionTool {
idc = -1;
style = 64;
};
@ -137,11 +137,11 @@ class GVAR(interface) {
idc = -1;
style = 64;
};
class visionTool: viewTool {
idc = IDC_TOOL_VISION;
class fovTool: viewTool {
idc = IDC_TOOL_FOV;
x = safeZoneW - TOOL_W * 2 - MARGIN;
};
class visionFrame: visionTool {
class fovFrame: fovTool {
idc = -1;
style = 64;
};
@ -160,7 +160,7 @@ class GVAR(interface) {
x = safeZoneX;
y = safeZoneY + TOOL_H * 2;
w = TOOL_W * 2;
h = safeZoneH - TOOL_H * 4;
h = safeZoneH - TOOL_H * 6;
sizeEx = H_PART(0.8);
borderSize = 1;
colorBorder[] = {COL_FORE};

View File

@ -1,6 +1,6 @@
/*
* Author: Karel Moricky, SilentSpike
* Handles the spectator UI toolbar values and applies them to the camera
* Handles the spectator UI toolbar values
*
* Arguments:
* 0: Parameters <ANY>
@ -31,15 +31,15 @@ if (GVAR(camMode) == 0) then {
_fov = format ["%1x", floor(GVAR(camZoom) * 100) * 0.01];
_speed = format ["%1 m/s", floor(GVAR(camSpeed) * 100) * 0.01];
} else {
_vision = format ["%1 m", floor(getPosASL GVAR(camUnit) select 2)];
_fov = [side group GVAR(camUnit)] call BIS_fnc_sideName;
_vision = [side group GVAR(camUnit)] call BIS_fnc_sideName;
_fov = format ["%1 m", floor(getPosASL GVAR(camUnit) select 2)];
_speed = format ["%1 km/h", floor(speed GVAR(camUnit)) max 0];
};
if (isNull GVAR(camUnit)) then {
_name = localize "STR_Special_None";
} else {
if (alive GVAR(camUnit)) then {
_name = GETVAR(GVAR(camUnit),GVAR(uName),"");
} else {
_name = localize "STR_Special_None";
};
_mode = [localize LSTRING(ViewFree),localize LSTRING(ViewInternal),localize LSTRING(ViewExternal)] select GVAR(camMode);