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: Iml conversions improvements

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@13020 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2019-04-22 08:14:10 +00:00
parent 8c4661907d
commit b7010855be
1 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

22
uppsrc/Draw/Iml.cpp
View file

@ -108,21 +108,33 @@ Image Iml::Get(int i)
int mode = IsUHDMode() * GUI_MODE_UHD + IsDarkTheme() * GUI_MODE_DARK;
String id = GetId(i);
if(mode == GUI_MODE_NORMAL)
m.image = GetRaw(0, i).image;
m.image = GetRaw(GUI_MODE_NORMAL, i).image;
else {
auto Mode = [&](dword m, const char *s) { return mode & m ? String(s) : String(); };
m.image = GetRaw(0, id + Mode(GUI_MODE_UHD, "__UHD") + Mode(GUI_MODE_DARK, "__DARK")).image;
m.image = GetRaw(GUI_MODE_NORMAL, id + Mode(GUI_MODE_UHD, "__UHD") + Mode(GUI_MODE_DARK, "__DARK")).image;
if(IsNull(m.image))
m.image = GetRaw(mode, id).image;
if(IsNull(m.image)) {
ImageIml im = GetRaw(0, id);
ImageIml im;
dword f = im.flags | global_flags;
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(!(f & (IML_IMAGE_FLAG_FIXED|IML_IMAGE_FLAG_FIXED_COLORS)))
im.image = DarkTheme(im.image);
}
}
else
im = GetRaw(GUI_MODE_NORMAL, id);
if((mode & GUI_MODE_UHD) && !(f & (IML_IMAGE_FLAG_FIXED|IML_IMAGE_FLAG_FIXED_SIZE)))
im.image = Upscale2x(im.image);
if((mode & GUI_MODE_DARK) && !(f & (IML_IMAGE_FLAG_FIXED|IML_IMAGE_FLAG_FIXED_COLORS)))
im.image = DarkTheme(im.image);
m.image = im.image;
}
if(!IsNull(m.image) && (mode & GUI_MODE_UHD)) // this is to support legacy code mostly
SetResolution(m.image, IMAGE_RESOLUTION_UHD);
}
m.loaded = true;
}