mirror of
https://git.eden-emu.dev/eden-emu/eden.git
synced 2026-09-08 05:02:40 +00:00
Merge pull request 'Fix Qt <6.7 build and allow speed limit to be saved' (#52) from crueter/eden:fix-limit-speed into master
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/52
This commit is contained in:
@@ -201,7 +201,7 @@ struct Values {
|
|||||||
"memory_layout_mode",
|
"memory_layout_mode",
|
||||||
Category::Core};
|
Category::Core};
|
||||||
SwitchableSetting<bool> use_speed_limit{
|
SwitchableSetting<bool> use_speed_limit{
|
||||||
linkage, true, "use_speed_limit", Category::Core, Specialization::Paired, false, true};
|
linkage, true, "use_speed_limit", Category::Core, Specialization::Paired, true, true};
|
||||||
SwitchableSetting<u16, true> speed_limit{linkage,
|
SwitchableSetting<u16, true> speed_limit{linkage,
|
||||||
100,
|
100,
|
||||||
0,
|
0,
|
||||||
|
|||||||
@@ -121,7 +121,7 @@ void ConfigureInput::Initialize(InputCommon::InputSubsystem* input_subsystem,
|
|||||||
&ConfigureInput::UpdateAllInputDevices);
|
&ConfigureInput::UpdateAllInputDevices);
|
||||||
connect(player_controllers[i], &ConfigureInputPlayer::RefreshInputProfiles, this,
|
connect(player_controllers[i], &ConfigureInputPlayer::RefreshInputProfiles, this,
|
||||||
&ConfigureInput::UpdateAllInputProfiles, Qt::QueuedConnection);
|
&ConfigureInput::UpdateAllInputProfiles, Qt::QueuedConnection);
|
||||||
connect(connected_controller_checkboxes[i], &QCheckBox::checkStateChanged, [this, i](int state) {
|
connect(connected_controller_checkboxes[i], &QCheckBox::stateChanged, [this, i](int state) {
|
||||||
// Keep activated controllers synced with the "Connected Controllers" checkboxes
|
// Keep activated controllers synced with the "Connected Controllers" checkboxes
|
||||||
player_controllers[i]->ConnectPlayer(state == Qt::Checked);
|
player_controllers[i]->ConnectPlayer(state == Qt::Checked);
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -759,6 +759,7 @@ Widget::Widget(Settings::BasicSetting* setting_, const TranslationMap& translati
|
|||||||
if (setting.Switchable() && Settings::IsConfiguringGlobal() && !runtime_lock) {
|
if (setting.Switchable() && Settings::IsConfiguringGlobal() && !runtime_lock) {
|
||||||
enable &= setting.UsingGlobal();
|
enable &= setting.UsingGlobal();
|
||||||
}
|
}
|
||||||
|
|
||||||
this->setEnabled(enable);
|
this->setEnabled(enable);
|
||||||
|
|
||||||
this->setToolTip(tooltip);
|
this->setToolTip(tooltip);
|
||||||
|
|||||||
@@ -335,6 +335,7 @@ GameList::GameList(FileSys::VirtualFilesystem vfs_, FileSys::ManualContentProvid
|
|||||||
tree_view->setSortingEnabled(true);
|
tree_view->setSortingEnabled(true);
|
||||||
tree_view->setEditTriggers(QHeaderView::NoEditTriggers);
|
tree_view->setEditTriggers(QHeaderView::NoEditTriggers);
|
||||||
tree_view->setContextMenuPolicy(Qt::CustomContextMenu);
|
tree_view->setContextMenuPolicy(Qt::CustomContextMenu);
|
||||||
|
tree_view->setAttribute(Qt::WA_AcceptTouchEvents, true);
|
||||||
tree_view->setStyleSheet(QStringLiteral("QTreeView{ border: none; }"));
|
tree_view->setStyleSheet(QStringLiteral("QTreeView{ border: none; }"));
|
||||||
|
|
||||||
item_model->insertColumns(0, COLUMN_COUNT);
|
item_model->insertColumns(0, COLUMN_COUNT);
|
||||||
|
|||||||
+412
-416
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user