diff options
author | fluxgen <fluxgen> | 2003-08-27 20:13:32 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2003-08-27 20:13:32 (GMT) |
commit | 20012d911ac0d4787eca579c432cb8c4632b06c7 (patch) | |
tree | b94be72338e4af4905224cd39b278e52752bf379 /src | |
parent | 99c95b14356b31d737aa9624f15831df0c5384b0 (diff) | |
download | fluxbox_lack-20012d911ac0d4787eca579c432cb8c4632b06c7.zip fluxbox_lack-20012d911ac0d4787eca579c432cb8c4632b06c7.tar.bz2 |
added height theme item
Diffstat (limited to 'src')
-rw-r--r-- | src/ToolbarTheme.cc | 8 | ||||
-rw-r--r-- | src/ToolbarTheme.hh | 6 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/ToolbarTheme.cc b/src/ToolbarTheme.cc index e1ed5b4..4e1e774 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.10 2003/08/16 13:36:52 fluxgen Exp $ | 22 | // $Id: ToolbarTheme.cc,v 1.11 2003/08/27 20:13:32 fluxgen Exp $ |
23 | 23 | ||
24 | #include "ToolbarTheme.hh" | 24 | #include "ToolbarTheme.hh" |
25 | 25 | ||
@@ -50,6 +50,7 @@ ToolbarTheme::ToolbarTheme(int screen_num): | |||
50 | m_bevel_width(*this, "toolbar.bevelWidth", "Toolbar.BevelWidth"), | 50 | m_bevel_width(*this, "toolbar.bevelWidth", "Toolbar.BevelWidth"), |
51 | m_shape(*this, "toolbar.shaped", "Toolbar.Shaped"), | 51 | m_shape(*this, "toolbar.shaped", "Toolbar.Shaped"), |
52 | m_alpha(*this, "toolbar.alpha", "Toolbar.Alpha"), | 52 | m_alpha(*this, "toolbar.alpha", "Toolbar.Alpha"), |
53 | m_height(*this, "toolbar.height", "Toolbar.Height"), | ||
53 | m_display(FbTk::App::instance()->display()) { | 54 | m_display(FbTk::App::instance()->display()) { |
54 | // set default value | 55 | // set default value |
55 | *m_bevel_width = 0; | 56 | *m_bevel_width = 0; |
@@ -70,4 +71,9 @@ void ToolbarTheme::reconfigTheme() { | |||
70 | 71 | ||
71 | if (*m_bevel_width > 20) | 72 | if (*m_bevel_width > 20) |
72 | *m_bevel_width = 20; | 73 | *m_bevel_width = 20; |
74 | |||
75 | if (*m_height > 100) | ||
76 | *m_height = 100; | ||
77 | else if (*m_height < 0) | ||
78 | *m_height = 0; | ||
73 | } | 79 | } |
diff --git a/src/ToolbarTheme.hh b/src/ToolbarTheme.hh index b29ab59..1161e85 100644 --- a/src/ToolbarTheme.hh +++ b/src/ToolbarTheme.hh | |||
@@ -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.hh,v 1.8 2003/08/13 15:12:39 fluxgen Exp $ | 22 | // $Id: ToolbarTheme.hh,v 1.9 2003/08/27 20:13:32 fluxgen Exp $ |
23 | 23 | ||
24 | #ifndef TOOLBARTHEME_HH | 24 | #ifndef TOOLBARTHEME_HH |
25 | #define TOOLBARTHEME_HH | 25 | #define TOOLBARTHEME_HH |
@@ -45,14 +45,14 @@ public: | |||
45 | inline int bevelWidth() const { return *m_bevel_width; } | 45 | inline int bevelWidth() const { return *m_bevel_width; } |
46 | inline bool shape() const { return *m_shape; } | 46 | inline bool shape() const { return *m_shape; } |
47 | inline unsigned char alpha() const { return *m_alpha; } | 47 | inline unsigned char alpha() const { return *m_alpha; } |
48 | 48 | inline int height() const { return *m_height; } | |
49 | private: | 49 | private: |
50 | FbTk::ThemeItem<FbTk::Texture> m_toolbar; | 50 | FbTk::ThemeItem<FbTk::Texture> m_toolbar; |
51 | BorderTheme m_border; | 51 | BorderTheme m_border; |
52 | 52 | ||
53 | FbTk::ThemeItem<int> m_bevel_width; | 53 | FbTk::ThemeItem<int> m_bevel_width; |
54 | FbTk::ThemeItem<bool> m_shape; | 54 | FbTk::ThemeItem<bool> m_shape; |
55 | FbTk::ThemeItem<int> m_alpha; | 55 | FbTk::ThemeItem<int> m_alpha, m_height; |
56 | 56 | ||
57 | Display *m_display; | 57 | Display *m_display; |
58 | 58 | ||