From 3b6686778c679154173d605abacaecec2fdb2a20 Mon Sep 17 00:00:00 2001 From: Angeldark Raymaker Date: Sun, 20 Oct 2024 00:08:42 +0100 Subject: [PATCH] FIRE-30873: Allow trackpad to adjust 3rd axis without mousedown --- indra/newview/fsvirtualtrackpad.cpp | 5 ++++- indra/newview/skins/default/xui/en/floater_poser.xml | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/indra/newview/fsvirtualtrackpad.cpp b/indra/newview/fsvirtualtrackpad.cpp index 5c2941eb6e..a196592484 100644 --- a/indra/newview/fsvirtualtrackpad.cpp +++ b/indra/newview/fsvirtualtrackpad.cpp @@ -472,13 +472,16 @@ bool FSVirtualTrackpad::handleRightMouseDown(S32 x, S32 y, MASK mask) // pass wheel-clicks to third axis bool FSVirtualTrackpad::handleScrollWheel(S32 x, S32 y, S32 clicks) { - if (hasMouseCapture()) + if (hasMouseCapture() || isPointInTouchArea(x, y)) { if (_doingPinchMode) _pinchValueZ -= clicks * WheelClickQuanta; else _valueZ -= clicks * WheelClickQuanta; + if (!hasMouseCapture()) + onCommit(); + return true; } else diff --git a/indra/newview/skins/default/xui/en/floater_poser.xml b/indra/newview/skins/default/xui/en/floater_poser.xml index c8ae6a7c29..05970fad99 100644 --- a/indra/newview/skins/default/xui/en/floater_poser.xml +++ b/indra/newview/skins/default/xui/en/floater_poser.xml @@ -644,7 +644,7 @@ width="565"> top_delta="15" height="153" width="153" - tool_tip="Change the rotation of the currently selected body part(s). Hold Ctrl to move slow. Roll the wheel while holding to adjust the 3rd axis" + tool_tip="Change the rotation of the currently selected body part(s). Hold Ctrl to move slow. Roll the wheel any time to adjust the 3rd axis" pinch_mode="false" infinite_scroll_mode="true"/>