summaryrefslogtreecommitdiff
path: root/src/Slit.hh
diff options
context:
space:
mode:
Diffstat (limited to 'src/Slit.hh')
-rw-r--r--src/Slit.hh19
1 files changed, 12 insertions, 7 deletions
diff --git a/src/Slit.hh b/src/Slit.hh
index 81322b3..45d5993 100644
--- a/src/Slit.hh
+++ b/src/Slit.hh
@@ -27,11 +27,15 @@
27#ifndef SLIT_HH 27#ifndef SLIT_HH
28#define SLIT_HH 28#define SLIT_HH
29 29
30#include "Menu.hh" 30
31#include "FbWindow.hh"
32#include "Timer.hh"
33#include "XLayerItem.hh"
34#include "LayerMenu.hh" 31#include "LayerMenu.hh"
32#include "fluxbox.hh"
33
34#include "FbTk/Menu.hh"
35#include "FbTk/FbWindow.hh"
36#include "FbTk/Timer.hh"
37#include "FbTk/Resource.hh"
38#include "FbTk/XLayerItem.hh"
35 39
36#include <X11/Xlib.h> 40#include <X11/Xlib.h>
37#include <X11/Xutil.h> 41#include <X11/Xutil.h>
@@ -47,7 +51,7 @@ class FbMenu;
47class Strut; 51class Strut;
48 52
49/// Handles dock apps 53/// Handles dock apps
50class Slit: public FbTk::EventHandler, public FbTk::Observer { 54class Slit: public FbTk::EventHandler, public FbTk::Observer, public LayerObject {
51public: 55public:
52 typedef std::list<SlitClient *> SlitClients; 56 typedef std::list<SlitClient *> SlitClients;
53 /** 57 /**
@@ -105,7 +109,8 @@ public:
105 SlitTheme &theme() { return *m_slit_theme.get(); } 109 SlitTheme &theme() { return *m_slit_theme.get(); }
106 const SlitTheme &theme() const { return *m_slit_theme.get(); } 110 const SlitTheme &theme() const { return *m_slit_theme.get(); }
107 111
108 FbTk::XLayerItem &layerItem() { return *m_layeritem; } 112 int layerNumber() const { return m_layeritem->getLayerNum(); }
113
109 inline bool isHidden() const { return m_hidden; } 114 inline bool isHidden() const { return m_hidden; }
110 inline bool doAutoHide() const { return *m_rc_auto_hide; } 115 inline bool doAutoHide() const { return *m_rc_auto_hide; }
111 inline Direction direction() const { return *m_rc_direction; } 116 inline Direction direction() const { return *m_rc_direction; }
@@ -141,7 +146,7 @@ private:
141 146
142 SlitClients m_client_list; 147 SlitClients m_client_list;
143 FbMenu m_slitmenu, m_placement_menu, m_clientlist_menu; 148 FbMenu m_slitmenu, m_placement_menu, m_clientlist_menu;
144 std::auto_ptr<LayerMenu<Slit> > m_layermenu; 149 std::auto_ptr<LayerMenu> m_layermenu;
145 std::string m_filename; 150 std::string m_filename;
146 151
147 struct frame { 152 struct frame {