From 877689f61c72c71d61ae41108f30666f5a40cb86 Mon Sep 17 00:00:00 2001 From: fluxgen Date: Tue, 7 Jan 2003 02:03:57 +0000 Subject: fixed menu theme --- src/Screen.hh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/Screen.hh b/src/Screen.hh index 3dcdc3b..2f9db31 100644 --- a/src/Screen.hh +++ b/src/Screen.hh @@ -22,7 +22,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: Screen.hh,v 1.56 2003/01/05 22:24:55 fluxgen Exp $ +// $Id: Screen.hh,v 1.57 2003/01/07 02:03:57 fluxgen Exp $ #ifndef SCREEN_HH #define SCREEN_HH @@ -51,6 +51,10 @@ class Rootmenu; class Netizen; class Slit; +namespace FbTk { +class MenuTheme; +}; + /// Handles screen connection /** Create a toolbar and workspaces, handles switching between workspaces and windows @@ -222,6 +226,9 @@ public: inline Theme::MenuStyle *getMenuStyle() { return &theme->getMenuStyle(); } inline FbWinFrameTheme &winFrameTheme() { return m_windowtheme; } inline const FbWinFrameTheme &winFrameTheme() const { return m_windowtheme; } + inline FbTk::MenuTheme *menuTheme() { return m_menutheme.get(); } + inline const FbTk::MenuTheme *menuTheme() const { return m_menutheme.get(); } + const Theme *getTheme() const { return theme; } FluxboxWindow *getIcon(unsigned int index); @@ -349,7 +356,8 @@ private: Window auto_group_window; FbWinFrameTheme m_windowtheme; - + std::auto_ptr m_menutheme; + struct ScreenResource { ScreenResource(ResourceManager &rm, const std::string &scrname, const std::string &altscrname); -- cgit v0.11.2