summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-08-22 15:02:33 (GMT)
committerfluxgen <fluxgen>2003-08-22 15:02:33 (GMT)
commit44208838af27bb819a5b326607009d41c00cb943 (patch)
treebacddd7aff1b1887c259cd0f174cb2d84cefdae5
parentec5c2b77a11e2762921ff4736539d4f5239b5866 (diff)
downloadfluxbox_lack-44208838af27bb819a5b326607009d41c00cb943.zip
fluxbox_lack-44208838af27bb819a5b326607009d41c00cb943.tar.bz2
new theme item window.title.height, Window.Title.Height
-rw-r--r--src/FbWinFrameTheme.cc7
-rw-r--r--src/FbWinFrameTheme.hh7
2 files changed, 9 insertions, 5 deletions
diff --git a/src/FbWinFrameTheme.cc b/src/FbWinFrameTheme.cc
index 6a10ddf..728cd2d 100644
--- a/src/FbWinFrameTheme.cc
+++ b/src/FbWinFrameTheme.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: FbWinFrameTheme.cc,v 1.8 2003/08/16 11:05:19 fluxgen Exp $ 22// $Id: FbWinFrameTheme.cc,v 1.9 2003/08/22 15:02:33 fluxgen Exp $
23 23
24#include "FbWinFrameTheme.hh" 24#include "FbWinFrameTheme.hh"
25#include "App.hh" 25#include "App.hh"
@@ -59,7 +59,10 @@ FbWinFrameTheme::FbWinFrameTheme(int screen_num):
59 m_textjustify(*this, "window.justify", "Window.Justify"), 59 m_textjustify(*this, "window.justify", "Window.Justify"),
60 m_shape_place(*this, "window.roundCorners", "Window.RoundCorners"), 60 m_shape_place(*this, "window.roundCorners", "Window.RoundCorners"),
61 61
62 m_alpha(*this, "window.alpha", "Window.Alpha") { 62 m_alpha(*this, "window.alpha", "Window.Alpha"),
63 m_title_height(*this, "window.title.height", "Window.Title.Height") {
64
65 *m_title_height = 0;
63 // set defaults 66 // set defaults
64 m_font->load("fixed"); 67 m_font->load("fixed");
65 *m_alpha = 255; 68 *m_alpha = 255;
diff --git a/src/FbWinFrameTheme.hh b/src/FbWinFrameTheme.hh
index 903dfd7..08d19a9 100644
--- a/src/FbWinFrameTheme.hh
+++ b/src/FbWinFrameTheme.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: FbWinFrameTheme.hh,v 1.7 2003/08/04 12:49:20 fluxgen Exp $ 22// $Id: FbWinFrameTheme.hh,v 1.8 2003/08/22 15:02:33 fluxgen Exp $
23 23
24#ifndef FBWINFRAMETHEME_HH 24#ifndef FBWINFRAMETHEME_HH
25#define FBWINFRAMETHEME_HH 25#define FBWINFRAMETHEME_HH
@@ -91,6 +91,7 @@ public:
91 91
92 unsigned char alpha() const { return *m_alpha; } 92 unsigned char alpha() const { return *m_alpha; }
93 93
94 unsigned int titleHeight() const { return *m_title_height; }
94private: 95private:
95 FbTk::ThemeItem<FbTk::Texture> m_label_focus, m_label_unfocus; 96 FbTk::ThemeItem<FbTk::Texture> m_label_focus, m_label_unfocus;
96 FbTk::ThemeItem<FbTk::Texture> m_title_focus, m_title_unfocus; 97 FbTk::ThemeItem<FbTk::Texture> m_title_focus, m_title_unfocus;
@@ -106,8 +107,8 @@ private:
106 FbTk::ThemeItem<FbTk::Justify> m_textjustify; 107 FbTk::ThemeItem<FbTk::Justify> m_textjustify;
107 FbTk::ThemeItem<Shape::ShapePlace> m_shape_place; 108 FbTk::ThemeItem<Shape::ShapePlace> m_shape_place;
108 109
109 FbTk::ThemeItem<int> m_alpha; 110 FbTk::ThemeItem<int> m_alpha, m_title_height;
110 111
111 GC m_label_text_focus_gc, m_label_text_unfocus_gc; 112 GC m_label_text_focus_gc, m_label_text_unfocus_gc;
112 GC m_button_pic_focus_gc, m_button_pic_unfocus_gc; 113 GC m_button_pic_focus_gc, m_button_pic_unfocus_gc;
113 114