eden-emu/eden
14
3
Fork 4
Code Issues 3 Pull requests 2 Projects Releases 2 Packages Wiki Activity Actions 3

Merge branch 'purple' of https://git.eden-emu.dev/MrPurple666/eden into purple

Browse source
This commit is contained in:
MrPurple666 2025-04-19 19:27:01 -03:00
commit 52a692b73a
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/android/app/src/main/AndroidManifest.xml
View file

@ -28,7 +28,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
android:banner="@drawable/tv_banner" android:banner="@drawable/tv_banner"
android:fullBackupContent="@xml/data_extraction_rules" android:fullBackupContent="@xml/data_extraction_rules"
android:dataExtractionRules="@xml/data_extraction_rules_api_31" android:dataExtractionRules="@xml/data_extraction_rules_api_31"
android:enableOnBackInvokedCallback="true"> android:enableOnBackInvokedCallback="false">
<meta-data android:name="android.game_mode_config" <meta-data android:name="android.game_mode_config"
android:resource="@xml/game_mode_config" /> android:resource="@xml/game_mode_config" />

2
src/core/hle/service/am/process_creation.cpp
View file

@ -101,7 +101,7 @@ std::unique_ptr<Process> CreateApplicationProcess(std::vector<u8>& out_control,
out_control = nacp.GetRawBytes(); out_control = nacp.GetRawBytes();
} else { } else {
out_control.resize(sizeof(FileSys::RawNACP)); out_control.resize(sizeof(FileSys::RawNACP));
std::fill(out_control.begin(), out_control.end(), 0); std::fill(out_control.begin(), out_control.end(), (u8) 0);
} }
auto& storage = system.GetContentProviderUnion(); auto& storage = system.GetContentProviderUnion();

4
src/yuzu/game_list.cpp
View file

@ -364,7 +364,7 @@ GameList::GameList(FileSys::VirtualFilesystem vfs_, FileSys::ManualContentProvid
}); });
// We must register all custom types with the Qt Automoc system so that we are able to use // We must register all custom types with the Qt Automoc system so that we are able to use
// it with signals/slots. In this case, QList falls under the umbrells of custom types. // it with signals/slots. In this case, QList falls under the umbrella of custom types.
qRegisterMetaType<QList<QStandardItem*>>("QList<QStandardItem*>"); qRegisterMetaType<QList<QStandardItem*>>("QList<QStandardItem*>");
layout->setContentsMargins(0, 0, 0, 0); layout->setContentsMargins(0, 0, 0, 0);
@ -375,12 +375,12 @@ GameList::GameList(FileSys::VirtualFilesystem vfs_, FileSys::ManualContentProvid
pre_alpha_warning->setText( pre_alpha_warning->setText(
tr("IMPORTANT: Eden is PRE-ALPHA SOFTWARE and is not meant to be used by or get shared to the public just yet; " tr("IMPORTANT: Eden is PRE-ALPHA SOFTWARE and is not meant to be used by or get shared to the public just yet; "
"Bugs and unfinished features are expected to be present at this stage.")); "Bugs and unfinished features are expected to be present at this stage."));
pre_alpha_warning->setWordWrap(true);
pre_alpha_warning->setOpenExternalLinks(true); pre_alpha_warning->setOpenExternalLinks(true);
pre_alpha_warning->setStyleSheet( pre_alpha_warning->setStyleSheet(
QString::fromStdString("color: black; font-weight: bold;")); QString::fromStdString("color: black; font-weight: bold;"));
warning_layout->addWidget(pre_alpha_warning); warning_layout->addWidget(pre_alpha_warning);
warning_layout->addStretch();
warning_layout->setContentsMargins(3, 3, 3, 3); warning_layout->setContentsMargins(3, 3, 3, 3);
warning_widget = new QWidget; warning_widget = new QWidget;
warning_widget->setStyleSheet(QString::fromStdString("background-color: khaki;")); warning_widget->setStyleSheet(QString::fromStdString("background-color: khaki;"));