aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-02-23 00:47:34 (GMT)
committerfluxgen <fluxgen>2003-02-23 00:47:34 (GMT)
commit4c0fb1ff752f1cfafcac11637ce9cfec92201d13 (patch)
treed358784eee6f71f0ea2ba4e4af867ed651a1d2dd
parente45779ef1784558943f64a412ad9af62e5cfd795 (diff)
downloadfluxbox_pavel-4c0fb1ff752f1cfafcac11637ce9cfec92201d13.zip
fluxbox_pavel-4c0fb1ff752f1cfafcac11637ce9cfec92201d13.tar.bz2
fixed better default value for Color themeitem
-rw-r--r--src/FbTk/Theme.cc12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/FbTk/Theme.cc b/src/FbTk/Theme.cc
index 1e2ea3a..1efc8a1 100644
--- a/src/FbTk/Theme.cc
+++ b/src/FbTk/Theme.cc
@@ -19,7 +19,7 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: Theme.cc,v 1.1 2002/12/02 19:34:54 fluxgen Exp $ 22// $Id: Theme.cc,v 1.2 2003/02/23 00:47:34 fluxgen Exp $
23 23
24#include "Theme.hh" 24#include "Theme.hh"
25 25
@@ -77,14 +77,16 @@ void ThemeItem<FbTk::Texture>::load() {
77 m_value.colorTo().setFromString(colorto_name.c_str(), m_tm.screenNum()); 77 m_value.colorTo().setFromString(colorto_name.c_str(), m_tm.screenNum());
78} 78}
79 79
80
80template <> 81template <>
81void ThemeItem<FbTk::Color>::setFromString(const char *str) { 82void ThemeItem<FbTk::Color>::setDefaultValue() {
82 m_value.setFromString(str, m_tm.screenNum()); 83 m_value.setFromString("white", m_tm.screenNum());
83} 84}
84 85
85template <> 86template <>
86void ThemeItem<FbTk::Color>::setDefaultValue() { 87void ThemeItem<FbTk::Color>::setFromString(const char *str) {
87 m_value.setPixel(0xFFFFFFFF); 88 if (!m_value.setFromString(str, m_tm.screenNum()))
89 setDefaultValue();
88} 90}
89 91
90// does nothing 92// does nothing