From 21fcf11ce62e030896c1fa9b686bc58fdcc6bced Mon Sep 17 00:00:00 2001 From: Mirek Fidler Date: Thu, 10 Aug 2023 22:32:53 +0200 Subject: [PATCH] Draw: If UHD DARK icon is missing, UHD icon is now prefered over DARK --- uppsrc/Draw/Iml.cpp | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/uppsrc/Draw/Iml.cpp b/uppsrc/Draw/Iml.cpp index ed54fc683..e0e593d61 100644 --- a/uppsrc/Draw/Iml.cpp +++ b/uppsrc/Draw/Iml.cpp @@ -112,18 +112,17 @@ Image MakeImlImage(const String& id, Function 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)))