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 @@
  (Format: Year/Month/Day)
 Changes for 1.1
+*08/08/22:
+   * Remove borders from maximized windows (Mark)
+     FbWinFrame.cc
+   * Add -sync command line option for debugging X issues (Mark)
+     fluxbox.cc/hh main.cc
 *08/08/21:
    * Added SendToNextHead and SendToPrevHead commands (Mark)
      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) {
 }
 
 bool FbWinFrame::useBorder() const {
-    return !m_state.fullscreen && m_state.deco_mask & DECORM_BORDER;
+    return !m_state.fullscreen && m_state.maximized != MAX_FULL &&
+           (m_state.deco_mask & DECORM_BORDER);
 }
 
 bool FbWinFrame::useTabs() const {