From b3da022ee22acd67f6ef6210e7412dbfc8fdfa70 Mon Sep 17 00:00:00 2001
From: Mark Tiefenbruck <mark@fluxbox.org>
Date: Tue, 30 Sep 2008 21:04:28 -0700
Subject: reset background on resolution change

---
 ChangeLog        | 2 ++
 src/RootTheme.cc | 2 +-
 src/RootTheme.hh | 1 +
 src/Screen.cc    | 2 +-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 20a6a0b..700e2ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
  (Format: Year/Month/Day)
 Changes for 1.1.2
 *08/10/01:
+   * Reset background when screen changes resolution (Mark)
+     Screen.cc RootTheme.cc/hh
    * Restore missing config files on reconfigure (Mark)
      fluxbox.cc
 *08/09/28:
diff --git a/src/RootTheme.cc b/src/RootTheme.cc
index c09957f..8317a5d 100644
--- a/src/RootTheme.cc
+++ b/src/RootTheme.cc
@@ -181,7 +181,7 @@ void RootTheme::reconfigTheme() {
     if (!m_background->loaded())
         return;
 
-    if (!m_background->changed())
+    if (!m_first && !m_background->changed())
         return;
 
     //
diff --git a/src/RootTheme.hh b/src/RootTheme.hh
index 09c752c..f623ba2 100644
--- a/src/RootTheme.hh
+++ b/src/RootTheme.hh
@@ -44,6 +44,7 @@ public:
 
     bool fallback(FbTk::ThemeItem_base &item);
     void reconfigTheme();
+    void reset() { m_first = true; reconfigTheme(); }
 
     GC opGC() const { return m_opgc.gc(); }
 
diff --git a/src/Screen.cc b/src/Screen.cc
index a4778be..892afda 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -1927,7 +1927,7 @@ void BScreen::updateSize() {
     rootWindow().updateGeometry();
 
     // reset background
-    m_root_theme->reconfigTheme();
+    m_root_theme->reset();
 
     // send resize notify
     m_resize_sig.emit(*this);
-- 
cgit v0.11.2