aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--src/RootTheme.hh1
-rw-r--r--src/Screen.cc2
3 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index fcb2d7f..8fea633 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.0rc3: 2Changes for 1.0rc3:
3*06/07/25:
4 * Fix background style item so that it works when the previous style
5 didn't have one set (Mark)
6 Screen.cc RootTheme.hh
3*06/07/23: 7*06/07/23:
4 * Use a timer to make sure focus always reverts if possible (Mark) 8 * Use a timer to make sure focus always reverts if possible (Mark)
5 fluxbox.cc/hh and reverse patch from 06/07/20 9 fluxbox.cc/hh and reverse patch from 06/07/20
diff --git a/src/RootTheme.hh b/src/RootTheme.hh
index 8bd2841..9b45d60 100644
--- a/src/RootTheme.hh
+++ b/src/RootTheme.hh
@@ -51,6 +51,7 @@ public:
51 51
52 bool fallback(FbTk::ThemeItem_base &item); 52 bool fallback(FbTk::ThemeItem_base &item);
53 void reconfigTheme(); 53 void reconfigTheme();
54 void setLoaded() { m_background_loaded = true; }
54 55
55 GC opGC() const { return m_opgc.gc(); } 56 GC opGC() const { return m_opgc.gc(); }
56 57
diff --git a/src/Screen.cc b/src/Screen.cc
index 0d8937e..7924984 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -884,6 +884,8 @@ void BScreen::reconfigure() {
884 // notify objects that the screen is reconfigured 884 // notify objects that the screen is reconfigured
885 m_reconfigure_sig.notify(); 885 m_reconfigure_sig.notify();
886 886
887 m_root_theme->setLoaded();
888
887 // Reload style 889 // Reload style
888 FbTk::ThemeManager::instance().load(fluxbox->getStyleFilename(), 890 FbTk::ThemeManager::instance().load(fluxbox->getStyleFilename(),
889 fluxbox->getStyleOverlayFilename(), 891 fluxbox->getStyleOverlayFilename(),