From 20685d9e49282cd726c2006b45e11df507cc8fa2 Mon Sep 17 00:00:00 2001 From: cxl Date: Fri, 31 Jan 2014 07:10:52 +0000 Subject: [PATCH] CtrlLib: Ch.cpp updated #652 git-svn-id: svn://ultimatepp.org/upp/trunk@6834 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/CtrlLib/Ch.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/uppsrc/CtrlLib/Ch.cpp b/uppsrc/CtrlLib/Ch.cpp index 84255be37..655c0b62d 100644 --- a/uppsrc/CtrlLib/Ch.cpp +++ b/uppsrc/CtrlLib/Ch.cpp @@ -16,10 +16,10 @@ void ChSysInit(); void ChStdSkin() { - ChSysInit(); - GUI_GlobalStyle_Write(GUISTYLE_XP); // <- Hard theme restart! - GUI_PopUpEffect_Write(Ctrl::IsCompositedGui() ? GUIEFFECT_NONE : GUIEFFECT_SLIDE); - ColoredOverride(CtrlsImg::Iml(), CtrlsImg::Iml()); + ChSysInit(); + GUI_GlobalStyle_Write(GUISTYLE_XP); + GUI_PopUpEffect_Write(Ctrl::IsCompositedGui() ? GUIEFFECT_NONE : GUIEFFECT_SLIDE); + ColoredOverride(CtrlsImg::Iml(), CtrlsImg::Iml()); } void SbWc(Value *look) @@ -37,7 +37,8 @@ void ChClassicSkin() ChSysInit(); GUI_GlobalStyle_Write(GUISTYLE_CLASSIC); - + GUI_PopUpEffect_Write(Ctrl::IsCompositedGui() ? GUIEFFECT_NONE : GUIEFFECT_SLIDE); + ColoredOverride(CtrlsImg::Iml(), ClassicCtrlsImg::Iml()); for(int q = 0; q < 4; q++) CtrlsImg::Set(CtrlsImg::I_HTB + q, AdjustColors(CtrlsImg::Get(ClassicCtrlsImg::I_B + q)));