github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-15 14:16:07 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Draw: If UHD DARK icon is missing, UHD icon is now prefered over DARK

Browse source
This commit is contained in:
Mirek Fidler 2023-08-10 22:32:53 +02:00
parent d60df909c0
commit 21fcf11ce6
1 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
uppsrc/Draw/Iml.cpp
View file

@ -112,18 +112,17 @@ Image MakeImlImage(const String& id, Function<ImageIml(int, const String& id)> G
image = GetRaw(mode, id).image; // try to load from alternative iml
if(IsNull(image)) { // we do not have specific image for given mode, need to convert
ImageIml im;
if(mode & GUI_MODE_DARK) {
im = GetRaw(0, id + "__DARK");
if(mode & GUI_MODE_UHD) {
im = GetRaw(GUI_MODE_NORMAL, id + "__UHD");
if(IsNull(im.image))
im = GetRaw(GUI_MODE_DARK, id);
if(IsNull(im.image)) { // we do not have dark variant
if(mode & GUI_MODE_UHD) {
im = GetRaw(GUI_MODE_NORMAL, id + "__UHD");
if(IsNull(im.image))
im = GetRaw(GUI_MODE_UHD, id);
}
}
im = GetRaw(GUI_MODE_UHD, id);
}
if(IsNull(im.image))
if(mode & GUI_MODE_DARK) {
im = GetRaw(0, id + "__DARK");
if(IsNull(im.image))
im = GetRaw(GUI_MODE_DARK, id);
}
if(IsNull(im.image))
im = GetRaw(GUI_MODE_NORMAL, id);
if((mode & GUI_MODE_UHD) && !(im.flags & IML_IMAGE_FLAG_UHD) && !((im.flags | global_flags) & (IML_IMAGE_FLAG_FIXED|IML_IMAGE_FLAG_FIXED_SIZE)))