nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
mathias 2004-12-01 14:45:32 +00:00
parent c11ba21adf
commit 71abcf7343
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/IconButton.cc
View file

@ -76,10 +76,6 @@ public:
void execute() { void execute() {
if(m_win.isIconic() || !m_win.isFocused()) { if(m_win.isIconic() || !m_win.isFocused()) {
switch(m_tool.deiconifyMode()) { switch(m_tool.deiconifyMode()) {
case IconbarTool::FOLLOW:
m_win.screen().changeWorkspaceID(m_win.workspaceNumber());
m_win.raiseAndFocus();
break;
case IconbarTool::SEMIFOLLOW: case IconbarTool::SEMIFOLLOW:
if (m_win.isIconic()) { if (m_win.isIconic()) {
m_win.screen().sendToWorkspace(m_win.screen().currentWorkspaceID(), &m_win); m_win.screen().sendToWorkspace(m_win.screen().currentWorkspaceID(), &m_win);
@ -89,9 +85,13 @@ public:
} }
break; break;
case IconbarTool::CURRENT: case IconbarTool::CURRENT:
default:
m_win.screen().sendToWorkspace(m_win.screen().currentWorkspaceID(), &m_win); m_win.screen().sendToWorkspace(m_win.screen().currentWorkspaceID(), &m_win);
break; break;
case IconbarTool::FOLLOW:
default:
m_win.screen().changeWorkspaceID(m_win.workspaceNumber());
m_win.raiseAndFocus();
break;
}; };
} else } else

6
src/IconbarTool.cc
View file

@ -88,11 +88,11 @@ std::string FbTk::Resource<IconbarTool::DeiconifyMode>::getString() {
case IconbarTool::SEMIFOLLOW: case IconbarTool::SEMIFOLLOW:
return std::string("SemiFollow"); return std::string("SemiFollow");
break; break;
case IconbarTool::FOLLOW: case IconbarTool::CURRENT:
return std::string("Follow"); return std::string("Current");
break; break;
}; };
return std::string("Current"); return std::string("Follow");
} }
template<> template<>