Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2025-01-19 14:55:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Qt: Fix labels when changing multi-tap controller type

Browse source
This commit is contained in:
Stenzek 2024-02-15 22:05:58 +09:00
parent d9846093c3
commit 1faecd8853
No known key found for this signature in database
3 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/pad.h
View file

@ -13,8 +13,6 @@ class Multitap;
namespace Pad { namespace Pad {
static constexpr u32 NUM_SLOTS = 2;
void Initialize(); void Initialize();
void Shutdown(); void Shutdown();
void Reset(); void Reset();

27
src/duckstation-qt/controllersettingswindow.cpp
View file

@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin <stenzek@gmail.com> // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin <stenzek@gmail.com>
// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
#include "controllersettingswindow.h" #include "controllersettingswindow.h"
@ -370,14 +370,7 @@ void ControllerSettingsWindow::createWidgets()
} }
// load mtap settings // load mtap settings
const MultitapMode mtap_mode = const std::array<bool, 2> mtap_enabled = getEnabledMultitaps();
Settings::ParseMultitapModeName(
getStringValue("ControllerPorts", "MultitapMode", Settings::GetMultitapModeName(Settings::DEFAULT_MULTITAP_MODE))
.c_str())
.value_or(Settings::DEFAULT_MULTITAP_MODE);
const std::array<bool, 2> mtap_enabled = {
{(mtap_mode == MultitapMode::Port1Only || mtap_mode == MultitapMode::BothPorts),
(mtap_mode == MultitapMode::Port2Only || mtap_mode == MultitapMode::BothPorts)}};
// we reorder things a little to make it look less silly for mtap // we reorder things a little to make it look less silly for mtap
static constexpr const std::array<u32, MAX_PORTS> mtap_port_order = {{0, 2, 3, 4, 1, 5, 6, 7}}; static constexpr const std::array<u32, MAX_PORTS> mtap_port_order = {{0, 2, 3, 4, 1, 5, 6, 7}};
@ -431,14 +424,13 @@ void ControllerSettingsWindow::updateListDescription(u32 global_slot, Controller
bool is_ok; bool is_ok;
if (item_data.toUInt(&is_ok) == global_slot && is_ok) if (item_data.toUInt(&is_ok) == global_slot && is_ok)
{ {
// const bool is_mtap_port = Controller::PadIsMultitapSlot(global_slot); const std::array<bool, 2> mtap_enabled = getEnabledMultitaps();
const auto [port, slot] = Controller::ConvertPadToPortAndSlot(global_slot); const auto [port, slot] = Controller::ConvertPadToPortAndSlot(global_slot);
const bool mtap_enabled = getBoolValue("Pad", (port == 0) ? "MultitapPort1" : "MultitapPort2", false);
const Controller::ControllerInfo* ci = Controller::GetControllerInfo(widget->getControllerType()); const Controller::ControllerInfo* ci = Controller::GetControllerInfo(widget->getControllerType());
const QString display_name(ci ? qApp->translate("ControllerType", ci->display_name) : QStringLiteral("Unknown")); const QString display_name(ci ? qApp->translate("ControllerType", ci->display_name) : QStringLiteral("Unknown"));
item->setText(mtap_enabled ? item->setText(mtap_enabled[port] ?
(tr("Controller Port %1%2\n%3").arg(port + 1).arg(s_mtap_slot_names[slot]).arg(display_name)) : (tr("Controller Port %1%2\n%3").arg(port + 1).arg(s_mtap_slot_names[slot]).arg(display_name)) :
tr("Controller Port %1\n%2").arg(port + 1).arg(display_name)); tr("Controller Port %1\n%2").arg(port + 1).arg(display_name));
item->setIcon(widget->getIcon()); item->setIcon(widget->getIcon());
@ -446,6 +438,17 @@ void ControllerSettingsWindow::updateListDescription(u32 global_slot, Controller
} }
} }
} }
std::array<bool, 2> ControllerSettingsWindow::getEnabledMultitaps() const
{
const MultitapMode mtap_mode =
Settings::ParseMultitapModeName(
getStringValue("ControllerPorts", "MultitapMode", Settings::GetMultitapModeName(Settings::DEFAULT_MULTITAP_MODE))
.c_str())
.value_or(Settings::DEFAULT_MULTITAP_MODE);
return {{(mtap_mode == MultitapMode::Port1Only || mtap_mode == MultitapMode::BothPorts),
(mtap_mode == MultitapMode::Port2Only || mtap_mode == MultitapMode::BothPorts)}};
}
void ControllerSettingsWindow::refreshProfileList() void ControllerSettingsWindow::refreshProfileList()
{ {
const std::vector<std::string> names(InputManager::GetInputProfileNames()); const std::vector<std::string> names(InputManager::GetInputProfileNames());

5
src/duckstation-qt/controllersettingswindow.h
View file

@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin <stenzek@gmail.com> // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin <stenzek@gmail.com>
// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
#pragma once #pragma once
@ -14,6 +14,7 @@
#include <QtCore/QString> #include <QtCore/QString>
#include <QtCore/QStringList> #include <QtCore/QStringList>
#include <QtWidgets/QDialog> #include <QtWidgets/QDialog>
#include <array> #include <array>
#include <string> #include <string>
@ -89,6 +90,8 @@ private:
void refreshProfileList(); void refreshProfileList();
void switchProfile(const QString& name); void switchProfile(const QString& name);
std::array<bool, 2> getEnabledMultitaps() const;
Ui::ControllerSettingsWindow m_ui; Ui::ControllerSettingsWindow m_ui;
ControllerGlobalSettingsWidget* m_global_settings = nullptr; ControllerGlobalSettingsWidget* m_global_settings = nullptr;