piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8786 from JosJuice/user-style-not-path

Browse Source 
DolphinQt: Store name of user style, not path
This commit is contained in:
Léo Lam
2020-05-03 14:11:55 +02:00
committed by GitHub
parent 90ba73c6c2 aab694e6b5
commit 0ab9475f8e
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/DolphinQt/Settings/InterfacePane.cpp
View File

@ -136,10 +136,8 @@ void InterfacePane::CreateUI()
for (const std::string& path : userstyle_search_results)
{
std::string name;
SplitPath(path, nullptr, &name, nullptr);
const QString qt_name = QString::fromStdString(name);
m_combobox_userstyle->addItem(qt_name, QString::fromStdString(path));
const QFileInfo file_info(QString::fromStdString(path));
m_combobox_userstyle->addItem(file_info.completeBaseName(), file_info.fileName());
}
// Checkboxes
@ -216,7 +214,7 @@ void InterfacePane::LoadConfig()
m_combobox_theme->findText(QString::fromStdString(SConfig::GetInstance().theme_name)));
const QString userstyle = Settings::Instance().GetCurrentUserStyle();
const int index = m_combobox_userstyle->findText(QFileInfo(userstyle).baseName());
const int index = m_combobox_userstyle->findData(QFileInfo(userstyle).fileName());
if (index > 0)
m_combobox_userstyle->setCurrentIndex(index);