diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/FbTk/Font.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/FbTk/Font.cc b/src/FbTk/Font.cc index 42e33c1..1e89180 100644 --- a/src/FbTk/Font.cc +++ b/src/FbTk/Font.cc | |||
@@ -99,13 +99,13 @@ typedef FontCache::iterator FontCacheIt; | |||
99 | FontCache font_cache; | 99 | FontCache font_cache; |
100 | 100 | ||
101 | 101 | ||
102 | void resetEffects(FbTk::Font* font) { | 102 | void resetEffects(FbTk::Font& font) { |
103 | font->setHalo(false); | 103 | font.setHalo(false); |
104 | font->setHaloColor(FbTk::Color("white", DefaultScreen(FbTk::App::instance()->display()))); | 104 | font.setHaloColor(FbTk::Color("white", DefaultScreen(FbTk::App::instance()->display()))); |
105 | font->setShadow(false); | 105 | font.setShadow(false); |
106 | font->setShadowColor(FbTk::Color("black", DefaultScreen(FbTk::App::instance()->display()))); | 106 | font.setShadowColor(FbTk::Color("black", DefaultScreen(FbTk::App::instance()->display()))); |
107 | font->setShadowOffY(2); | 107 | font.setShadowOffY(2); |
108 | font->setShadowOffX(2); | 108 | font.setShadowOffX(2); |
109 | } | 109 | } |
110 | 110 | ||
111 | }; // end nameless namespace | 111 | }; // end nameless namespace |
@@ -178,7 +178,7 @@ bool Font::load(const std::string &name) { | |||
178 | (cache_entry = font_cache.find(lookup_entry->second)) != font_cache.end()) { | 178 | (cache_entry = font_cache.find(lookup_entry->second)) != font_cache.end()) { |
179 | m_fontstr = cache_entry->first; | 179 | m_fontstr = cache_entry->first; |
180 | m_fontimp = cache_entry->second; | 180 | m_fontimp = cache_entry->second; |
181 | resetEffects(this); | 181 | resetEffects(*this); |
182 | return true; | 182 | return true; |
183 | } | 183 | } |
184 | 184 | ||
@@ -197,7 +197,7 @@ bool Font::load(const std::string &name) { | |||
197 | m_fontstr = cache_entry->first; | 197 | m_fontstr = cache_entry->first; |
198 | m_fontimp = cache_entry->second; | 198 | m_fontimp = cache_entry->second; |
199 | lookup_map[name] = m_fontstr; | 199 | lookup_map[name] = m_fontstr; |
200 | resetEffects(this); | 200 | resetEffects(*this); |
201 | return true; | 201 | return true; |
202 | } | 202 | } |
203 | 203 | ||
@@ -222,7 +222,7 @@ bool Font::load(const std::string &name) { | |||
222 | m_fontimp = tmp_font; | 222 | m_fontimp = tmp_font; |
223 | font_cache[(*name_it)] = tmp_font; | 223 | font_cache[(*name_it)] = tmp_font; |
224 | m_fontstr = name; | 224 | m_fontstr = name; |
225 | resetEffects(this); | 225 | resetEffects(*this); |
226 | return true; | 226 | return true; |
227 | } | 227 | } |
228 | 228 | ||