From c808021c7c9ae480d2d27a4735516ed02f688049 Mon Sep 17 00:00:00 2001
From: SilentSpike <silentspike100+Github@gmail.com>
Date: Wed, 5 Aug 2015 21:11:25 +0100
Subject: [PATCH] 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
---
 addons/spectator/UI/interface.hpp                | 14 +++++++-------
 addons/spectator/functions/fnc_handleToolbar.sqf | 12 ++++++------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/addons/spectator/UI/interface.hpp b/addons/spectator/UI/interface.hpp
index bd6d34339f..2ac33e4a64 100644
--- a/addons/spectator/UI/interface.hpp
+++ b/addons/spectator/UI/interface.hpp
@@ -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};
diff --git a/addons/spectator/functions/fnc_handleToolbar.sqf b/addons/spectator/functions/fnc_handleToolbar.sqf
index fd29ca532e..878f3e46de 100644
--- a/addons/spectator/functions/fnc_handleToolbar.sqf
+++ b/addons/spectator/functions/fnc_handleToolbar.sqf
@@ -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);