Patch level : 10.0
Files correlati : ba0.exe Ricompilazione Demo : [ ] Commento : Corretta gestione tema standard dell'OEM git-svn-id: svn://10.65.10.50/trunk@18062 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
parent
4f6e71021d
commit
8f0988e4da
@ -462,10 +462,11 @@ void TColor_mask::load_themes()
|
|||||||
bool TColor_mask::find_themes_ini(TFilename& ininame) const
|
bool TColor_mask::find_themes_ini(TFilename& ininame) const
|
||||||
{
|
{
|
||||||
ininame = get_oem_info("Themes");
|
ininame = get_oem_info("Themes");
|
||||||
|
ininame.insert("setup/");
|
||||||
bool ok = ininame.exist();
|
bool ok = ininame.exist();
|
||||||
if (!ok)
|
if (!ok)
|
||||||
{
|
{
|
||||||
ininame = "res/themes.ini";
|
ininame = "res/themes.ini"; // Compatibility mode
|
||||||
ok = ininame.exist();
|
ok = ininame.exist();
|
||||||
}
|
}
|
||||||
return ok;
|
return ok;
|
||||||
@ -495,6 +496,16 @@ bool TColor_mask::apply_theme()
|
|||||||
if (!colors.empty())
|
if (!colors.empty())
|
||||||
{
|
{
|
||||||
_color = colors;
|
_color = colors;
|
||||||
|
FOR_EACH_MASK_FIELD((*this), i, f)
|
||||||
|
{
|
||||||
|
const TFieldref* fr = f->field();
|
||||||
|
if (fr != NULL)
|
||||||
|
{
|
||||||
|
const TString* val = (const TString*)_color.objptr(fr->name());
|
||||||
|
if (val != NULL)
|
||||||
|
f->set(*val);
|
||||||
|
}
|
||||||
|
}
|
||||||
applied = true;
|
applied = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user