libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-18 06:31:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GUI: Added possibility to keep gui-icons.dat in iconspath

Browse Source
This commit is contained in:
Eugene Sandulenko 2021-11-12 15:47:22 +01:00
parent 04a43695e7
commit a5844fd8da
No known key found for this signature in database
GPG Key ID: 014D387312D34F08
1 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gui/gui-manager.cpp
View File

@ -111,14 +111,34 @@ GuiManager::~GuiManager() {
void GuiManager::initIconsSet() {
Common::Archive *dat;
// ConfMan.get("iconspath")
const char fname[] = "gui-icons.dat";
Common::String path;
Common::FSNode *fs = nullptr;
Common::String path = "gui-icons.dat";
if (ConfMan.hasKey("themepath")) {
path = normalizePath(ConfMan.get("themepath") + "/" + fname, '/');
if (ConfMan.hasKey("themepath"))
path = normalizePath(ConfMan.get("themepath") + "/" + path, '/');
fs = new Common::FSNode(path);
if (!fs->exists()) {
delete fs;
fs = nullptr;
}
}
dat = Common::makeZipArchive(Common::FSNode(path));
if (!fs && ConfMan.hasKey("iconspath")) {
path = normalizePath(ConfMan.get("iconspath") + "/" + fname, '/');
fs = new Common::FSNode(path);
if (!fs->exists()) {
delete fs;
fs = nullptr;
}
}
if (!fs)
fs = new Common::FSNode(fname);
dat = Common::makeZipArchive(*fs);
if (!dat) {
warning("GUI: Could not find '%s'", path.c_str());
@ -126,6 +146,8 @@ void GuiManager::initIconsSet() {
}
_iconsSet.add(path, dat);
delete fs;
}
void GuiManager::computeScaleFactor() {