forks
/
dlangui
mirror of https://github.com/buggins/dlangui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Let iconprovider read .svg icons on freedesktop environments. Fix edge cases for some icon themes when icon is placed in the wrong context. Fix #648 (#663)

This commit is contained in:
Roman Chistokhodov 2023-05-24 16:37:47 +03:00 committed by GitHub
parent c8ff9a5729
commit 6250d4ef48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/dlangui/graphics/iconprovider.d
View File

@ -485,6 +485,7 @@ static if (!WIDGET_STYLE_CONSOLE) {
DrawBufRef getIconFromTheme(string name, string context = null)
{
static if (!WIDGET_STYLE_CONSOLE) {
immutable extensions = [".svg",".png"];
auto found = name in _cache;
if (found) {
return *found;
@ -492,9 +493,11 @@ static if (!WIDGET_STYLE_CONSOLE) {
string iconPath;
try {
if (context.length) {
iconPath = findClosestIcon!(subdir => subdir.context == context)(name, 32, _iconThemes, _baseIconDirs);
// Take the context into account to reduce the number of searches.
// In practice some icons that should be in Status context can be found in Places context for some icon themes.
iconPath = findClosestIcon!(subdir => subdir.context == context || (context == "Status" && subdir.context == "Places"))(name, 32, _iconThemes, _baseIconDirs, extensions);
} else {
iconPath = findClosestIcon(name, 32, _iconThemes, _baseIconDirs);
iconPath = findClosestIcon(name, 32, _iconThemes, _baseIconDirs, extensions);
}
} catch(Exception e) {
Log.e("Error while searching for icon", name);