aboutsummaryrefslogtreecommitdiff
path: root/src/FbTk/Texture.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/FbTk/Texture.cc')
-rw-r--r--src/FbTk/Texture.cc12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/FbTk/Texture.cc b/src/FbTk/Texture.cc
index 44df2cb..0bb91dc 100644
--- a/src/FbTk/Texture.cc
+++ b/src/FbTk/Texture.cc
@@ -57,9 +57,7 @@ void Texture::setFromString(const char * const texture_str) {
57 } else { 57 } else {
58 setType(Texture::NONE); 58 setType(Texture::NONE);
59 59
60 if (strstr(ts, "solid")) 60 if (strstr(ts, "gradient")) {
61 addType(Texture::SOLID);
62 else if (strstr(ts, "gradient")) {
63 addType(Texture::GRADIENT); 61 addType(Texture::GRADIENT);
64 if (strstr(ts, "crossdiagonal")) 62 if (strstr(ts, "crossdiagonal"))
65 addType(Texture::CROSSDIAGONAL); 63 addType(Texture::CROSSDIAGONAL);
@@ -79,17 +77,15 @@ void Texture::setFromString(const char * const texture_str) {
79 addType(Texture::VERTICAL); 77 addType(Texture::VERTICAL);
80 else 78 else
81 addType(Texture::DIAGONAL); 79 addType(Texture::DIAGONAL);
82 } else 80 } else // default is "solid", according to ThemeItems.cc
83 addType(Texture::SOLID); 81 addType(Texture::SOLID);
84 82
85 if (strstr(ts, "raised")) 83 if (strstr(ts, "raised"))
86 addType(Texture::RAISED); 84 addType(Texture::RAISED);
87 else if (strstr(ts, "sunken")) 85 else if (strstr(ts, "sunken"))
88 addType(Texture::SUNKEN); 86 addType(Texture::SUNKEN);
89 else if (strstr(ts, "flat")) 87 else // default us "flat", according to ThemeItems.cc
90 addType(Texture::FLAT); 88 addType(Texture::FLAT);
91 else
92 addType(Texture::RAISED);
93 89
94 if (! (type() & Texture::FLAT)) 90 if (! (type() & Texture::FLAT))
95 if (strstr(ts, "bevel2")) 91 if (strstr(ts, "bevel2"))