aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-08-11 16:02:38 (GMT)
committerfluxgen <fluxgen>2003-08-11 16:02:38 (GMT)
commite163208cab954d36bec05fc269e5588792d2ee8b (patch)
tree0bb06fcc9fcce81305cff6a4a49f48f1baf0b44b
parent2e4b09e37c320ec83857d60d3ee64eb90ca2f53e (diff)
downloadfluxbox_paul-e163208cab954d36bec05fc269e5588792d2ee8b.zip
fluxbox_paul-e163208cab954d36bec05fc269e5588792d2ee8b.tar.bz2
rearranged accessors and fixed new timer command
-rw-r--r--src/Slit.hh47
1 files changed, 23 insertions, 24 deletions
diff --git a/src/Slit.hh b/src/Slit.hh
index 023d35d..9b844e2 100644
--- a/src/Slit.hh
+++ b/src/Slit.hh
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25/// $Id: Slit.hh,v 1.36 2003/07/19 11:55:49 rathnor Exp $ 25/// $Id: Slit.hh,v 1.37 2003/08/11 16:02:38 fluxgen Exp $
26 26
27#ifndef SLIT_HH 27#ifndef SLIT_HH
28#define SLIT_HH 28#define SLIT_HH
@@ -47,7 +47,7 @@ class FbMenu;
47class Strut; 47class Strut;
48 48
49/// Handles dock apps 49/// Handles dock apps
50class Slit : public FbTk::TimeoutHandler, public FbTk::EventHandler { 50class Slit: public FbTk::EventHandler {
51public: 51public:
52 52
53 /** 53 /**
@@ -63,22 +63,6 @@ public:
63 Slit(BScreen &screen, FbTk::XLayer &layer, const char *filename = 0); 63 Slit(BScreen &screen, FbTk::XLayer &layer, const char *filename = 0);
64 virtual ~Slit(); 64 virtual ~Slit();
65 65
66 inline bool isHidden() const { return m_hidden; }
67 inline bool doAutoHide() const { return *m_rc_auto_hide; }
68 inline Direction direction() const { return *m_rc_direction; }
69 inline Placement placement() const { return *m_rc_placement; }
70 inline int getOnHead() const { return *m_rc_on_head; }
71 void saveOnHead(int head);
72 FbTk::Menu &menu() { return m_slitmenu; }
73
74 inline const FbTk::FbWindow &window() const { return frame.window; }
75
76 inline int x() const { return (m_hidden ? frame.x_hidden : frame.x); }
77 inline int y() const { return (m_hidden ? frame.y_hidden : frame.y); }
78
79 inline unsigned int width() const { return frame.width; }
80 inline unsigned int height() const { return frame.height; }
81
82 void setDirection(Direction dir); 66 void setDirection(Direction dir);
83 void setPlacement(Placement place); 67 void setPlacement(Placement place);
84 void setAutoHide(bool val); 68 void setAutoHide(bool val);
@@ -93,11 +77,6 @@ public:
93 void cycleClientsUp(); 77 void cycleClientsUp();
94 /// cycle slit clients down one step 78 /// cycle slit clients down one step
95 void cycleClientsDown(); 79 void cycleClientsDown();
96
97 BScreen &screen() { return m_screen; }
98 const BScreen &screen() const { return m_screen; }
99 SlitTheme &theme() { return *m_slit_theme.get(); }
100 const SlitTheme &theme() const { return *m_slit_theme.get(); }
101 /** 80 /**
102 @name eventhandlers 81 @name eventhandlers
103 */ 82 */
@@ -111,10 +90,30 @@ public:
111 //@} 90 //@}
112 91
113 void moveToLayer(int layernum); 92 void moveToLayer(int layernum);
93 void toggleHidden();
94
95 BScreen &screen() { return m_screen; }
96 const BScreen &screen() const { return m_screen; }
97 SlitTheme &theme() { return *m_slit_theme.get(); }
98 const SlitTheme &theme() const { return *m_slit_theme.get(); }
99
114 FbTk::XLayerItem &layerItem() { return *m_layeritem; } 100 FbTk::XLayerItem &layerItem() { return *m_layeritem; }
101 inline bool isHidden() const { return m_hidden; }
102 inline bool doAutoHide() const { return *m_rc_auto_hide; }
103 inline Direction direction() const { return *m_rc_direction; }
104 inline Placement placement() const { return *m_rc_placement; }
105 inline int getOnHead() const { return *m_rc_on_head; }
106 void saveOnHead(int head);
107 FbTk::Menu &menu() { return m_slitmenu; }
108
109 inline const FbTk::FbWindow &window() const { return frame.window; }
115 110
116 virtual void timeout(); 111 inline int x() const { return (m_hidden ? frame.x_hidden : frame.x); }
112 inline int y() const { return (m_hidden ? frame.y_hidden : frame.y); }
117 113
114 inline unsigned int width() const { return frame.width; }
115 inline unsigned int height() const { return frame.height; }
116
118private: 117private:
119 void clearWindow(); 118 void clearWindow();
120 void setupMenu(); 119 void setupMenu();