all repos — fluxbox @ 71abcf734348ee7ae0d40084f2b211dc0d2d963a

custom fork of the fluxbox windowmanager

deiconifyMode: Follow is the new/old default (as it was before deiconifyMode was introduced)
mathias mathias
commit

71abcf734348ee7ae0d40084f2b211dc0d2d963a

parent

c11ba21adf74a5c298d09fbf6d2cdb68a5a2787f

2 files changed, 8 insertions(+), 8 deletions(-)

jump to
M src/IconButton.ccsrc/IconButton.cc

@@ -76,10 +76,6 @@ m_win(win), m_tool(tool) { }

void execute() { if(m_win.isIconic() || !m_win.isFocused()) { switch(m_tool.deiconifyMode()) { - case IconbarTool::FOLLOW: - m_win.screen().changeWorkspaceID(m_win.workspaceNumber()); - m_win.raiseAndFocus(); - break; case IconbarTool::SEMIFOLLOW: if (m_win.isIconic()) { m_win.screen().sendToWorkspace(m_win.screen().currentWorkspaceID(), &m_win);

@@ -89,8 +85,12 @@ m_win.raiseAndFocus();

} break; case IconbarTool::CURRENT: - default: m_win.screen().sendToWorkspace(m_win.screen().currentWorkspaceID(), &m_win); + break; + case IconbarTool::FOLLOW: + default: + m_win.screen().changeWorkspaceID(m_win.workspaceNumber()); + m_win.raiseAndFocus(); break; };
M src/IconbarTool.ccsrc/IconbarTool.cc

@@ -88,11 +88,11 @@ switch (m_value) {

case IconbarTool::SEMIFOLLOW: return std::string("SemiFollow"); break; - case IconbarTool::FOLLOW: - return std::string("Follow"); + case IconbarTool::CURRENT: + return std::string("Current"); break; }; - return std::string("Current"); + return std::string("Follow"); } template<>