aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorVladimir A. Pavlov <pv4@bk.ru>2012-07-27 17:10:45 (GMT)
committerMathias Gumz <akira at fluxbox dot org>2012-08-03 09:37:07 (GMT)
commit8c50e81e44f50733ca3a8e4af6813cb502e3df9d (patch)
tree870e7b2274feaede5c8e7f5fcdf095d5fc368385 /src
parenta076bdcbdaef5d61370acd35e8e2870fb7ad9e09 (diff)
downloadfluxbox-8c50e81e44f50733ca3a8e4af6813cb502e3df9d.zip
fluxbox-8c50e81e44f50733ca3a8e4af6813cb502e3df9d.tar.bz2
FbTk/ThemeItems.cc: don't use style resources in ThemeItem<Font>::setDefaultValue()
Diffstat (limited to 'src')
-rw-r--r--src/FbTk/ThemeItems.cc18
1 files changed, 2 insertions, 16 deletions
diff --git a/src/FbTk/ThemeItems.cc b/src/FbTk/ThemeItems.cc
index e88ab55..ea3703c 100644
--- a/src/FbTk/ThemeItems.cc
+++ b/src/FbTk/ThemeItems.cc
@@ -132,22 +132,8 @@ void ThemeItem<Font>::setDefaultValue() {
132 if (!m_value.load("__DEFAULT__")) { 132 if (!m_value.load("__DEFAULT__")) {
133 cerr<<"ThemeItem<Font>: Warning! Failed to load default value 'fixed'"<<endl; 133 cerr<<"ThemeItem<Font>: Warning! Failed to load default value 'fixed'"<<endl;
134 } else { 134 } else {
135 string effect(ThemeManager::instance().resourceValue(name()+".effect", altName()+".Effect")); 135 m_value.setHalo(false);
136 if (effect == "halo") { 136 m_value.setShadow(false);
137 m_value.setHalo(true);
138 Color halo_color(ThemeManager::instance().resourceValue(name()+".halo.color", altName()+".Halo.Color").c_str(),
139 theme().screenNum());
140 m_value.setHaloColor(halo_color);
141
142 } else if (effect == "shadow" ) {
143 Color shadow_color(ThemeManager::instance().resourceValue(name()+".shadow.color", altName()+".Shadow.Color").c_str(),
144 theme().screenNum());
145
146 m_value.setShadow(true);
147 m_value.setShadowColor(shadow_color);
148 m_value.setShadowOffX(atoi(ThemeManager::instance().resourceValue(name()+".shadow.x", altName()+".Shadow.X").c_str()));
149 m_value.setShadowOffY(atoi(ThemeManager::instance().resourceValue(name()+".shadow.y", altName()+".Shadow.Y").c_str()));
150 }
151 } 137 }
152} 138}
153 139