diff options
author | Mark Tiefenbruck <mark@fluxbox.org> | 2007-12-28 07:16:17 (GMT) |
---|---|---|
committer | Mark Tiefenbruck <mark@fluxbox.org> | 2007-12-28 07:16:17 (GMT) |
commit | 2940869cd7cc1688be5114451380275c9a85f5d1 (patch) | |
tree | 8200e95524356dfd45cb9ceaef0b4ea4b0816fa9 /src/FbTk/MenuTheme.cc | |
parent | 62bcfaf0e4fd7d77873343d880fc526ec58cdaa6 (diff) | |
download | fluxbox-2940869cd7cc1688be5114451380275c9a85f5d1.zip fluxbox-2940869cd7cc1688be5114451380275c9a85f5d1.tar.bz2 |
merge MenuTheme with FbTk::MenuTheme
Diffstat (limited to 'src/FbTk/MenuTheme.cc')
-rw-r--r-- | src/FbTk/MenuTheme.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/FbTk/MenuTheme.cc b/src/FbTk/MenuTheme.cc index 18e51aa..239313c 100644 --- a/src/FbTk/MenuTheme.cc +++ b/src/FbTk/MenuTheme.cc | |||
@@ -54,6 +54,7 @@ MenuTheme::MenuTheme(int screen_num): | |||
54 | titlefont_justify(*this, "menu.title.justify", "Menu.Title.Justify"), | 54 | titlefont_justify(*this, "menu.title.justify", "Menu.Title.Justify"), |
55 | bullet_pos(*this, "menu.bullet.position", "Menu.Bullet.Position"), | 55 | bullet_pos(*this, "menu.bullet.position", "Menu.Bullet.Position"), |
56 | m_bullet(*this, "menu.bullet", "Menu.Bullet"), | 56 | m_bullet(*this, "menu.bullet", "Menu.Bullet"), |
57 | m_shapeplace(*this, "menu.roundCorners", "Menu.RoundCorners"), | ||
57 | m_title_height(*this, "menu.titleHeight", "Menu.TitleHeight"), | 58 | m_title_height(*this, "menu.titleHeight", "Menu.TitleHeight"), |
58 | m_item_height(*this, "menu.itemHeight", "Menu.ItemHeight"), | 59 | m_item_height(*this, "menu.itemHeight", "Menu.ItemHeight"), |
59 | m_border_width(*this, "menu.borderWidth", "Menu.BorderWidth"), | 60 | m_border_width(*this, "menu.borderWidth", "Menu.BorderWidth"), |
@@ -78,11 +79,12 @@ MenuTheme::MenuTheme(int screen_num): | |||
78 | m_delayclose(0), // no delay as default | 79 | m_delayclose(0), // no delay as default |
79 | m_real_title_height(*m_title_height), | 80 | m_real_title_height(*m_title_height), |
80 | m_real_item_height(*m_item_height) | 81 | m_real_item_height(*m_item_height) |
81 | { | 82 | { |
82 | // set default values | 83 | // set default values |
83 | *m_border_width = 0; | 84 | *m_border_width = 0; |
84 | *m_bevel_width = 0; | 85 | *m_bevel_width = 0; |
85 | *m_border_width = 0; | 86 | *m_border_width = 0; |
87 | *m_shapeplace = FbTk::Shape::NONE; | ||
86 | 88 | ||
87 | ThemeManager::instance().loadTheme(*this); | 89 | ThemeManager::instance().loadTheme(*this); |
88 | 90 | ||