aboutsummaryrefslogtreecommitdiff
path: root/src/Screen.hh
diff options
context:
space:
mode:
authormarkt <markt>2006-08-02 22:02:31 (GMT)
committermarkt <markt>2006-08-02 22:02:31 (GMT)
commit00d862724a5dae43dbf1cbe4378fb846218fb3c3 (patch)
tree5538b87535f1115dad8aed5950325eaa1ee17f84 /src/Screen.hh
parent9053e772db1ea9ab2b7a1baa88ba81fed2577f64 (diff)
downloadfluxbox-00d862724a5dae43dbf1cbe4378fb846218fb3c3.zip
fluxbox-00d862724a5dae43dbf1cbe4378fb846218fb3c3.tar.bz2
rename session.screen*.iconbar.deiconifyMode to session.screen0.userFollowModel
Diffstat (limited to 'src/Screen.hh')
-rw-r--r--src/Screen.hh4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/Screen.hh b/src/Screen.hh
index ecfc619..b0eb9dd 100644
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -84,6 +84,7 @@ public:
84 enum FollowModel { 84 enum FollowModel {
85 IGNORE_OTHER_WORKSPACES = 0, ///< who cares? 85 IGNORE_OTHER_WORKSPACES = 0, ///< who cares?
86 FOLLOW_ACTIVE_WINDOW, ///< go to that workspace 86 FOLLOW_ACTIVE_WINDOW, ///< go to that workspace
87 SEMIFOLLOW_ACTIVE_WINDOW, ///< fetch iconified windows, else follow
87 FETCH_ACTIVE_WINDOW ///< put that window to the current workspace 88 FETCH_ACTIVE_WINDOW ///< put that window to the current workspace
88 }; 89 };
89 90
@@ -136,6 +137,7 @@ public:
136 ResizeModel getResizeModel() const { return *resource.resize_model; } 137 ResizeModel getResizeModel() const { return *resource.resize_model; }
137 138
138 inline FollowModel getFollowModel() const { return *resource.follow_model; } 139 inline FollowModel getFollowModel() const { return *resource.follow_model; }
140 inline FollowModel getUserFollowModel() const { return *resource.user_follow_model; }
139 141
140 inline const std::string &getScrollAction() const { return *resource.scroll_action; } 142 inline const std::string &getScrollAction() const { return *resource.scroll_action; }
141 inline const bool getScrollReverse() const { return *resource.scroll_reverse; } 143 inline const bool getScrollReverse() const { return *resource.scroll_reverse; }
@@ -441,7 +443,7 @@ private:
441 FbTk::Resource<ResizeModel> resize_model; 443 FbTk::Resource<ResizeModel> resize_model;
442 FbTk::Resource<FbWinFrame::TabPlacement> tab_placement; 444 FbTk::Resource<FbWinFrame::TabPlacement> tab_placement;
443 FbTk::Resource<std::string> windowmenufile; 445 FbTk::Resource<std::string> windowmenufile;
444 FbTk::Resource<FollowModel> follow_model; 446 FbTk::Resource<FollowModel> follow_model, user_follow_model;
445 bool ordered_dither; 447 bool ordered_dither;
446 FbTk::Resource<int> workspaces, edge_snap_threshold, focused_alpha, 448 FbTk::Resource<int> workspaces, edge_snap_threshold, focused_alpha,
447 unfocused_alpha, menu_alpha, menu_delay, menu_delay_close, tab_width; 449 unfocused_alpha, menu_alpha, menu_delay, menu_delay_close, tab_width;