aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormathias <mathias>2004-12-01 14:45:32 (GMT)
committermathias <mathias>2004-12-01 14:45:32 (GMT)
commit71abcf734348ee7ae0d40084f2b211dc0d2d963a (patch)
tree24ce274033a1cd6adbcd9b0b20bf2e3d06916d50
parentc11ba21adf74a5c298d09fbf6d2cdb68a5a2787f (diff)
downloadfluxbox-71abcf734348ee7ae0d40084f2b211dc0d2d963a.zip
fluxbox-71abcf734348ee7ae0d40084f2b211dc0d2d963a.tar.bz2
deiconifyMode: Follow is the new/old default (as it was before deiconifyMode was introduced)
-rw-r--r--src/IconButton.cc10
-rw-r--r--src/IconbarTool.cc6
2 files changed, 8 insertions, 8 deletions
diff --git a/src/IconButton.cc b/src/IconButton.cc
index 0ed516d..459b4be 100644
--- a/src/IconButton.cc
+++ b/src/IconButton.cc
@@ -76,10 +76,6 @@ public:
76 void execute() { 76 void execute() {
77 if(m_win.isIconic() || !m_win.isFocused()) { 77 if(m_win.isIconic() || !m_win.isFocused()) {
78 switch(m_tool.deiconifyMode()) { 78 switch(m_tool.deiconifyMode()) {
79 case IconbarTool::FOLLOW:
80 m_win.screen().changeWorkspaceID(m_win.workspaceNumber());
81 m_win.raiseAndFocus();
82 break;
83 case IconbarTool::SEMIFOLLOW: 79 case IconbarTool::SEMIFOLLOW:
84 if (m_win.isIconic()) { 80 if (m_win.isIconic()) {
85 m_win.screen().sendToWorkspace(m_win.screen().currentWorkspaceID(), &m_win); 81 m_win.screen().sendToWorkspace(m_win.screen().currentWorkspaceID(), &m_win);
@@ -89,9 +85,13 @@ public:
89 } 85 }
90 break; 86 break;
91 case IconbarTool::CURRENT: 87 case IconbarTool::CURRENT:
92 default:
93 m_win.screen().sendToWorkspace(m_win.screen().currentWorkspaceID(), &m_win); 88 m_win.screen().sendToWorkspace(m_win.screen().currentWorkspaceID(), &m_win);
94 break; 89 break;
90 case IconbarTool::FOLLOW:
91 default:
92 m_win.screen().changeWorkspaceID(m_win.workspaceNumber());
93 m_win.raiseAndFocus();
94 break;
95 }; 95 };
96 96
97 } else 97 } else
diff --git a/src/IconbarTool.cc b/src/IconbarTool.cc
index 6aff9b8..83ff8af 100644
--- a/src/IconbarTool.cc
+++ b/src/IconbarTool.cc
@@ -88,11 +88,11 @@ std::string FbTk::Resource<IconbarTool::DeiconifyMode>::getString() {
88 case IconbarTool::SEMIFOLLOW: 88 case IconbarTool::SEMIFOLLOW:
89 return std::string("SemiFollow"); 89 return std::string("SemiFollow");
90 break; 90 break;
91 case IconbarTool::FOLLOW: 91 case IconbarTool::CURRENT:
92 return std::string("Follow"); 92 return std::string("Current");
93 break; 93 break;
94 }; 94 };
95 return std::string("Current"); 95 return std::string("Follow");
96} 96}
97 97
98template<> 98template<>