deiconifyMode: Follow is the new/old default (as it was before deiconifyMode was introduced)
This commit is contained in:
parent
c11ba21adf
commit
71abcf7343
2 changed files with 8 additions and 8 deletions
|
@ -76,10 +76,6 @@ public:
|
|||
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,9 +85,13 @@ public:
|
|||
}
|
||||
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;
|
||||
};
|
||||
|
||||
} else
|
||||
|
|
|
@ -88,11 +88,11 @@ std::string FbTk::Resource<IconbarTool::DeiconifyMode>::getString() {
|
|||
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<>
|
||||
|
|
Loading…
Reference in a new issue