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

fixed tabs disappearing on reconfigure with [Deco] {TAB} and tabs in titlebar

Browse source
This commit is contained in:
markt 2007-05-12 17:31:34 +00:00
parent b66dde6e94
commit f21186431b
3 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
(Format: Year/Month/Day) (Format: Year/Month/Day)
Changes for 1.0.0: Changes for 1.0.0:
*07/05/12:
* Fixed tabs disappearing with [Deco] {TAB} and tabs in titlebar (Mark)
Window.cc Screen.cc
*07/05/04: *07/05/04:
* Fixed infinite loop caused by deiconify command (Mark) * Fixed infinite loop caused by deiconify command (Mark)
FbCommands.cc FbCommands.cc

18
src/Screen.cc
View file

@ -982,24 +982,14 @@ void BScreen::reconfigureTabs() {
if (!(*w_it)->windowList().empty()) { if (!(*w_it)->windowList().empty()) {
Workspace::Windows::iterator win_it = (*w_it)->windowList().begin(); Workspace::Windows::iterator win_it = (*w_it)->windowList().begin();
const Workspace::Windows::iterator win_it_end = (*w_it)->windowList().end(); const Workspace::Windows::iterator win_it_end = (*w_it)->windowList().end();
for (; win_it != win_it_end; ++win_it) { for (; win_it != win_it_end; ++win_it)
(*win_it)->frame().updateTabProperties(); (*win_it)->applyDecorations();
if (*resource.default_internal_tabs)
(*win_it)->frame().setTabMode(FbWinFrame::INTERNAL);
else
(*win_it)->frame().setTabMode(FbWinFrame::EXTERNAL);
}
} }
} }
Icons::iterator icon_it = m_icon_list.begin(); Icons::iterator icon_it = m_icon_list.begin();
Icons::iterator icon_it_end = m_icon_list.end(); Icons::iterator icon_it_end = m_icon_list.end();
for (; icon_it != icon_it_end; ++icon_it) { for (; icon_it != icon_it_end; ++icon_it)
(*icon_it)->frame().updateTabProperties(); (*icon_it)->applyDecorations();
if (*resource.default_internal_tabs)
(*icon_it)->frame().setTabMode(FbWinFrame::INTERNAL);
else
(*icon_it)->frame().setTabMode(FbWinFrame::EXTERNAL);
}
} }

4
src/Window.cc
View file

@ -3104,8 +3104,10 @@ void FluxboxWindow::applyDecorations(bool initial) {
if (decorations.titlebar) { if (decorations.titlebar) {
bool change = frame().showTitlebar(); bool change = frame().showTitlebar();
client_move |= change; client_move |= change;
if (change && screen().getDefaultInternalTabs()) { if (screen().getDefaultInternalTabs()) {
client_move |= frame().setTabMode(FbWinFrame::INTERNAL); client_move |= frame().setTabMode(FbWinFrame::INTERNAL);
} else {
client_move |= frame().setTabMode(FbWinFrame::EXTERNAL);
} }
} else { } else {
client_move |= frame().hideTitlebar(); client_move |= frame().hideTitlebar();