aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Tiefenbruck <mark@fluxbox.org>2008-10-01 04:04:28 (GMT)
committerMark Tiefenbruck <mark@fluxbox.org>2008-10-01 04:04:28 (GMT)
commitb3da022ee22acd67f6ef6210e7412dbfc8fdfa70 (patch)
treeafa281a3a12c19f42bc4cde08fe37ef7840de7d5
parent6e9d8e2dc6607e394e372dcedfdbc0e869656da5 (diff)
downloadfluxbox_pavel-b3da022ee22acd67f6ef6210e7412dbfc8fdfa70.zip
fluxbox_pavel-b3da022ee22acd67f6ef6210e7412dbfc8fdfa70.tar.bz2
reset background on resolution change
-rw-r--r--ChangeLog2
-rw-r--r--src/RootTheme.cc2
-rw-r--r--src/RootTheme.hh1
-rw-r--r--src/Screen.cc2
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 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.1.2 2Changes for 1.1.2
3*08/10/01: 3*08/10/01:
4 * Reset background when screen changes resolution (Mark)
5 Screen.cc RootTheme.cc/hh
4 * Restore missing config files on reconfigure (Mark) 6 * Restore missing config files on reconfigure (Mark)
5 fluxbox.cc 7 fluxbox.cc
6*08/09/28: 8*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() {
181 if (!m_background->loaded()) 181 if (!m_background->loaded())
182 return; 182 return;
183 183
184 if (!m_background->changed()) 184 if (!m_first && !m_background->changed())
185 return; 185 return;
186 186
187 // 187 //
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:
44 44
45 bool fallback(FbTk::ThemeItem_base &item); 45 bool fallback(FbTk::ThemeItem_base &item);
46 void reconfigTheme(); 46 void reconfigTheme();
47 void reset() { m_first = true; reconfigTheme(); }
47 48
48 GC opGC() const { return m_opgc.gc(); } 49 GC opGC() const { return m_opgc.gc(); }
49 50
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() {
1927 rootWindow().updateGeometry(); 1927 rootWindow().updateGeometry();
1928 1928
1929 // reset background 1929 // reset background
1930 m_root_theme->reconfigTheme(); 1930 m_root_theme->reset();
1931 1931
1932 // send resize notify 1932 // send resize notify
1933 m_resize_sig.emit(*this); 1933 m_resize_sig.emit(*this);