aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormathias <mathias>2005-06-17 23:55:15 (GMT)
committermathias <mathias>2005-06-17 23:55:15 (GMT)
commit3d722f24284f926448085394690f87d949c017bc (patch)
tree92dbee0dc33cc0e09a60a6279be2d80f1dda7001
parenta4a6cf9035cfa553f30f0fa06635cc08362ae98e (diff)
downloadfluxbox-3d722f24284f926448085394690f87d949c017bc.zip
fluxbox-3d722f24284f926448085394690f87d949c017bc.tar.bz2
*.font.shadow.x and *.font.shadow.x were not correctly read or better,
misinterpreted. so the shadow'ed text was written direct underneath the normal text .. and hence invisible.
-rw-r--r--ChangeLog3
-rw-r--r--src/FbTk/ThemeItems.cc11
2 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 36a23dd..62d3d7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
1(Format: Year/Month/Day) 1(Format: Year/Month/Day)
2Changes for 0.9.14: 2Changes for 0.9.14:
3*05/06/18:
4 * little Fix for font effects (Mathias)
5 FbTk/ThemeItems.cc
3*05/06/15: 6*05/06/15:
4 * Enhanced MoveTo, fixes #1074568 (Mathias) 7 * Enhanced MoveTo, fixes #1074568 (Mathias)
5 MoveTo <int|*> <int|*> <Reference Corner> 8 MoveTo <int|*> <int|*> <Reference Corner>
diff --git a/src/FbTk/ThemeItems.cc b/src/FbTk/ThemeItems.cc
index 610edb2..749fc77 100644
--- a/src/FbTk/ThemeItems.cc
+++ b/src/FbTk/ThemeItems.cc
@@ -160,13 +160,18 @@ void ThemeItem<Font>::setFromString(const char *str) {
160 m_value.setHaloColor(halo_color); 160 m_value.setHaloColor(halo_color);
161 161
162 } else if (effect == "shadow" ) { 162 } else if (effect == "shadow" ) {
163 FbTk::Color shadow_color(ThemeManager::instance().resourceValue(name()+".shadow.x", altName()+".Shadow.X").c_str(), 163 FbTk::Color shadow_color(ThemeManager::instance().resourceValue(name()+".shadow.color", altName()+".Shadow.Color").c_str(),
164 theme().screenNum()); 164 theme().screenNum());
165 165
166 m_value.setShadow(true); 166 m_value.setShadow(true);
167 m_value.setShadowColor(shadow_color); 167 m_value.setShadowColor(shadow_color);
168 m_value.setShadowOffX(atoi(ThemeManager::instance().resourceValue(name()+".shadow.x", altName()+".Shadow.X").c_str())); 168
169 m_value.setShadowOffY(atoi(ThemeManager::instance().resourceValue(name()+".shadow.y", altName()+".Shadow.Y").c_str())); 169 int offset_x = atoi(ThemeManager::instance().resourceValue(name()+".shadow.x", altName()+".Shadow.X").c_str());
170 int offset_y = atoi(ThemeManager::instance().resourceValue(name()+".shadow.y", altName()+".Shadow.Y").c_str());
171 if (offset_x != 0)
172 m_value.setShadowOffX(offset_x);
173 if (offset_y != 0)
174 m_value.setShadowOffY(offset_y);
170 } 175 }
171 } 176 }
172} 177}