citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code

Change GameListText order to improve configuration compatibility

This commit is contained in:
vitor-k 2019-09-05 14:28:40 -03:00
parent f9cded05fd
commit c866a8e428
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/citra_qt/configuration/config.cpp
View File

@ -307,13 +307,13 @@ void Config::ReadValues() {
UISettings::values.game_list_icon_size = UISettings::GameListIconSize{icon_size}; UISettings::values.game_list_icon_size = UISettings::GameListIconSize{icon_size};
int row_1 = ReadSetting("row1", 2).toInt(); int row_1 = ReadSetting("row1", 2).toInt();
if (row_1 < 0 || row_1 > 3) { if (row_1 < 0 || row_1 >= UISettings::GAME_LIST_TEXT_LENGTH) {
row_1 = 2; row_1 = 2;
} }
UISettings::values.game_list_row_1 = UISettings::GameListText{row_1}; UISettings::values.game_list_row_1 = UISettings::GameListText{row_1};
int row_2 = ReadSetting("row2", 0).toInt(); int row_2 = ReadSetting("row2", 0).toInt();
if (row_2 < -1 || row_2 > 3) { if (row_2 < -1 || row_2 >= UISettings::GAME_LIST_TEXT_LENGTH) {
row_2 = 0; row_2 = 0;
} }
UISettings::values.game_list_row_2 = UISettings::GameListText{row_2}; UISettings::values.game_list_row_2 = UISettings::GameListText{row_2};

8
src/citra_qt/configuration/configure_ui.ui
View File

@ -131,12 +131,12 @@
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>Title Name (long)</string> <string>Title ID</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>Title ID</string> <string>Title Name (long)</string>
</property> </property>
</item> </item>
</widget> </widget>
@ -176,12 +176,12 @@
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>Title Name (long)</string> <string>Title ID</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>Title ID</string> <string>Title Name (long)</string>
</property> </property>
</item> </item>
</widget> </widget>

4
src/citra_qt/uisettings.h
View File

@ -50,9 +50,11 @@ enum class GameListText {
FileName, ///< Display the file name of the entry FileName, ///< Display the file name of the entry
FullPath, ///< Display the full path of the entry FullPath, ///< Display the full path of the entry
TitleName, ///< Display the name of the title TitleName, ///< Display the name of the title
LongTitleName, ///< Display the long name of the title
TitleID, ///< Display the title ID TitleID, ///< Display the title ID
LongTitleName, ///< Display the long name of the title
}; };
// The length of the GameListText, excluding NoText
constexpr int GAME_LIST_TEXT_LENGTH = 5;
struct Values { struct Values {
QByteArray geometry; QByteArray geometry;