Skip to content

Commit

Permalink
Qt: improve fsr tooltip area
Browse files Browse the repository at this point in the history
  • Loading branch information
@Megamouse
Megamouse committed Nov 6, 2021
1 parent f7eacf7 commit dac0baa
Show file tree
Hide file tree
Showing 2 changed files with 87 additions and 71 deletions.
4 changes: 1 addition & 3 deletions rpcs3/rpcs3qt/settings_dialog.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -639,9 +639,7 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
return tr("%1%").arg(value);
};
m_emu_settings->EnhanceSlider(ui->fsrSharpeningStrength, emu_settings_type::FsrSharpeningStrength);
SubscribeTooltip(ui->fsrSharpeningStrength, tooltips.settings.fsr_rcas_strength);
SubscribeTooltip(ui->fsrSharpeningStrengthVal, tooltips.settings.fsr_rcas_strength);
SubscribeTooltip(ui->fsrSharpeningStrengthReset, tooltips.settings.fsr_rcas_strength);
SubscribeTooltip(ui->fsrSharpeningStrengthWidget, tooltips.settings.fsr_rcas_strength);
ui->fsrSharpeningStrengthVal->setText(fmt_fsr_sharpening_strength(ui->fsrSharpeningStrength->value()));
connect(ui->fsrSharpeningStrength, &QSlider::valueChanged, [fmt_fsr_sharpening_strength, this](int value)
{
Expand Down
154 changes: 86 additions & 68 deletions rpcs3/rpcs3qt/settings_dialog.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -671,76 +671,94 @@
</widget>
</item>
<item>
<widget class="QLabel" name="fsrSharpeningStrengthLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>RCAS Sharpening Strength</string>
</property>
<property name="alignment">
<set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
</property>
<property name="margin">
<number>1</number>
</property>
<widget class="QWidget" name="fsrSharpeningStrengthWidget" native="true">
<layout class="QVBoxLayout" name="fsrSharpeningWidgetLayout">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="fsrSharpeningStrengthLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>RCAS Sharpening Strength</string>
</property>
<property name="alignment">
<set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
</property>
<property name="margin">
<number>1</number>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="fsrSharpeningLayoutTop">
<item>
<widget class="QLabel" name="minSharpeningVal">
<property name="text">
<string>0</string>
</property>
</widget>
</item>
<item>
<widget class="QSlider" name="fsrSharpeningStrength">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="maxSharpeningVal">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>100</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="fsrSharpeningLayoutBottom" stretch="1,0">
<item>
<widget class="QLabel" name="fsrSharpeningStrengthVal">
<property name="text">
<string>0</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="fsrSharpeningStrengthReset">
<property name="text">
<string>Reset</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="fsrSharpeningLayoutTop">
<item>
<widget class="QLabel" name="minSharpeningVal">
<property name="text">
<string>0</string>
</property>
</widget>
</item>
<item>
<widget class="QSlider" name="fsrSharpeningStrength">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="maxSharpeningVal">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>100</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="fsrSharpeningLayoutBottom" stretch="1,0">
<item>
<widget class="QLabel" name="fsrSharpeningStrengthVal">
<property name="text">
<string>0</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="fsrSharpeningStrengthReset">
<property name="text">
<string>Reset</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
Expand Down

0 comments on commit dac0baa

Please sign in to comment.