summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Screen.cc3
-rw-r--r--src/Window.cc1
2 files changed, 0 insertions, 4 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index 2a4ea9b..b676a8b 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -1764,9 +1764,6 @@ void BScreen::setupConfigmenu(FbTk::Menu &menu) {
1764 "Workspace Warping", 1764 "Workspace Warping",
1765 "Workspace Warping - dragging windows to the edge and onto the next workspace", 1765 "Workspace Warping - dragging windows to the edge and onto the next workspace",
1766 *resource.workspace_warping, saverc_cmd); 1766 *resource.workspace_warping, saverc_cmd);
1767 _BOOLITEM(menu, Configmenu, DesktopWheeling,
1768 "Desktop MouseWheel Switching", "Workspace switching using mouse wheel",
1769 *resource.desktop_wheeling, saverc_cmd);
1770 _BOOLITEM(menu, Configmenu, DecorateTransient, 1767 _BOOLITEM(menu, Configmenu, DecorateTransient,
1771 "Decorate Transient Windows", "Decorate Transient Windows", 1768 "Decorate Transient Windows", "Decorate Transient Windows",
1772 *resource.decorate_transient, saverc_cmd); 1769 *resource.decorate_transient, saverc_cmd);
diff --git a/src/Window.cc b/src/Window.cc
index 0deecd2..36bd271 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -596,7 +596,6 @@ void FluxboxWindow::attachClient(WinClient &client, int x, int y) {
596 // figure out which client to raise at the end 596 // figure out which client to raise at the end
597 if (FocusControl::focusedFbWindow() == old_win) { 597 if (FocusControl::focusedFbWindow() == old_win) {
598 was_focused = true; 598 was_focused = true;
599 focused_win = FocusControl::focusedWindow();
600 } else if (FocusControl::focusedFbWindow() != this) { 599 } else if (FocusControl::focusedFbWindow() != this) {
601 FocusControl::FocusedWindows focus_list = 600 FocusControl::FocusedWindows focus_list =
602 screen().focusControl().focusedOrderList(); 601 screen().focusControl().focusedOrderList();