fixed tabs disappearing on reconfigure with [Deco] {TAB} and tabs in titlebar
markt markt
3 files changed,
10 insertions(+),
15 deletions(-)
M
src/Screen.cc
→
src/Screen.cc
@@ -982,24 +982,14 @@ for (; w_it != w_it_end; ++w_it) {
if (!(*w_it)->windowList().empty()) { Workspace::Windows::iterator win_it = (*w_it)->windowList().begin(); const Workspace::Windows::iterator win_it_end = (*w_it)->windowList().end(); - for (; win_it != win_it_end; ++win_it) { - (*win_it)->frame().updateTabProperties(); - if (*resource.default_internal_tabs) - (*win_it)->frame().setTabMode(FbWinFrame::INTERNAL); - else - (*win_it)->frame().setTabMode(FbWinFrame::EXTERNAL); - } + for (; win_it != win_it_end; ++win_it) + (*win_it)->applyDecorations(); } } Icons::iterator icon_it = m_icon_list.begin(); Icons::iterator icon_it_end = m_icon_list.end(); - for (; icon_it != icon_it_end; ++icon_it) { - (*icon_it)->frame().updateTabProperties(); - if (*resource.default_internal_tabs) - (*icon_it)->frame().setTabMode(FbWinFrame::INTERNAL); - else - (*icon_it)->frame().setTabMode(FbWinFrame::EXTERNAL); - } + for (; icon_it != icon_it_end; ++icon_it) + (*icon_it)->applyDecorations(); }
M
src/Window.cc
→
src/Window.cc
@@ -3104,8 +3104,10 @@ // we rely on frame not doing anything if it is already shown/hidden
if (decorations.titlebar) { bool change = frame().showTitlebar(); client_move |= change; - if (change && screen().getDefaultInternalTabs()) { + if (screen().getDefaultInternalTabs()) { client_move |= frame().setTabMode(FbWinFrame::INTERNAL); + } else { + client_move |= frame().setTabMode(FbWinFrame::EXTERNAL); } } else { client_move |= frame().hideTitlebar();