diff options
Diffstat (limited to 'src/Screen.hh')
-rw-r--r-- | src/Screen.hh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/Screen.hh b/src/Screen.hh index c524a91..98c13e4 100644 --- a/src/Screen.hh +++ b/src/Screen.hh | |||
@@ -88,6 +88,10 @@ public: | |||
88 | typedef std::vector<std::string> WorkspaceNames; | 88 | typedef std::vector<std::string> WorkspaceNames; |
89 | typedef std::list<std::pair<FbTk::FbString, FbTk::RefCount<FbTk::Menu> > > ExtraMenus; | 89 | typedef std::list<std::pair<FbTk::FbString, FbTk::RefCount<FbTk::Menu> > > ExtraMenus; |
90 | 90 | ||
91 | typedef FbTk::Resource< | ||
92 | FbWinFrame::TabPlacement, FbTk::EnumTraits<FbWinFrame::TabPlacement> | ||
93 | > TabPlacementResource; | ||
94 | |||
91 | BScreen(FbTk::ResourceManager_base &rm, | 95 | BScreen(FbTk::ResourceManager_base &rm, |
92 | const std::string &screenname, | 96 | const std::string &screenname, |
93 | int scrn, int number_of_layers); | 97 | int scrn, int number_of_layers); |
@@ -119,7 +123,7 @@ public: | |||
119 | ExtraMenus &extraWindowMenus() { return m_extramenus; } | 123 | ExtraMenus &extraWindowMenus() { return m_extramenus; } |
120 | const ExtraMenus &extraWindowMenus() const { return m_extramenus; } | 124 | const ExtraMenus &extraWindowMenus() const { return m_extramenus; } |
121 | 125 | ||
122 | FbWinFrame::TabPlacement getTabPlacement() const { return *resource.tab_placement; } | 126 | TabPlacementResource &getTabPlacementResource() { return resource.tab_placement; } |
123 | 127 | ||
124 | unsigned int noFocusWhileTypingDelay() const { return *resource.typing_delay; } | 128 | unsigned int noFocusWhileTypingDelay() const { return *resource.typing_delay; } |
125 | const bool allowRemoteActions() const { return *resource.allow_remote_actions; } | 129 | const bool allowRemoteActions() const { return *resource.allow_remote_actions; } |
@@ -252,8 +256,6 @@ public: | |||
252 | 256 | ||
253 | void setRootColormapInstalled(bool r) { root_colormap_installed = r; } | 257 | void setRootColormapInstalled(bool r) { root_colormap_installed = r; } |
254 | 258 | ||
255 | void saveTabPlacement(FbWinFrame::TabPlacement place) { *resource.tab_placement = place; } | ||
256 | |||
257 | void saveWorkspaces(int w) { *resource.workspaces = w; } | 259 | void saveWorkspaces(int w) { *resource.workspaces = w; } |
258 | 260 | ||
259 | FbTk::ThemeProxy<FbWinFrameTheme> &focusedWinFrameTheme() { return *m_focused_windowtheme.get(); } | 261 | FbTk::ThemeProxy<FbWinFrameTheme> &focusedWinFrameTheme() { return *m_focused_windowtheme.get(); } |
@@ -515,7 +517,7 @@ private: | |||
515 | max_ignore_inc, max_disable_move, max_disable_resize, | 517 | max_ignore_inc, max_disable_move, max_disable_resize, |
516 | workspace_warping, show_window_pos, auto_raise, click_raises; | 518 | workspace_warping, show_window_pos, auto_raise, click_raises; |
517 | FbTk::StringResource default_deco; | 519 | FbTk::StringResource default_deco; |
518 | FbTk::Resource<FbWinFrame::TabPlacement, FbTk::EnumTraits<FbWinFrame::TabPlacement> > tab_placement; | 520 | TabPlacementResource tab_placement; |
519 | FbTk::StringResource windowmenufile; | 521 | FbTk::StringResource windowmenufile; |
520 | FbTk::UIntResource typing_delay; | 522 | FbTk::UIntResource typing_delay; |
521 | FbTk::IntResource workspaces, edge_snap_threshold, focused_alpha, | 523 | FbTk::IntResource workspaces, edge_snap_threshold, focused_alpha, |