aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--src/Window.cc2
-rw-r--r--src/Window.hh3
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 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.0rc2: 2Changes for 1.0rc2:
3*06/06/26:
4 * Fix FocusHidden (Mark)
5 Window.cc/hh
3*06/06/25: 6*06/06/25:
4 * Fix [ 1512046 ] "window.label.unfocus.pixmap" doesn't update (Simon) 7 * Fix [ 1512046 ] "window.label.unfocus.pixmap" doesn't update (Simon)
5 - FbPixmap::copy was keeping the same pixmap if they had same 8 - 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,
311 m_toggled_decos(false), 311 m_toggled_decos(false),
312 m_shaped(false), 312 m_shaped(false),
313 m_icon_hidden(false), 313 m_icon_hidden(false),
314 m_focus_hidden(false),
314 m_old_pos_x(0), m_old_pos_y(0), 315 m_old_pos_x(0), m_old_pos_y(0),
315 m_old_width(1), m_old_height(1), 316 m_old_width(1), m_old_height(1),
316 m_last_button_x(0), m_last_button_y(0), 317 m_last_button_x(0), m_last_button_y(0),
@@ -2073,6 +2074,7 @@ void FluxboxWindow::moveToLayer(int layernum) {
2073} 2074}
2074 2075
2075void FluxboxWindow::setFocusHidden(bool value) { 2076void FluxboxWindow::setFocusHidden(bool value) {
2077 m_focus_hidden = value;
2076 if (isInitialized()) 2078 if (isInitialized())
2077 m_statesig.notify(); 2079 m_statesig.notify();
2078} 2080}
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:
317 inline void setMovable(bool movable) { functions.move = movable; } 317 inline void setMovable(bool movable) { functions.move = movable; }
318 inline void setResizable(bool resizable) { functions.resize = resizable; } 318 inline void setResizable(bool resizable) { functions.resize = resizable; }
319 319
320 inline bool isFocusHidden() const { return (m_blackbox_attrib.flags & ATTRIB_HIDDEN); } 320 inline bool isFocusHidden() const { return m_focus_hidden; }
321 inline bool isIconHidden() const { return m_icon_hidden; } 321 inline bool isIconHidden() const { return m_icon_hidden; }
322 inline bool isManaged() const { return m_initialized; } 322 inline bool isManaged() const { return m_initialized; }
323 inline bool isInitialized() const { return m_initialized; } 323 inline bool isInitialized() const { return m_initialized; }
@@ -543,6 +543,7 @@ private:
543 543
544 bool m_shaped; ///< if the window is shaped with a mask 544 bool m_shaped; ///< if the window is shaped with a mask
545 bool m_icon_hidden; ///< if the window is in the iconbar 545 bool m_icon_hidden; ///< if the window is in the iconbar
546 bool m_focus_hidden; ///< if the window is in the NextWindow list
546 int m_old_pos_x, m_old_pos_y; ///< old position so we can restore from maximized 547 int m_old_pos_x, m_old_pos_y; ///< old position so we can restore from maximized
547 unsigned int m_old_width, m_old_height; ///< old size so we can restore from maximized state 548 unsigned int m_old_width, m_old_height; ///< old size so we can restore from maximized state
548 int m_last_button_x, ///< last known x position of the mouse button 549 int m_last_button_x, ///< last known x position of the mouse button