diff options
author | markt <markt> | 2006-07-25 07:20:58 (GMT) |
---|---|---|
committer | markt <markt> | 2006-07-25 07:20:58 (GMT) |
commit | 887fea4510e5834197bb70101393fb640a66899a (patch) | |
tree | a9b56ca765d1fa7eb8d5af546e2773353cf62231 | |
parent | 538b630ff217433e6c327980e693d68854010305 (diff) | |
download | fluxbox-887fea4510e5834197bb70101393fb640a66899a.zip fluxbox-887fea4510e5834197bb70101393fb640a66899a.tar.bz2 |
fix m_background_loaded
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | src/RootTheme.hh | 1 | ||||
-rw-r--r-- | src/Screen.cc | 2 |
3 files changed, 7 insertions, 0 deletions
@@ -1,5 +1,9 @@ | |||
1 | (Format: Year/Month/Day) | 1 | (Format: Year/Month/Day) |
2 | Changes for 1.0rc3: | 2 | Changes 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(), |