MirrorRepos/azahar
1
0
Fork 0
mirror of https://github.com/azahar-emu/azahar.git synced 2026-06-06 02:33:44 -04:00
Code Issues Projects Releases Packages Wiki Activity

added output scaling and antialiasing filter to status bar

Browse source
This commit is contained in:
KojoZero 2026-06-02 11:42:36 -07:00
parent 9a152e894a
commit 1914583b35
3 changed files with 70 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
dist/qt_themes/default/style.qss vendored
View file

@ -28,6 +28,17 @@ QPushButton#TogglableStatusBarButton:hover {
border: 1px solid #76797C;
}
QPushButton#StatusBarButton {
border: 1px solid transparent;
background-color: transparent;
padding: 0px 3px 0px 3px;
text-align: center;
}
QPushButton#StatusBarButton:hover {
border: 1px solid #76797C;
}
QPushButton#button_reset_defaults {
min-width: 57px;
padding: 4px 8px;

56
src/citra_qt/citra_qt.cpp
View file

@ -628,6 +628,23 @@ void GMainWindow::InitializeWidgets() {
statusBar()->insertPermanentWidget(0, graphics_api_button);
// Setup Output Scaling button
output_scaling_button = new QPushButton();
output_scaling_button->setObjectName(QStringLiteral("StatusBarButton"));
output_scaling_button->setFocusPolicy(Qt::NoFocus);
UpdateOutputScalingIndicator();
connect(output_scaling_button, &QPushButton::clicked, this, [this] { UpdateOutputScalingIndicator(true); });
statusBar()->insertPermanentWidget(1, output_scaling_button);
// Setup Antialiasing Filter button
antialiasing_filter_button = new QPushButton();
antialiasing_filter_button->setObjectName(QStringLiteral("StatusBarButton"));
antialiasing_filter_button->setFocusPolicy(Qt::NoFocus);
UpdateAntialiasingFilterIndicator();
connect(antialiasing_filter_button, &QPushButton::clicked, this, [this] { UpdateAntialiasingFilterIndicator(true); });
statusBar()->insertPermanentWidget(2, antialiasing_filter_button);
// Setup Volume button and slider
volume_popup = new QWidget(this);
volume_popup->setWindowFlags(Qt::FramelessWindowHint | Qt::NoDropShadowWindowHint | Qt::Popup);
volume_popup->setLayout(new QVBoxLayout());
@ -658,7 +675,7 @@ void GMainWindow::InitializeWidgets() {
bottomLeft.setY(bottomLeft.y() - volume_popup->geometry().height());
volume_popup->setGeometry(QRect(bottomLeft, QSize(rect.width(), rect.height())));
});
statusBar()->insertPermanentWidget(1, volume_button);
statusBar()->insertPermanentWidget(3, volume_button);
statusBar()->addPermanentWidget(multiplayer_state->GetStatusText());
statusBar()->addPermanentWidget(multiplayer_state->GetStatusIcon());
@ -3821,8 +3838,45 @@ void GMainWindow::UpdateAPIIndicator(bool update) {
graphics_api_button->setStyleSheet(style_sheet);
}
void GMainWindow::UpdateOutputScalingIndicator(bool update) {
static std::array output_scaling_options = {
QStringLiteral("NEAREST"),
QStringLiteral("BILINEAR"),
QStringLiteral("ADAPTIVE"),
QStringLiteral("FSR"),
QStringLiteral("SHARP BILINEAR"),
};
u32 selection_index = static_cast<u32>(Settings::values.output_scaling.GetValue());
if (update) {
selection_index = (selection_index + 1) % output_scaling_options.size();
Settings::values.output_scaling = static_cast<Settings::OutputScaling>(selection_index);
}
output_scaling_button->setText(output_scaling_options[selection_index]);
}
void GMainWindow::UpdateAntialiasingFilterIndicator(bool update) {
static std::array antialiasing_filter_options = {
QStringLiteral("NO AA"),
QStringLiteral("FXAA"),
QStringLiteral("SMAA"),
};
u32 selection_index = static_cast<u32>(Settings::values.antialiasing_filter.GetValue());
if (update) {
selection_index = (selection_index + 1) % antialiasing_filter_options.size();
Settings::values.antialiasing_filter = static_cast<Settings::AntiAliasingFilter>(selection_index);
}
antialiasing_filter_button->setText(antialiasing_filter_options[selection_index]);
}
void GMainWindow::UpdateStatusButtons() {
UpdateAPIIndicator();
UpdateOutputScalingIndicator();
UpdateAntialiasingFilterIndicator();
UpdateVolumeUI();
}

4
src/citra_qt/citra_qt.h
View file

@ -333,6 +333,8 @@ private:
void OpenPerGameConfiguration(u64 title_id, const QString& file_name);
void UpdateVolumeUI();
void UpdateAPIIndicator(bool update = false);
void UpdateOutputScalingIndicator(bool update = false);
void UpdateAntialiasingFilterIndicator(bool update = false);
void UpdateStatusButtons();
#ifdef __unix__
void SetGamemodeEnabled(bool state);
@ -359,6 +361,8 @@ private:
QLabel* emu_frametime_label = nullptr;
QPushButton* graphics_api_button = nullptr;
QPushButton* volume_button = nullptr;
QPushButton* output_scaling_button = nullptr;
QPushButton* antialiasing_filter_button = nullptr;
QWidget* volume_popup = nullptr;
QSlider* volume_slider = nullptr;
QTimer status_bar_update_timer;