aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkt <markt>2006-12-31 21:00:46 (GMT)
committermarkt <markt>2006-12-31 21:00:46 (GMT)
commit5ee7d3e72e0cfdd7900eaef3b95c953abbb0bb04 (patch)
treefcd0fa442fbe12d7044923f324a4888c09ffb56e
parent9e10811c0d840df3af770b390dc10002061b47a8 (diff)
downloadfluxbox-5ee7d3e72e0cfdd7900eaef3b95c953abbb0bb04.zip
fluxbox-5ee7d3e72e0cfdd7900eaef3b95c953abbb0bb04.tar.bz2
update window scroll action and direction on reconfigure
-rw-r--r--ChangeLog2
-rw-r--r--src/Window.cc23
2 files changed, 25 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 7579515..8d7b3df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,8 @@ Changes for 1.0rc3:
8 "32-bit" type is actually a "long array" argument (=64bit on 64 systems) 8 "32-bit" type is actually a "long array" argument (=64bit on 64 systems)
9 Ewmh.cc Gnome.cc 9 Ewmh.cc Gnome.cc
10*06/12/31: 10*06/12/31:
11 * Update window scroll action (and direction) on reconfigure (Mark)
12 Window.cc
11 * Update toolbar visibility on reconfigure (Mark) 13 * Update toolbar visibility on reconfigure (Mark)
12 Toolbar.cc 14 Toolbar.cc
13*06/12/28: 15*06/12/28:
diff --git a/src/Window.cc b/src/Window.cc
index 3c2cc02..b341937 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -1199,6 +1199,29 @@ void FluxboxWindow::reconfigure() {
1199 1199
1200 menu().reconfigure(); 1200 menu().reconfigure();
1201 1201
1202 typedef FbTk::RefCount<FbTk::Command> CommandRef;
1203 typedef FbTk::SimpleCommand<FluxboxWindow> WindowCmd;
1204 CommandRef shade_on_cmd(new WindowCmd(*this, &FluxboxWindow::shadeOn));
1205 CommandRef shade_off_cmd(new WindowCmd(*this, &FluxboxWindow::shadeOff));
1206 CommandRef next_tab_cmd(new WindowCmd(*this, &FluxboxWindow::nextClient));
1207 CommandRef prev_tab_cmd(new WindowCmd(*this, &FluxboxWindow::prevClient));
1208 CommandRef null_cmd;
1209
1210 int reverse = 0;
1211 if (screen().getScrollReverse())
1212 reverse = 1;
1213
1214 if (StringUtil::toLower(screen().getScrollAction()) == string("shade")) {
1215 frame().setOnClickTitlebar(shade_on_cmd, 5 - reverse); // shade on mouse roll
1216 frame().setOnClickTitlebar(shade_off_cmd, 4 + reverse); // unshade if rolled oposite direction
1217 } else if (StringUtil::toLower(screen().getScrollAction()) == string("nexttab")) {
1218 frame().setOnClickTitlebar(next_tab_cmd, 5 - reverse); // next tab
1219 frame().setOnClickTitlebar(prev_tab_cmd, 4 + reverse); // previous tab
1220 } else {
1221 frame().setOnClickTitlebar(null_cmd, 4);
1222 frame().setOnClickTitlebar(null_cmd, 5);
1223 }
1224
1202} 1225}
1203 1226
1204/// update current client title and title in our frame 1227/// update current client title and title in our frame