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

SL-19094 Move Desired frame rate button to top level

master
Maxim Nikolenko 2023-02-02 16:17:09 +02:00
parent 0169e8cc97
commit 788ba76bdf
3 changed files with 59 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
indra/newview/llfloaterperformance.cpp
View File

@ -151,6 +151,7 @@ BOOL LLFloaterPerformance::postBuild()
LLStringExplicit fps_limit(llformat("%d", gViewerWindow->getWindow()->getRefreshRate()));
mAutoadjustmentsPanel->getChild<LLTextBox>("vsync_desc_limit")->setTextArg("[FPS_LIMIT]", fps_limit);
mAutoadjustmentsPanel->getChild<LLTextBox>("display_desc")->setTextArg("[FPS_LIMIT]", fps_limit);
mAutoadjustmentsPanel->getChild<LLButton>("defaults_btn")->setCommitCallback(boost::bind(&LLFloaterPerformance::onClickDefaults, this));
mStartAutotuneBtn = mAutoadjustmentsPanel->getChild<LLButton>("start_autotune");
mStopAutotuneBtn = mAutoadjustmentsPanel->getChild<LLButton>("stop_autotune");

95
indra/newview/skins/default/xui/en/floater_performance.xml
View File

@ -4,6 +4,7 @@
layout="topleft"
name="performance"
save_rect="true"
reuse_instance="true"
title="IMPROVE GRAPHICS SPEED"
width="580">
<string
@ -101,10 +102,56 @@
follows="left|top"
height="50"
width="560"
name="settings_subpanel"
name="autoadjustments_subpanel"
layout="topleft"
left="10"
top="5">
<text
follows="left|top"
font="SansSerifBoldLarge"
text_color="White"
height="20"
layout="topleft"
left="10"
name="auto_adj_lbl"
top="7"
width="375">
Auto-adjust settings (recommended)
</text>
<text
follows="left|top"
font="SansSerif"
text_color="White"
height="20"
layout="topleft"
left="10"
name="auto_adj_desc"
top_pad="0"
width="485">
Allow automatic adjustments to reach your preferred frame rate.
</text>
<icon
height="16"
width="16"
image_name="Arrow_Right_Off"
mouse_opaque="true"
name="icon_arrow4"
follows="right|top"
top="19"
right="-20"/>
</panel>
<panel
bg_alpha_color="PanelGray"
background_visible="true"
background_opaque="false"
border="true"
bevel_style="none"
follows="left|top"
height="50"
width="560"
name="settings_subpanel"
layout="topleft"
top_pad="10">
<text
follows="left|top"
font="SansSerifLarge"
@ -277,52 +324,6 @@
top="19"
right="-20"/>
</panel>
<panel
bg_alpha_color="PanelGray"
background_visible="true"
background_opaque="false"
border="true"
bevel_style="none"
follows="left|top"
height="50"
width="560"
name="autoadjustments_subpanel"
layout="topleft"
top_pad="10">
<text
follows="left|top"
font="SansSerifLarge"
text_color="White"
height="20"
layout="topleft"
left="10"
name="auto_adj_lbl"
top="7"
width="175">
Preferred frame rate
</text>
<text
follows="left|top"
font="SansSerif"
text_color="White"
height="20"
layout="topleft"
left="10"
name="auto_adj_desc"
top_pad="0"
width="485">
Allow automatic adjustments to reach your preferred frame rate (advanced).
</text>
<icon
height="16"
width="16"
image_name="Arrow_Right_Off"
mouse_opaque="true"
name="icon_arrow4"
follows="right|top"
top="19"
right="-20"/>
</panel>
</panel>
<panel
filename="panel_performance_nearby.xml"

11
indra/newview/skins/default/xui/en/panel_performance_autoadjustments.xml
View File

@ -44,8 +44,17 @@
top_pad="15"
name="settings_title"
width="300">
Preferred frame rate
Auto-adjust settings
</text>
<button
follows="top|left"
height="23"
label="Reset to recommended settings"
layout="topleft"
left="360"
name="defaults_btn"
top_delta="0"
width="200"/>
<view_border
bevel_style="in"
height="0"