aboutsummaryrefslogtreecommitdiff
path: root/src/Screen.hh
diff options
context:
space:
mode:
Diffstat (limited to 'src/Screen.hh')
-rw-r--r--src/Screen.hh10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/Screen.hh b/src/Screen.hh
index 81812ba..8d50fbc 100644
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -89,6 +89,10 @@ public:
89 typedef std::vector<std::string> WorkspaceNames; 89 typedef std::vector<std::string> WorkspaceNames;
90 typedef std::list<std::pair<FbTk::FbString, FbTk::RefCount<FbTk::Menu> > > ExtraMenus; 90 typedef std::list<std::pair<FbTk::FbString, FbTk::RefCount<FbTk::Menu> > > ExtraMenus;
91 91
92 typedef FbTk::Resource<
93 FbWinFrame::TabPlacement, FbTk::EnumTraits<FbWinFrame::TabPlacement>
94 > TabPlacementResource;
95
92 BScreen(FbTk::ResourceManager_base &rm, 96 BScreen(FbTk::ResourceManager_base &rm,
93 const std::string &screenname, 97 const std::string &screenname,
94 int scrn, int number_of_layers); 98 int scrn, int number_of_layers);
@@ -120,7 +124,7 @@ public:
120 ExtraMenus &extraWindowMenus() { return m_extramenus; } 124 ExtraMenus &extraWindowMenus() { return m_extramenus; }
121 const ExtraMenus &extraWindowMenus() const { return m_extramenus; } 125 const ExtraMenus &extraWindowMenus() const { return m_extramenus; }
122 126
123 FbWinFrame::TabPlacement getTabPlacement() const { return *resource.tab_placement; } 127 TabPlacementResource &getTabPlacementResource() { return resource.tab_placement; }
124 128
125 unsigned int noFocusWhileTypingDelay() const { return *resource.typing_delay; } 129 unsigned int noFocusWhileTypingDelay() const { return *resource.typing_delay; }
126 const bool allowRemoteActions() const { return *resource.allow_remote_actions; } 130 const bool allowRemoteActions() const { return *resource.allow_remote_actions; }
@@ -253,8 +257,6 @@ public:
253 257
254 void setRootColormapInstalled(bool r) { root_colormap_installed = r; } 258 void setRootColormapInstalled(bool r) { root_colormap_installed = r; }
255 259
256 void saveTabPlacement(FbWinFrame::TabPlacement place) { *resource.tab_placement = place; }
257
258 void saveWorkspaces(int w) { *resource.workspaces = w; } 260 void saveWorkspaces(int w) { *resource.workspaces = w; }
259 261
260 FbTk::ThemeProxy<FbWinFrameTheme> &focusedWinFrameTheme() { return *m_focused_windowtheme.get(); } 262 FbTk::ThemeProxy<FbWinFrameTheme> &focusedWinFrameTheme() { return *m_focused_windowtheme.get(); }
@@ -532,7 +534,7 @@ private:
532 max_ignore_inc, max_disable_move, max_disable_resize, 534 max_ignore_inc, max_disable_move, max_disable_resize,
533 workspace_warping, show_window_pos, auto_raise, click_raises; 535 workspace_warping, show_window_pos, auto_raise, click_raises;
534 FbTk::StringResource default_deco; 536 FbTk::StringResource default_deco;
535 FbTk::Resource<FbWinFrame::TabPlacement, FbTk::EnumTraits<FbWinFrame::TabPlacement> > tab_placement; 537 TabPlacementResource tab_placement;
536 FbTk::StringResource windowmenufile; 538 FbTk::StringResource windowmenufile;
537 FbTk::UIntResource typing_delay; 539 FbTk::UIntResource typing_delay;
538 FbTk::IntResource workspaces, edge_snap_threshold, focused_alpha, 540 FbTk::IntResource workspaces, edge_snap_threshold, focused_alpha,