aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-06-24 16:29:54 (GMT)
committerfluxgen <fluxgen>2003-06-24 16:29:54 (GMT)
commitb22a04f1c6b09facf6ee5b1f46f587d6dc6e4a36 (patch)
treeb64f3e4bb4ad3b4408625b2243514b4813402c9d
parent2d0536a22380311e0668c0808dab95222af078c3 (diff)
downloadfluxbox-b22a04f1c6b09facf6ee5b1f46f587d6dc6e4a36.zip
fluxbox-b22a04f1c6b09facf6ee5b1f46f587d6dc6e4a36.tar.bz2
moved toolbar mode resources to ToolbarHandler
-rw-r--r--src/Screen.hh16
1 files changed, 5 insertions, 11 deletions
diff --git a/src/Screen.hh b/src/Screen.hh
index a2f8592..4ee147c 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.110 2003/06/24 15:01:54 fluxgen Exp $ 25// $Id: Screen.hh,v 1.111 2003/06/24 16:29:54 fluxgen Exp $
26 26
27#ifndef SCREEN_HH 27#ifndef SCREEN_HH
28#define SCREEN_HH 28#define SCREEN_HH
@@ -30,9 +30,9 @@
30#include "Resource.hh" 30#include "Resource.hh"
31#include "Subject.hh" 31#include "Subject.hh"
32#include "MultLayers.hh" 32#include "MultLayers.hh"
33#include "ToolbarHandler.hh"
34#include "FbRootWindow.hh" 33#include "FbRootWindow.hh"
35#include "NotCopyable.hh" 34#include "NotCopyable.hh"
35#include "fluxbox.hh"
36 36
37#include <X11/Xlib.h> 37#include <X11/Xlib.h>
38#include <X11/Xresource.h> 38#include <X11/Xresource.h>
@@ -46,6 +46,7 @@
46 46
47class Netizen; 47class Netizen;
48class Toolbar; 48class Toolbar;
49class ToolbarHandler;
49class FbWinFrameTheme; 50class FbWinFrameTheme;
50class RootTheme; 51class RootTheme;
51class WinButtonTheme; 52class WinButtonTheme;
@@ -105,8 +106,8 @@ public:
105 inline Slit *slit() { return m_slit.get(); } 106 inline Slit *slit() { return m_slit.get(); }
106 inline const Slit *slit() const { return m_slit.get(); } 107 inline const Slit *slit() const { return m_slit.get(); }
107 108
108 inline const Toolbar *toolbar() const { return m_toolbarhandler->getToolbar(); } 109 const Toolbar *toolbar() const;
109 inline Toolbar *toolbar() { return m_toolbarhandler->getToolbar(); } 110 Toolbar *toolbar();
110 111
111 inline const ToolbarHandler &toolbarHandler() const { return *m_toolbarhandler; } 112 inline const ToolbarHandler &toolbarHandler() const { return *m_toolbarhandler; }
112 inline ToolbarHandler &toolbarHandler() { return *m_toolbarhandler; } 113 inline ToolbarHandler &toolbarHandler() { return *m_toolbarhandler; }
@@ -161,7 +162,6 @@ public:
161 /// @return the resource value of number of workspace 162 /// @return the resource value of number of workspace
162 inline int getNumberOfWorkspaces() const { return *resource.workspaces; } 163 inline int getNumberOfWorkspaces() const { return *resource.workspaces; }
163 164
164 inline ToolbarHandler::ToolbarMode toolbarMode() const { return *resource.toolbar_mode; }
165 inline int getPlacementPolicy() const { return resource.placement_policy; } 165 inline int getPlacementPolicy() const { return resource.placement_policy; }
166 inline int getEdgeSnapThreshold() const { return *resource.edge_snap_threshold; } 166 inline int getEdgeSnapThreshold() const { return *resource.edge_snap_threshold; }
167 inline int getRowPlacementDirection() const { return resource.row_direction; } 167 inline int getRowPlacementDirection() const { return resource.row_direction; }
@@ -172,9 +172,6 @@ public:
172 inline void saveFocusModel(Fluxbox::FocusModel model) { resource.focus_model = model; } 172 inline void saveFocusModel(Fluxbox::FocusModel model) { resource.focus_model = model; }
173 inline void saveWorkspaces(int w) { *resource.workspaces = w; } 173 inline void saveWorkspaces(int w) { *resource.workspaces = w; }
174 174
175
176 inline void saveToolbarMode(ToolbarHandler::ToolbarMode m) { *resource.toolbar_mode = m; }
177
178 inline void savePlacementPolicy(int p) { resource.placement_policy = p; } 175 inline void savePlacementPolicy(int p) { resource.placement_policy = p; }
179 inline void saveRowPlacementDirection(int d) { resource.row_direction = d; } 176 inline void saveRowPlacementDirection(int d) { resource.row_direction = d; }
180 inline void saveColPlacementDirection(int d) { resource.col_direction = d; } 177 inline void saveColPlacementDirection(int d) { resource.col_direction = d; }
@@ -414,9 +411,6 @@ private:
414 411
415 int placement_policy, row_direction, col_direction; 412 int placement_policy, row_direction, col_direction;
416 413
417 FbTk::Resource<ToolbarHandler::ToolbarMode> toolbar_mode;
418
419
420 std::string strftime_format; 414 std::string strftime_format;
421 415
422 bool clock24hour; 416 bool clock24hour;