summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--src/FbWinFrame.cc3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c3882f4..782b8f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.1 2Changes for 1.1
3*08/08/22:
4 * Remove borders from maximized windows (Mark)
5 FbWinFrame.cc
6 * Add -sync command line option for debugging X issues (Mark)
7 fluxbox.cc/hh main.cc
3*08/08/21: 8*08/08/21:
4 * Added SendToNextHead and SendToPrevHead commands (Mark) 9 * Added SendToNextHead and SendToPrevHead commands (Mark)
5 CurrentWindowCmd.cc/hh 10 CurrentWindowCmd.cc/hh
diff --git a/src/FbWinFrame.cc b/src/FbWinFrame.cc
index 03f7420..f6f591e 100644
--- a/src/FbWinFrame.cc
+++ b/src/FbWinFrame.cc
@@ -1503,7 +1503,8 @@ int FbWinFrame::getDecoMaskFromString(const string &str_label) {
1503} 1503}
1504 1504
1505bool FbWinFrame::useBorder() const { 1505bool FbWinFrame::useBorder() const {
1506 return !m_state.fullscreen && m_state.deco_mask & DECORM_BORDER; 1506 return !m_state.fullscreen && m_state.maximized != MAX_FULL &&
1507 (m_state.deco_mask & DECORM_BORDER);
1507} 1508}
1508 1509
1509bool FbWinFrame::useTabs() const { 1510bool FbWinFrame::useTabs() const {