mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
Update spectator UI styling
Adds a title to the unit tree to match the help list and enters the title text.
This commit is contained in:
parent
702e50b731
commit
1c79c8fa45
@ -137,11 +137,11 @@ class GVAR(interface) {
|
||||
idc = -1;
|
||||
style = 64;
|
||||
};
|
||||
class fovTool: viewTool {
|
||||
class zoomTool: viewTool {
|
||||
idc = IDC_TOOL_FOV;
|
||||
x = safeZoneW - TOOL_W * 2 - MARGIN;
|
||||
};
|
||||
class fovFrame: fovTool {
|
||||
class zoomFrame: zoomTool {
|
||||
idc = -1;
|
||||
style = 64;
|
||||
};
|
||||
@ -155,16 +155,33 @@ class GVAR(interface) {
|
||||
};
|
||||
};
|
||||
};
|
||||
class unitTree: RscTree {
|
||||
class unitTree: RscControlsGroupNoScrollbars {
|
||||
idc = IDC_UNIT;
|
||||
x = safeZoneX;
|
||||
y = safeZoneY + TOOL_H * 6;
|
||||
w = TOOL_W * 2;
|
||||
h = safeZoneH - TOOL_H * 13;
|
||||
sizeEx = H_PART(0.8);
|
||||
borderSize = 1;
|
||||
class controls {
|
||||
class unitTitle: RscText {
|
||||
x = 0;
|
||||
y = 0;
|
||||
w = TOOL_W * 2;
|
||||
h = H_PART(1);
|
||||
style = 2;
|
||||
colorText[] = {COL_FORE};
|
||||
colorBorder[] = {COL_FORE};
|
||||
colorBackground[] = {COL_FORE_D};
|
||||
sizeEx = H_PART(1);
|
||||
text = CSTRING(UnitTitle);
|
||||
};
|
||||
class unitTree: RscTree {
|
||||
idc = IDC_UNIT_TREE;
|
||||
x = 0;
|
||||
y = H_PART(1);
|
||||
w = TOOL_W * 2;
|
||||
h = safeZoneH - TOOL_H * 14;
|
||||
sizeEx = H_PART(0.8);
|
||||
colorText[] = {COL_FORE};
|
||||
colorBorder[] = {0,0,0,0};
|
||||
colorBackground[] = {COL_BACK};
|
||||
colorSelect[] = {
|
||||
"profilenamespace getvariable ['GUI_BCG_RGB_R',0.77]",
|
||||
@ -175,6 +192,16 @@ class GVAR(interface) {
|
||||
multiselectEnabled = 0;
|
||||
onTreeDblClick = QUOTE([ARR_2('onTreeDblClick',_this)] call FUNC(handleInterface));
|
||||
};
|
||||
class unitFrame: RscFrame {
|
||||
x = 0;
|
||||
y = 0;
|
||||
w = TOOL_W * 2;
|
||||
h = safeZoneH - TOOL_H * 13;
|
||||
shadow = 2;
|
||||
colorText[] = {COL_FORE};
|
||||
};
|
||||
};
|
||||
};
|
||||
class mapOverlay: RscMapControl {
|
||||
idc = IDC_MAP;
|
||||
type = 100;
|
||||
@ -191,16 +218,13 @@ class GVAR(interface) {
|
||||
y = safeZoneY + TOOL_H * 6;
|
||||
w = TOOL_W * 2;
|
||||
h = safeZoneH - TOOL_H * 13;
|
||||
colorText[] = {COL_FORE};
|
||||
colorSelectBackground[] = {COL_FORE_D};
|
||||
colorSelectBackground2[] = {COL_BACK};
|
||||
colorBackground[] = {0,0,0,0};
|
||||
class controls {
|
||||
class helpTitle: RscText {
|
||||
x = 0;
|
||||
y = 0;
|
||||
w = TOOL_W * 2;
|
||||
h = H_PART(1);
|
||||
style = 2;
|
||||
colorText[] = {COL_FORE};
|
||||
colorBackground[] = {COL_FORE_D};
|
||||
sizeEx = H_PART(1);
|
||||
@ -213,15 +237,16 @@ class GVAR(interface) {
|
||||
w = TOOL_W * 2;
|
||||
h = safeZoneH - TOOL_H * 14;
|
||||
colorBackground[] = {COL_BACK};
|
||||
sizeEx = H_PART(0.8);
|
||||
default = 1;
|
||||
};
|
||||
class helpFrame: RscText {
|
||||
class helpFrame: RscFrame {
|
||||
x = 0;
|
||||
y = 0;
|
||||
w = TOOL_W * 2;
|
||||
h = safeZoneH - TOOL_H * 13;
|
||||
shadow = 2;
|
||||
colorText[] = {COL_FORE};
|
||||
style = 64;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
@ -36,5 +36,5 @@ if !(GVAR(camUnit) in GVAR(unitList)) then {
|
||||
// Reduce overhead when unit tree is hidden
|
||||
if (ctrlShown (_display displayCtrl IDC_UNIT)) then {
|
||||
// Reduce overhead by spreading across frames
|
||||
[FUNC(handleInterface),["onUnitsUpdate",[_display displayCtrl IDC_UNIT]],1] call EFUNC(common,waitAndExecute);
|
||||
[FUNC(handleInterface),["onUnitsUpdate",[(_display displayCtrl IDC_UNIT) controlsGroupCtrl IDC_UNIT_TREE]],1] call EFUNC(common,waitAndExecute);
|
||||
};
|
||||
|
@ -49,8 +49,9 @@
|
||||
#define IDC_TOOL_VISION 3004
|
||||
|
||||
#define IDC_UNIT 6002
|
||||
#define IDC_UNIT_TREE 6005
|
||||
|
||||
// UI colours
|
||||
#define COL_BACK 0.1,0.1,0.1,0.8
|
||||
#define COL_BACK 0.1,0.1,0.1,0.7
|
||||
#define COL_FORE 1,1,1,1
|
||||
#define COL_FORE_D 0.1,0.1,0.1,1
|
||||
#define COL_FORE_D 0.1,0.1,0.1,0.8
|
||||
|
@ -101,6 +101,9 @@
|
||||
<Polish>Termowizja</Polish>
|
||||
</Key>
|
||||
<!-- Interface strings -->
|
||||
<Key ID="STR_ACE_Spectator_UnitTitle">
|
||||
<English>Spectator Units</English>
|
||||
</Key>
|
||||
<Key ID="STR_ACE_Spectator_HelpTitle">
|
||||
<English>Spectator Controls</English>
|
||||
<Polish>Sterowanie obserwatorem</Polish>
|
||||
|
Loading…
Reference in New Issue
Block a user