3 files changed, 7 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 1d9f352..280a5e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
  (Format: Year/Month/Day)
 Changes for 1.0rc2:
+*06/06/26:
+   * Fix FocusHidden (Mark)
+     Window.cc/hh
 *06/06/25:
    * Fix [ 1512046 ] "window.label.unfocus.pixmap" doesn't update (Simon)
      - FbPixmap::copy was keeping the same pixmap if they had same 
diff --git a/src/Window.cc b/src/Window.cc
index 2ac6a01..5fb5d86 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -311,6 +311,7 @@ FluxboxWindow::FluxboxWindow(WinClient &client, FbWinFrameTheme &tm,
     m_toggled_decos(false),
     m_shaped(false),
     m_icon_hidden(false),
+    m_focus_hidden(false),
     m_old_pos_x(0), m_old_pos_y(0),
     m_old_width(1),  m_old_height(1),
     m_last_button_x(0),  m_last_button_y(0),
@@ -2073,6 +2074,7 @@ void FluxboxWindow::moveToLayer(int layernum) {
 }
 
 void FluxboxWindow::setFocusHidden(bool value) {
+    m_focus_hidden = value;
     if (isInitialized())
         m_statesig.notify();
 }
diff --git a/src/Window.hh b/src/Window.hh
index 2b4ef92..5358e54 100644
--- a/src/Window.hh
+++ b/src/Window.hh
@@ -317,7 +317,7 @@ public:
     inline void setMovable(bool movable) { functions.move = movable; }
     inline void setResizable(bool resizable) { functions.resize = resizable; }
 
-    inline bool isFocusHidden() const { return (m_blackbox_attrib.flags & ATTRIB_HIDDEN); }
+    inline bool isFocusHidden() const { return m_focus_hidden; }
     inline bool isIconHidden() const { return m_icon_hidden; }
     inline bool isManaged() const { return m_initialized; }
     inline bool isInitialized() const { return m_initialized; }
@@ -543,6 +543,7 @@ private:
 
     bool m_shaped; ///< if the window is shaped with a mask
     bool m_icon_hidden;  ///< if the window is in the iconbar
+    bool m_focus_hidden; ///< if the window is in the NextWindow list
     int m_old_pos_x, m_old_pos_y; ///< old position so we can restore from maximized
     unsigned int m_old_width, m_old_height; ///< old size so we can restore from maximized state
     int m_last_button_x, ///< last known x position of the mouse button