Merge branch 'selfInteractionMenu' of github.com:KoffeinFlummi/ACE3 into selfInteractionMenu

This commit is contained in:
Nicolás Badano 2015-02-19 10:39:28 -03:00
commit 53f632c716
2 changed files with 4 additions and 7 deletions

View File

@ -18,12 +18,9 @@ if(count _sPos > 0) then {
if(_icon == "") then {
_icon = DEFAULT_ICON;
};
_text = "<img image='" + _icon + "' />" + _text;
_text = format ["<img image='%1'/><t color ='%2'>%3</t>", _icon, _color, _text];
_ctrl ctrlSetStructuredText (parseText _text);
_ctrl ctrlSetPosition [(_sPos select 0)-(0.011*SafeZoneW), (_sPos select 1)-(0.0095*SafeZoneW), 0.4*SafeZoneW, 0.025*SafeZoneW];
_ctrl ctrlSetForegroundColor _color;
_opacity = _color select 3;
_control ctrlSetTextColor _color;
// _ctrl ctrlSetBackgroundColor [1,0,0,1];
_ctrl ctrlCommit 0;
};

View File

@ -28,13 +28,13 @@ if(_cursorScreenPos distance _pos <= _distance) then {
};
_menuDepth = (count GVAR(menuDepthPath));
_opacity = 1;
_color = "#FFFFFFFF"; // ARGB Color (First Hex Pair is transparancy)
if(_menuDepth > 0 && _index != (GVAR(menuDepthPath) select (GVAR(renderDepth)))) then {
_opacity = ((GVAR(renderDepth)/_menuDepth)) max 0.25;
_color = format ["#%1FFFFFF", [255 * (((GVAR(renderDepth)/_menuDepth)) max 0.25)] call EFUNC(common,toHex)];
};
_path set[(count _path), _index];
// player sideChat format["r: %1", _actionData select 2];
[_actionData select 0, [1,1,1,_opacity], _pos, 1, 1, 0, _actionData select 1, 0.5, 0.025, "TahomaB"] call FUNC(renderIcon);
[_actionData select 0, _color, _pos, 1, 1, 0, _actionData select 1, 0.5, 0.025, "TahomaB"] call FUNC(renderIcon);
GVAR(currentOptions) set[(count GVAR(currentOptions)), [_this, _pos, _path]];
_currentRenderDepth = -1;
_currentRenderDepth = GVAR(renderDepth);