aboutsummaryrefslogtreecommitdiff
path: root/src/ToolbarTheme.cc
diff options
context:
space:
mode:
authorrathnor <rathnor>2004-09-12 14:56:20 (GMT)
committerrathnor <rathnor>2004-09-12 14:56:20 (GMT)
commit42c1fd3ae3dd058e146b7350c65b74386123c25c (patch)
treecc549c2c7b12c87f8c33198f5b30f00d9dd30bc6 /src/ToolbarTheme.cc
parentc39234195a46cece2bdb18dfdde6c91c7a190dc4 (diff)
downloadfluxbox_pavel-42c1fd3ae3dd058e146b7350c65b74386123c25c.zip
fluxbox_pavel-42c1fd3ae3dd058e146b7350c65b74386123c25c.tar.bz2
preliminary support for composite/compositing manager. Also general work
for consistency with transparency resources
Diffstat (limited to 'src/ToolbarTheme.cc')
-rw-r--r--src/ToolbarTheme.cc11
1 files changed, 1 insertions, 10 deletions
diff --git a/src/ToolbarTheme.cc b/src/ToolbarTheme.cc
index 0c3e3ea..f9d00ee 100644
--- a/src/ToolbarTheme.cc
+++ b/src/ToolbarTheme.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: ToolbarTheme.cc,v 1.16 2004/08/25 17:16:40 rathnor Exp $ 22// $Id: ToolbarTheme.cc,v 1.17 2004/09/12 14:56:19 rathnor Exp $
23 23
24#include "ToolbarTheme.hh" 24#include "ToolbarTheme.hh"
25 25
@@ -50,7 +50,6 @@ ToolbarTheme::ToolbarTheme(int screen_num):
50 m_border(*this, "toolbar", "Toolbar"), 50 m_border(*this, "toolbar", "Toolbar"),
51 m_bevel_width(*this, "toolbar.bevelWidth", "Toolbar.BevelWidth"), 51 m_bevel_width(*this, "toolbar.bevelWidth", "Toolbar.BevelWidth"),
52 m_shape(*this, "toolbar.shaped", "Toolbar.Shaped"), 52 m_shape(*this, "toolbar.shaped", "Toolbar.Shaped"),
53 m_alpha(*this, "toolbar.alpha", "Toolbar.Alpha"),
54 m_height(*this, "toolbar.height", "Toolbar.Height"), 53 m_height(*this, "toolbar.height", "Toolbar.Height"),
55 m_button_size(*this, "toolbar.button.size", "Toolbar.Button.Size") { 54 m_button_size(*this, "toolbar.button.size", "Toolbar.Button.Size") {
56 // set default value 55 // set default value
@@ -69,9 +68,6 @@ bool ToolbarTheme::fallback(FbTk::ThemeItem_base &item) {
69 return FbTk::ThemeManager::instance().loadItem(item, "borderWidth", "BorderWidth"); 68 return FbTk::ThemeManager::instance().loadItem(item, "borderWidth", "BorderWidth");
70 } else if (item.name().find(".borderColor") != std::string::npos) { 69 } else if (item.name().find(".borderColor") != std::string::npos) {
71 return FbTk::ThemeManager::instance().loadItem(item, "borderColor", "BorderColor"); 70 return FbTk::ThemeManager::instance().loadItem(item, "borderColor", "BorderColor");
72 } else if (item.name() == "toolbar.alpha") {
73 *m_alpha = 255;
74 return true;
75 } else if (item.name() == "toolbar.bevelWidth") { 71 } else if (item.name() == "toolbar.bevelWidth") {
76 return FbTk::ThemeManager::instance().loadItem(item, "bevelWidth", "BevelWidth"); 72 return FbTk::ThemeManager::instance().loadItem(item, "bevelWidth", "BevelWidth");
77 } 73 }
@@ -79,11 +75,6 @@ bool ToolbarTheme::fallback(FbTk::ThemeItem_base &item) {
79} 75}
80 76
81void ToolbarTheme::reconfigTheme() { 77void ToolbarTheme::reconfigTheme() {
82 if (*m_alpha > 255)
83 *m_alpha = 255;
84 else if (*m_alpha < 0)
85 *m_alpha = 0;
86
87 if (*m_bevel_width > 20) 78 if (*m_bevel_width > 20)
88 *m_bevel_width = 20; 79 *m_bevel_width = 20;
89 80