diff --git a/AUTHORS.txt b/AUTHORS.txt index c0fbda03240..90c49cb9663 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -173,3 +173,4 @@ zGuba Fyuran dabako Frank +10Dozen a.k.a Dusin diff --git a/addons/markers/XEH_PREP.hpp b/addons/markers/XEH_PREP.hpp index 02214231ecb..113b48bb82d 100644 --- a/addons/markers/XEH_PREP.hpp +++ b/addons/markers/XEH_PREP.hpp @@ -6,7 +6,9 @@ PREP(onLBSelChangedChannel); PREP(onLBSelChangedColor); PREP(onLBSelChangedShape); PREP(onSliderPosChangedAngle); +PREP(onSliderMouseButtonUpAngle); PREP(onSliderPosChangedScale); +PREP(onSliderMouseButtonUpScale); PREP(placeMarker); PREP(sendMarkersJIP); PREP(setMarkerJIP); diff --git a/addons/markers/functions/fnc_initInsertMarker.sqf b/addons/markers/functions/fnc_initInsertMarker.sqf index c5fa330c85b..2aa7a0155eb 100644 --- a/addons/markers/functions/fnc_initInsertMarker.sqf +++ b/addons/markers/functions/fnc_initInsertMarker.sqf @@ -332,10 +332,12 @@ private _curSelAngle = GETGVAR(currentMarkerAngle,0); _aceAngleSlider sliderSetPosition _curSelAngle; + _aceAngleSlider ctrlSetTooltip LLSTRING(MarkerDirectionScaleSlider_Tooltip); //Update now and add eventHandler: [_aceAngleSlider, _curSelAngle] call FUNC(onSliderPosChangedAngle); _aceAngleSlider ctrlAddEventHandler ["SliderPosChanged", {_this call FUNC(onSliderPosChangedAngle)}]; + _aceAngleSlider ctrlAddEventHandler ["MouseButtonUp", {_this call FUNC(onSliderMouseButtonUpAngle)}]; //////////////////// // init marker scale slider @@ -348,8 +350,10 @@ private _curSelScale = GETGVAR(currentMarkerScale,1); _aceScaleSlider sliderSetPosition _curSelScale; + _aceScaleSlider ctrlSetTooltip LLSTRING(MarkerDirectionScaleSlider_Tooltip); //Update now and add eventHandler: [_aceScaleSlider, _curSelScale] call FUNC(onSliderPosChangedScale); _aceScaleSlider ctrlAddEventHandler ["SliderPosChanged", {_this call FUNC(onSliderPosChangedScale)}]; + _aceScaleSlider ctrlAddEventHandler ["MouseButtonUp", {_this call FUNC(onSliderMouseButtonUpScale)}]; }, _this] call CBA_fnc_execNextFrame; diff --git a/addons/markers/functions/fnc_onSliderMouseButtonUpAngle.sqf b/addons/markers/functions/fnc_onSliderMouseButtonUpAngle.sqf new file mode 100644 index 00000000000..b6c29cfd1ac --- /dev/null +++ b/addons/markers/functions/fnc_onSliderMouseButtonUpAngle.sqf @@ -0,0 +1,25 @@ +#include "script_component.hpp" +/* + * Author: 10Dozen + * Angle slider clicked handler. Resets slider pos to 0 on RMB button up. + * + * Arguments: + * 0: Slider (idc 1210) is expected + * 1: Button released (0 - Left mouse btn, 1 - Right mouse btn) + * + * Return Value: + * None + * + * Example: + * [Slider, 1] call ace_markers_fnc_onSliderMouseButtonUpAngle + * + * Public: No + */ + +params ["_aceAngleSlider", "_button"]; +TRACE_2("params",_aceAngleSlider,_button); + +if (_button isNotEqualTo 1) exitWith {}; + +_aceAngleSlider sliderSetPosition 0; +[_aceAngleSlider, 0] call FUNC(onSliderPosChangedAngle); diff --git a/addons/markers/functions/fnc_onSliderMouseButtonUpScale.sqf b/addons/markers/functions/fnc_onSliderMouseButtonUpScale.sqf new file mode 100644 index 00000000000..144f1c49096 --- /dev/null +++ b/addons/markers/functions/fnc_onSliderMouseButtonUpScale.sqf @@ -0,0 +1,25 @@ +#include "script_component.hpp" +/* + * Author: 10Dozen + * Scale slider clicked handler. Resets slider pos to 1 on RMB button up. + * + * Arguments: + * 0: Slider (idc 1420) is expected + * 1: Button released (0 - Left mouse btn, 1 - Right mouse btn) + * + * Return Value: + * None + * + * Example: + * [Slider, 1] call ace_markers_fnc_onSliderMouseButtonUpScale + * + * Public: No + */ + +params ["_aceScaleSlider", "_button"]; +TRACE_2("params",_aceScaleSlider,_button); + +if (_button isNotEqualTo 1) exitWith {}; + +_aceScaleSlider sliderSetPosition 1; +[_aceScaleSlider, 1] call FUNC(onSliderPosChangedScale); diff --git a/addons/markers/stringtable.xml b/addons/markers/stringtable.xml index 1c6af7d7218..53c9ce56009 100644 --- a/addons/markers/stringtable.xml +++ b/addons/markers/stringtable.xml @@ -24,6 +24,10 @@ 方位: %1° Yön: %1° + + Click RMB to reset + Нажми ПКМ чтобы сбросить + Markers Markierungen