aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir A. Pavlov <pv4@bk.ru>2012-07-27 17:21:00 (GMT)
committerMathias Gumz <akira at fluxbox dot org>2012-08-03 09:37:17 (GMT)
commit9d25ea54a1a21c252622232e0ec959f500e638f3 (patch)
tree70e8c7792a0e981ab8170dbb8ae7b958a3b72410
parent8c50e81e44f50733ca3a8e4af6813cb502e3df9d (diff)
downloadfluxbox-9d25ea54a1a21c252622232e0ec959f500e638f3.zip
fluxbox-9d25ea54a1a21c252622232e0ec959f500e638f3.tar.bz2
FbTk/ThemeItems.cc: move loading additional font resources to load()
The same logic had been already implemented for texture resources.
-rw-r--r--src/FbTk/ThemeItems.cc44
1 files changed, 20 insertions, 24 deletions
diff --git a/src/FbTk/ThemeItems.cc b/src/FbTk/ThemeItems.cc
index ea3703c..774a14d 100644
--- a/src/FbTk/ThemeItems.cc
+++ b/src/FbTk/ThemeItems.cc
@@ -149,34 +149,30 @@ void ThemeItem<Font>::setFromString(const char *str) {
149 cerr<<"Theme: Setting default value"<<endl; 149 cerr<<"Theme: Setting default value"<<endl;
150 } 150 }
151 setDefaultValue(); 151 setDefaultValue();
152 } else {
153 string effect(ThemeManager::instance().resourceValue(name()+".effect", altName()+".Effect"));
154 if (effect == "halo") {
155 m_value.setHalo(true);
156 Color halo_color(ThemeManager::instance().resourceValue(name()+".halo.color", altName()+".Halo.Color").c_str(),
157 theme().screenNum());
158 m_value.setHaloColor(halo_color);
159
160 } else if (effect == "shadow" ) {
161 Color shadow_color(ThemeManager::instance().resourceValue(name()+".shadow.color", altName()+".Shadow.Color").c_str(),
162 theme().screenNum());
163
164 m_value.setShadow(true);
165 m_value.setShadowColor(shadow_color);
166
167 int offset_x = atoi(ThemeManager::instance().resourceValue(name()+".shadow.x", altName()+".Shadow.X").c_str());
168 int offset_y = atoi(ThemeManager::instance().resourceValue(name()+".shadow.y", altName()+".Shadow.Y").c_str());
169 if (offset_x != 0)
170 m_value.setShadowOffX(offset_x);
171 if (offset_y != 0)
172 m_value.setShadowOffY(offset_y);
173 }
174 } 152 }
175} 153}
176 154
177// do nothing
178template <> 155template <>
179void ThemeItem<Font>::load(const string *name, const string *altname) { 156void ThemeItem<Font>::load(const string *o_name, const string *o_altname) {
157 const string &m_name = o_name ? *o_name : name();
158 const string &m_altname = o_altname ? *o_altname : altName();
159
160 string effect(ThemeManager::instance().resourceValue(m_name+".effect", m_altname+".Effect"));
161 if (effect == "halo") {
162 Color halo_color(ThemeManager::instance().resourceValue(m_name+".halo.color", m_altname+".Halo.Color").c_str(),
163 theme().screenNum());
164
165 m_value.setHalo(true);
166 m_value.setHaloColor(halo_color);
167 } else if (effect == "shadow" ) {
168 Color shadow_color(ThemeManager::instance().resourceValue(m_name+".shadow.color", m_altname+".Shadow.Color").c_str(),
169 theme().screenNum());
170
171 m_value.setShadow(true);
172 m_value.setShadowColor(shadow_color);
173 m_value.setShadowOffX(atoi(ThemeManager::instance().resourceValue(m_name+".shadow.x", m_altname+".Shadow.X").c_str()));
174 m_value.setShadowOffY(atoi(ThemeManager::instance().resourceValue(m_name+".shadow.y", m_altname+".Shadow.Y").c_str()));
175 }
180} 176}
181 177
182 178