aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-06-20 01:26:16 (GMT)
committerfluxgen <fluxgen>2003-06-20 01:26:16 (GMT)
commit55df2a8b05f655bf03764a43ea3030aaf5c61f79 (patch)
treece9a2eb53bc3fba4d7ee5af57aa8cfdfc587292c /src
parent97034df0bae7cc7311f738724ffed883977fafab (diff)
downloadfluxbox_paul-55df2a8b05f655bf03764a43ea3030aaf5c61f79.zip
fluxbox_paul-55df2a8b05f655bf03764a43ea3030aaf5c61f79.tar.bz2
moved slit resource from screen
Diffstat (limited to 'src')
-rw-r--r--src/Slit.hh17
1 files changed, 11 insertions, 6 deletions
diff --git a/src/Slit.hh b/src/Slit.hh
index 7626665..4c5fb59 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.31 2003/06/18 13:49:43 fluxgen Exp $ 25/// $Id: Slit.hh,v 1.32 2003/06/20 01:26:16 fluxgen Exp $
26 26
27#ifndef SLIT_HH 27#ifndef SLIT_HH
28#define SLIT_HH 28#define SLIT_HH
@@ -59,13 +59,14 @@ public:
59 */ 59 */
60 enum Placement { TOPLEFT = 1, CENTERLEFT, BOTTOMLEFT, TOPCENTER, BOTTOMCENTER, 60 enum Placement { TOPLEFT = 1, CENTERLEFT, BOTTOMLEFT, TOPCENTER, BOTTOMCENTER,
61 TOPRIGHT, CENTERRIGHT, BOTTOMRIGHT }; 61 TOPRIGHT, CENTERRIGHT, BOTTOMRIGHT };
62
62 Slit(BScreen &screen, FbTk::XLayer &layer, const char *filename = 0); 63 Slit(BScreen &screen, FbTk::XLayer &layer, const char *filename = 0);
63 virtual ~Slit(); 64 virtual ~Slit();
64 65
65 inline bool isHidden() const { return m_hidden; } 66 inline bool isHidden() const { return m_hidden; }
66 inline bool doAutoHide() const { return m_do_auto_hide; } 67 inline bool doAutoHide() const { return *m_rc_auto_hide; }
67 inline Direction direction() const { return m_direction; } 68 inline Direction direction() const { return *m_rc_direction; }
68 inline Placement placement() const { return m_placement; } 69 inline Placement placement() const { return *m_rc_placement; }
69 FbTk::Menu &menu() { return m_slitmenu; } 70 FbTk::Menu &menu() { return m_slitmenu; }
70 71
71 inline const FbTk::FbWindow &window() const { return frame.window; } 72 inline const FbTk::FbWindow &window() const { return frame.window; }
@@ -122,8 +123,6 @@ private:
122 void updateStrut(); 123 void updateStrut();
123 124
124 bool m_hidden, m_do_auto_hide; 125 bool m_hidden, m_do_auto_hide;
125 Direction m_direction;
126 Placement m_placement;
127 126
128 BScreen &m_screen; 127 BScreen &m_screen;
129 FbTk::Timer m_timer; 128 FbTk::Timer m_timer;
@@ -151,6 +150,12 @@ private:
151 std::auto_ptr<FbTk::Transparent> m_transp; 150 std::auto_ptr<FbTk::Transparent> m_transp;
152 static unsigned int s_eventmask; 151 static unsigned int s_eventmask;
153 Strut *m_strut; 152 Strut *m_strut;
153
154 FbTk::Resource<bool> m_rc_auto_hide, m_rc_maximize_over;
155 FbTk::Resource<Slit::Placement> m_rc_placement;
156 FbTk::Resource<Slit::Direction> m_rc_direction;
157 FbTk::Resource<int> m_rc_alpha, m_rc_on_head;
158 FbTk::Resource<Fluxbox::Layer> m_rc_layernum;
154}; 159};
155 160
156 161