livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Poser: remove all the double-clicks 

from set T-Pose, Reset current joint (bin button), copy L>R and R>L buttons, and load hand-preset buttons; update tooltip messages
master
Angeldark Raymaker 2025-04-01 18:04:52 +01:00
parent e6121931d9
commit 0e37840253
3 changed files with 18 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
indra/newview/fsfloaterposer.cpp
View File

@ -691,9 +691,6 @@ void FSFloaterPoser::onClickBrowsePoseCache()
void FSFloaterPoser::onClickSymmetrize(const S32 ID)
{
if (notDoubleClicked())
return;
LLVOAvatar* avatar = getUiSelectedAvatar();
if (!avatar)
return;
@ -861,27 +858,13 @@ void FSFloaterPoser::onPoseMenuAction(const LLSD& param)
setSavePosesButtonText(!mPoserAnimator.allBaseRotationsAreZero(avatar));
}
bool FSFloaterPoser::notDoubleClicked()
{
auto timeIntervalSinceLastExecution = std::chrono::system_clock::now() - mTimeLastExecutedDoubleClickMethod;
mTimeLastExecutedDoubleClickMethod = std::chrono::system_clock::now();
return timeIntervalSinceLastExecution > mDoubleClickInterval;
}
void FSFloaterPoser::onClickLoadLeftHandPose()
{
if (notDoubleClicked())
return;
onClickLoadHandPose(false);
}
void FSFloaterPoser::onClickLoadRightHandPose()
{
if (notDoubleClicked())
return;
onClickLoadHandPose(true);
}
@ -1386,9 +1369,6 @@ void FSFloaterPoser::onUndoLastChange()
void FSFloaterPoser::onSetAvatarToTpose()
{
if (notDoubleClicked())
return;
LLVOAvatar* avatar = getUiSelectedAvatar();
if (!avatar)
return;
@ -1401,9 +1381,6 @@ void FSFloaterPoser::onSetAvatarToTpose()
void FSFloaterPoser::onResetJoint(const LLSD data)
{
if (notDoubleClicked())
return;
int resetType = data.asInteger();
LLVOAvatar* avatar = getUiSelectedAvatar();

17
indra/newview/fsfloaterposer.h
View File

@ -348,12 +348,6 @@ public:
/// <param name="avatar">The avatar to whom the list is relevant.</param>
void addBoldToScrollList(LLScrollListCtrl* list, LLVOAvatar* avatar);
/// <summary>
/// Determines if the user has run this method twice within mDoubleClickInterval.
/// </summary>
/// <returns>true if this method has executed since mDoubleClickInterval seconds ago, otherwise false.</returns>
bool notDoubleClicked();
/// <summary>
/// Gets whether the user wishes to reset the base-rotation to zero when they start editing a joint.
/// </summary>
@ -432,17 +426,6 @@ public:
/// </summary>
std::string static vec3ToXYZString(const LLVector3& val);
/// <summary>
/// The time when the last click of a button was made.
/// Utilized for controls needing a 'double click do' function.
/// </summary>
std::chrono::system_clock::time_point mTimeLastExecutedDoubleClickMethod = std::chrono::system_clock::now();
/// <summary>
/// The constant time interval, in seconds, a user must execute the notDoubleClicked twice to successfully 'double-click' a button.
/// </summary>
std::chrono::duration<double> const mDoubleClickInterval = std::chrono::duration<double>(0.3);
/// <summary>
/// Unwraps a normalized value from the trackball to a slider value.
/// </summary>

36
indra/newview/skins/default/xui/en/floater_fs_poser.xml
View File

@ -646,7 +646,7 @@ width="430">
layout="topleft"
label="Set Left"
name="button_loadHandPoseLeft"
tool_tip="Double click to set your left hand to the selected preset"
tool_tip="Click to set your left hand to the selected preset"
top_delta="238"
left_pad="1"
left="2"
@ -660,7 +660,7 @@ width="430">
layout="topleft"
label="Set Right"
name="button_loadHandPoseRight"
tool_tip="Double click to set your right hand to the selected preset"
tool_tip="Click to set your right hand to the selected preset"
left_pad="2"
top_delta="0"
width="85" >
@ -828,7 +828,7 @@ width="430">
label="Set to T-Pose"
image_unselected="Toolbar_Middle_Off"
name="set_t_pose_button"
tool_tip="Double-click to set the selected avatar to a 'T-Pose'"
tool_tip="Click to set the selected avatar to a 'T-Pose'"
width="172">
<button.commit_callback
function="Poser.SetToTPose"/>
@ -1123,15 +1123,15 @@ width="430">
</slider>
<spinner
height="20"
decimal_digits="2"
decimal_digits="3"
follows="left|top"
increment="0.01"
increment="0.001"
top_pad="-19"
left_pad="2"
left_pad="0"
name="adv_posx_spinner"
min_val="-1.5"
max_val="1.5"
width="47">
width="53">
<spinner.commit_callback
function="Poser.CommitSpinner"
parameter="7"/>
@ -1167,15 +1167,15 @@ width="430">
</slider>
<spinner
height="20"
decimal_digits="2"
decimal_digits="3"
follows="left|top"
increment="0.01"
increment="0.001"
top_pad="-19"
left_pad="2"
left_pad="0"
name="adv_posy_spinner"
min_val="-1.5"
max_val="1.5"
width="47">
width="53">
<spinner.commit_callback
function="Poser.CommitSpinner"
parameter="8"/>
@ -1211,15 +1211,15 @@ width="430">
</slider>
<spinner
height="20"
decimal_digits="2"
decimal_digits="3"
follows="left|top"
increment="0.01"
increment="0.001"
top_pad="-19"
left_pad="2"
left_pad="0"
name="adv_posz_spinner"
min_val="-1.5"
max_val="1.5"
width="47">
width="53">
<spinner.commit_callback
function="Poser.CommitSpinner"
parameter="9"/>
@ -1404,7 +1404,7 @@ width="430">
image_overlay="Inv_TrashOpen"
image_unselected="Toolbar_Middle_Off"
name="poser_joint_reset"
tool_tip="Double click to reset the selected body part(s) to when you first started posing"
tool_tip="Click to reset the selected body part(s) to when you first started posing"
width="18"
top_delta="0"
left_pad="1">
@ -1472,7 +1472,7 @@ width="430">
layout="topleft"
label="Copy L &gt; R"
name="button_symmetrize_left_to_right"
tool_tip="Double click to copy change from left side to right side."
tool_tip="Click to copy change from left side to right side."
left="14"
width="70" >
<button.commit_callback
@ -1485,7 +1485,7 @@ width="430">
layout="topleft"
label="Copy R &gt; L"
name="button_symmetrize_right_to_left"
tool_tip="Double click to copy change from right side to left side."
tool_tip="Click to copy change from right side to left side."
left_pad="23"
top_delta="0"
width="70" >