aboutsummaryrefslogtreecommitdiff
path: root/src/Screen.hh
diff options
context:
space:
mode:
authorrathnor <rathnor>2003-04-16 16:18:06 (GMT)
committerrathnor <rathnor>2003-04-16 16:18:06 (GMT)
commite48f7836fdaca03e0626b3e7ac4d37c99dd35dc9 (patch)
treedd5421ed6b26c0d882dd34a91dfc01eb1ae3ee85 /src/Screen.hh
parent9163668e98e1683b95fb5cc44c19b3695c7857c4 (diff)
downloadfluxbox-e48f7836fdaca03e0626b3e7ac4d37c99dd35dc9.zip
fluxbox-e48f7836fdaca03e0626b3e7ac4d37c99dd35dc9.tar.bz2
fix saving of various slit params (Simon)
Diffstat (limited to 'src/Screen.hh')
-rw-r--r--src/Screen.hh20
1 files changed, 11 insertions, 9 deletions
diff --git a/src/Screen.hh b/src/Screen.hh
index 21d31f3..8b4d74a 100644
--- a/src/Screen.hh
+++ b/src/Screen.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: Screen.hh,v 1.79 2003/04/16 14:43:02 rathnor Exp $ 25// $Id: Screen.hh,v 1.80 2003/04/16 16:17:57 rathnor Exp $
26 26
27#ifndef SCREEN_HH 27#ifndef SCREEN_HH
28#define SCREEN_HH 28#define SCREEN_HH
@@ -36,6 +36,7 @@
36#include "MultLayers.hh" 36#include "MultLayers.hh"
37#include "XLayerItem.hh" 37#include "XLayerItem.hh"
38#include "ToolbarHandler.hh" 38#include "ToolbarHandler.hh"
39#include "Slit.hh"
39 40
40#include <X11/Xlib.h> 41#include <X11/Xlib.h>
41#include <X11/Xresource.h> 42#include <X11/Xresource.h>
@@ -52,7 +53,6 @@
52#endif // HAVE_CONFIG_H 53#endif // HAVE_CONFIG_H
53 54
54class Netizen; 55class Netizen;
55class Slit;
56class Toolbar; 56class Toolbar;
57class FbWinFrameTheme; 57class FbWinFrameTheme;
58class RootTheme; 58class RootTheme;
@@ -109,15 +109,16 @@ public:
109 inline const std::string &getRootCommand() const { return *resource.rootcommand; } 109 inline const std::string &getRootCommand() const { return *resource.rootcommand; }
110 inline Fluxbox::FocusModel getFocusModel() const { return *resource.focus_model; } 110 inline Fluxbox::FocusModel getFocusModel() const { return *resource.focus_model; }
111 111
112 inline bool doSlitAutoHide() const { return resource.slit_auto_hide; } 112 inline bool &doSlitAutoHide() { return *resource.slit_auto_hide; }
113 inline const bool &doSlitAutoHide() const { return *resource.slit_auto_hide; }
113#ifdef SLIT 114#ifdef SLIT
114 inline Slit *getSlit() { return m_slit.get(); } 115 inline Slit *getSlit() { return m_slit.get(); }
115 inline const Slit *getSlit() const { return m_slit.get(); } 116 inline const Slit *getSlit() const { return m_slit.get(); }
116#endif // SLIT 117#endif // SLIT
117 inline int getSlitPlacement() const { return resource.slit_placement; } 118 inline Slit::Placement getSlitPlacement() const { return *resource.slit_placement; }
118 inline int getSlitDirection() const { return resource.slit_direction; } 119 inline Slit::Direction getSlitDirection() const { return *resource.slit_direction; }
119 inline void saveSlitPlacement(int p) { resource.slit_placement = p; } 120 inline void saveSlitPlacement(Slit::Placement p) { resource.slit_placement = p; }
120 inline void saveSlitDirection(int d) { resource.slit_direction = d; } 121 inline void saveSlitDirection(Slit::Direction d) { resource.slit_direction = d; }
121 inline void saveSlitAutoHide(bool t) { resource.slit_auto_hide = t; } 122 inline void saveSlitAutoHide(bool t) { resource.slit_auto_hide = t; }
122 123
123 inline unsigned int getSlitOnHead() const { return resource.slit_on_head; } 124 inline unsigned int getSlitOnHead() const { return resource.slit_on_head; }
@@ -409,8 +410,9 @@ private:
409 Resource<ToolbarHandler::ToolbarMode> toolbar_mode; 410 Resource<ToolbarHandler::ToolbarMode> toolbar_mode;
410 Resource<int> toolbar_on_head; 411 Resource<int> toolbar_on_head;
411 Resource<Toolbar::Placement> toolbar_placement; 412 Resource<Toolbar::Placement> toolbar_placement;
412 bool slit_auto_hide; 413 Resource<bool> slit_auto_hide;
413 int slit_placement, slit_direction; 414 Resource<Slit::Placement> slit_placement;
415 Resource<Slit::Direction> slit_direction;
414 416
415 unsigned int slit_on_head; 417 unsigned int slit_on_head;
416 418