summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--src/Screen.cc18
-rw-r--r--src/Window.cc4
3 files changed, 10 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog
index b6aba3d..269cef2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.0.0: 2Changes for 1.0.0:
3*07/05/12:
4 * Fixed tabs disappearing with [Deco] {TAB} and tabs in titlebar (Mark)
5 Window.cc Screen.cc
3*07/05/04: 6*07/05/04:
4 * Fixed infinite loop caused by deiconify command (Mark) 7 * Fixed infinite loop caused by deiconify command (Mark)
5 FbCommands.cc 8 FbCommands.cc
diff --git a/src/Screen.cc b/src/Screen.cc
index 0075c4b..625e412 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -982,24 +982,14 @@ void BScreen::reconfigureTabs() {
982 if (!(*w_it)->windowList().empty()) { 982 if (!(*w_it)->windowList().empty()) {
983 Workspace::Windows::iterator win_it = (*w_it)->windowList().begin(); 983 Workspace::Windows::iterator win_it = (*w_it)->windowList().begin();
984 const Workspace::Windows::iterator win_it_end = (*w_it)->windowList().end(); 984 const Workspace::Windows::iterator win_it_end = (*w_it)->windowList().end();
985 for (; win_it != win_it_end; ++win_it) { 985 for (; win_it != win_it_end; ++win_it)
986 (*win_it)->frame().updateTabProperties(); 986 (*win_it)->applyDecorations();
987 if (*resource.default_internal_tabs)
988 (*win_it)->frame().setTabMode(FbWinFrame::INTERNAL);
989 else
990 (*win_it)->frame().setTabMode(FbWinFrame::EXTERNAL);
991 }
992 } 987 }
993 } 988 }
994 Icons::iterator icon_it = m_icon_list.begin(); 989 Icons::iterator icon_it = m_icon_list.begin();
995 Icons::iterator icon_it_end = m_icon_list.end(); 990 Icons::iterator icon_it_end = m_icon_list.end();
996 for (; icon_it != icon_it_end; ++icon_it) { 991 for (; icon_it != icon_it_end; ++icon_it)
997 (*icon_it)->frame().updateTabProperties(); 992 (*icon_it)->applyDecorations();
998 if (*resource.default_internal_tabs)
999 (*icon_it)->frame().setTabMode(FbWinFrame::INTERNAL);
1000 else
1001 (*icon_it)->frame().setTabMode(FbWinFrame::EXTERNAL);
1002 }
1003} 993}
1004 994
1005 995
diff --git a/src/Window.cc b/src/Window.cc
index 24fc8df..87d8d15 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -3104,8 +3104,10 @@ void FluxboxWindow::applyDecorations(bool initial) {
3104 if (decorations.titlebar) { 3104 if (decorations.titlebar) {
3105 bool change = frame().showTitlebar(); 3105 bool change = frame().showTitlebar();
3106 client_move |= change; 3106 client_move |= change;
3107 if (change && screen().getDefaultInternalTabs()) { 3107 if (screen().getDefaultInternalTabs()) {
3108 client_move |= frame().setTabMode(FbWinFrame::INTERNAL); 3108 client_move |= frame().setTabMode(FbWinFrame::INTERNAL);
3109 } else {
3110 client_move |= frame().setTabMode(FbWinFrame::EXTERNAL);
3109 } 3111 }
3110 } else { 3112 } else {
3111 client_move |= frame().hideTitlebar(); 3113 client_move |= frame().hideTitlebar();