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

Move opacity option for hover text background to Miscellaneous tab and disable combobox for hovertext background if option is disabled

master
Ansariel 2025-01-13 17:17:48 +01:00
parent e8b1202aea
commit a3b305ee49
2 changed files with 31 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
indra/newview/skins/default/xui/en/panel_preferences_UI.xml
View File

@ -252,13 +252,13 @@
<check_box
control_name="FSHudTextUseHoverHighlight"
name="FSHudTextUseHoverHighlight"
label="Hover over prim to highlight floating text:"
label="Hover over object to highlight floating text:"
tool_tip="When an object is being hovered over, highlight the floating text (hovertext) by moving the text to the foreground and disable its alpha"
layout="topleft"
top_pad="5"
left_delta="0"
height="16"
width="350" />
width="350" />
<text
type="string"
left="10"
@ -273,25 +273,26 @@
<!-- Added combo box to control the background behavior for prims -->
<combo_box
control_name="FSHudTextShowBackground"
enabled_control="FSHudTextUseHoverHighlight"
height="23"
layout="topleft"
left_pad="10"
top_delta="-5"
top_delta="-5"
name="FSHudTextShowBackgroundDropdown"
tool_tip="Displays a black/white background behind the floating text (hovertext) to make it more readable. The opacity can be changed under Colors->Floating Text"
tool_tip="Displays a black/white background behind the floating text (hovertext) to make it more readable. The opacity can be changed under Colors > Miscellaneous"
width="180">
<combo_box.item
label="Off"
name="ScriptDialogOption_0"
value="0"/>
<combo_box.item
label="Only Highlighted Prim"
label="Only Highlighted Object"
name="ScriptDialogOption_1"
value="1"/>
<combo_box.item
label="All Prims"
label="All Objects"
name="ScriptDialogOption_2"
value="2"/>
value="2"/>
</combo_box>
<!-- </FS:minerjr> [FIRE-35019] -->
</panel>

58
indra/newview/skins/default/xui/en/panel_preferences_colors.xml
View File

@ -1202,36 +1202,6 @@
</combo_box>
</panel>
</panel>
<!-- <FS:minerjr> [FIRE-35019] Add LLHUDNameTag background to floating text and hover highlights -->
<!-- Add new Floating Text panel as the Misc panel was full. Could go under Name Tag panel, but may have more options in the future for Floating Text -->
<panel
top_pad="5"
bottom="-1"
left="1"
right="-1"
follows="all"
label="Floating Text"
name="tab-chat" >
<!-- Add slider to change the opacity of the floating text background indendant of the LLHUDNameTag ChatBubbleOpacity -->
<slider
control_name="FSHudTextBackgroundOpacity"
follows="left|top"
height="16"
increment="0.05"
initial_value="0.75"
label="Floating text background opacity:"
layout="topleft"
left_pad="10"
left="30"
max_val="1.00"
min_val="0.00"
label_width="180"
name="FSHudTextBackgroundOpacity"
tool_tip="Choose floating text background opacity"
top_pad="16"
width="450" />
</panel>
<!-- </FS:minerjr> [FIRE-35019] -->
<panel
top_pad="5"
bottom="-1"
@ -1645,7 +1615,7 @@
layout="topleft"
left="30"
name="effects_color_textbox"
top_pad="15"
top_pad="5"
width="200">
Selection Effects (Particle Beam):
</text>
@ -1724,7 +1694,7 @@
left="30"
height="12"
name="floater_opacity"
top_pad="15"
top_pad="10"
width="220">
Floating Window Opacity:
</text>
@ -1788,7 +1758,7 @@
left="30"
height="12"
name="console_opacity"
top_pad="15"
top_pad="10"
width="220">
Console Opacity:
</text>
@ -1828,13 +1798,31 @@
left_pad="10"
width="378" />
<slider
control_name="FSHudTextBackgroundOpacity"
follows="left|top"
height="16"
increment="0.05"
initial_value="0.75"
label="Floating text background opacity:"
layout="topleft"
left_pad="10"
left="30"
max_val="1.00"
min_val="0.00"
label_width="182"
name="FSHudTextBackgroundOpacity"
tool_tip="Choose floating text background opacity"
top_pad="10"
width="443" />
<text
follows="left|top"
layout="topleft"
left="30"
height="12"
name="preferences_search_label"
top_pad="15"
top_pad="10"
width="220">
Preferences Search Highlight Color:
</text>
@ -1892,7 +1880,7 @@
left="30"
height="12"
name="notecard_editor_color_label"
top_pad="15"
top_pad="10"
width="400">
Notecard Colors:
</text>