diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/Screen.cc | 18 | ||||
-rw-r--r-- | src/Window.cc | 4 |
2 files changed, 7 insertions, 15 deletions
diff --git a/src/Screen.cc b/src/Screen.cc index 7bcd938..786daa1 100644 --- a/src/Screen.cc +++ b/src/Screen.cc | |||
@@ -1046,24 +1046,14 @@ void BScreen::reconfigureTabs() { | |||
1046 | if (!(*w_it)->windowList().empty()) { | 1046 | if (!(*w_it)->windowList().empty()) { |
1047 | Workspace::Windows::iterator win_it = (*w_it)->windowList().begin(); | 1047 | Workspace::Windows::iterator win_it = (*w_it)->windowList().begin(); |
1048 | const Workspace::Windows::iterator win_it_end = (*w_it)->windowList().end(); | 1048 | const Workspace::Windows::iterator win_it_end = (*w_it)->windowList().end(); |
1049 | for (; win_it != win_it_end; ++win_it) { | 1049 | for (; win_it != win_it_end; ++win_it) |
1050 | (*win_it)->frame().updateTabProperties(); | 1050 | (*win_it)->applyDecorations(); |
1051 | if (*resource.default_internal_tabs) | ||
1052 | (*win_it)->frame().setTabMode(FbWinFrame::INTERNAL); | ||
1053 | else | ||
1054 | (*win_it)->frame().setTabMode(FbWinFrame::EXTERNAL); | ||
1055 | } | ||
1056 | } | 1051 | } |
1057 | } | 1052 | } |
1058 | Icons::iterator icon_it = m_icon_list.begin(); | 1053 | Icons::iterator icon_it = m_icon_list.begin(); |
1059 | Icons::iterator icon_it_end = m_icon_list.end(); | 1054 | Icons::iterator icon_it_end = m_icon_list.end(); |
1060 | for (; icon_it != icon_it_end; ++icon_it) { | 1055 | for (; icon_it != icon_it_end; ++icon_it) |
1061 | (*icon_it)->frame().updateTabProperties(); | 1056 | (*icon_it)->applyDecorations(); |
1062 | if (*resource.default_internal_tabs) | ||
1063 | (*icon_it)->frame().setTabMode(FbWinFrame::INTERNAL); | ||
1064 | else | ||
1065 | (*icon_it)->frame().setTabMode(FbWinFrame::EXTERNAL); | ||
1066 | } | ||
1067 | } | 1057 | } |
1068 | 1058 | ||
1069 | 1059 | ||
diff --git a/src/Window.cc b/src/Window.cc index cbbf7a4..a3999e3 100644 --- a/src/Window.cc +++ b/src/Window.cc | |||
@@ -3122,8 +3122,10 @@ void FluxboxWindow::applyDecorations(bool initial) { | |||
3122 | if (decorations.titlebar) { | 3122 | if (decorations.titlebar) { |
3123 | bool change = frame().showTitlebar(); | 3123 | bool change = frame().showTitlebar(); |
3124 | client_move |= change; | 3124 | client_move |= change; |
3125 | if (change && screen().getDefaultInternalTabs()) { | 3125 | if (screen().getDefaultInternalTabs()) { |
3126 | client_move |= frame().setTabMode(FbWinFrame::INTERNAL); | 3126 | client_move |= frame().setTabMode(FbWinFrame::INTERNAL); |
3127 | } else { | ||
3128 | client_move |= frame().setTabMode(FbWinFrame::EXTERNAL); | ||
3127 | } | 3129 | } |
3128 | } else { | 3130 | } else { |
3129 | client_move |= frame().hideTitlebar(); | 3131 | client_move |= frame().hideTitlebar(); |