summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/RootTheme.cc10
-rw-r--r--src/RootTheme.hh3
-rw-r--r--src/Screen.cc2
-rw-r--r--src/Window.hh3
4 files changed, 5 insertions, 13 deletions
diff --git a/src/RootTheme.cc b/src/RootTheme.cc
index 1e54368..5c1e923 100644
--- a/src/RootTheme.cc
+++ b/src/RootTheme.cc
@@ -142,9 +142,8 @@ private:
142}; 142};
143 143
144 144
145RootTheme::RootTheme(FbTk::ImageControl &image_control, BScreen *scrn): 145RootTheme::RootTheme(FbTk::ImageControl &image_control):
146 FbTk::Theme(image_control.screenNumber()), 146 FbTk::Theme(image_control.screenNumber()),
147 m_screen(scrn),
148 m_background(new BackgroundItem(*this, "background", "Background")), 147 m_background(new BackgroundItem(*this, "background", "Background")),
149 m_opgc(RootWindow(FbTk::App::instance()->display(), image_control.screenNumber())), 148 m_opgc(RootWindow(FbTk::App::instance()->display(), image_control.screenNumber())),
150 m_image_ctrl(image_control) { 149 m_image_ctrl(image_control) {
@@ -184,7 +183,7 @@ void RootTheme::reconfigTheme() {
184 return; 183 return;
185 } 184 }
186 185
187 if (!m_background->changed() || !m_screen) 186 if (!m_background->changed())
188 return; 187 return;
189 188
190 // style doesn't wish to change the background 189 // style doesn't wish to change the background
@@ -195,9 +194,6 @@ void RootTheme::reconfigTheme() {
195 // Else parse background from style 194 // Else parse background from style
196 // 195 //
197 196
198 // root window helper
199 FbRootWindow &rootwin = m_screen->rootWindow();
200
201 m_background->setApplied(); 197 m_background->setApplied();
202 198
203 // handle background option in style 199 // handle background option in style
@@ -264,6 +260,4 @@ void RootTheme::reconfigTheme() {
264 exec.execute(); 260 exec.execute();
265 } 261 }
266 262
267 rootwin.clear();
268
269} 263}
diff --git a/src/RootTheme.hh b/src/RootTheme.hh
index 63be8b0..bcff938 100644
--- a/src/RootTheme.hh
+++ b/src/RootTheme.hh
@@ -46,7 +46,7 @@ public:
46 /// constructor 46 /// constructor
47 /// @param resmanager resource manager for finding specific resources 47 /// @param resmanager resource manager for finding specific resources
48 /// @param image_control for rendering background texture 48 /// @param image_control for rendering background texture
49 RootTheme(FbTk::ImageControl &image_control, BScreen *scrn = 0); 49 RootTheme(FbTk::ImageControl &image_control);
50 ~RootTheme(); 50 ~RootTheme();
51 51
52 bool fallback(FbTk::ThemeItem_base &item); 52 bool fallback(FbTk::ThemeItem_base &item);
@@ -62,7 +62,6 @@ public:
62 } 62 }
63 63
64private: 64private:
65 BScreen *m_screen;
66 BackgroundItem *m_background;///< background image/texture 65 BackgroundItem *m_background;///< background image/texture
67 FbTk::GContext m_opgc; 66 FbTk::GContext m_opgc;
68 FbTk::ImageControl &m_image_ctrl; ///< image control for rendering background texture 67 FbTk::ImageControl &m_image_ctrl; ///< image control for rendering background texture
diff --git a/src/Screen.cc b/src/Screen.cc
index 9a3ef31..f399717 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -439,7 +439,7 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
439 cmd.execute(); 439 cmd.execute();
440 } 440 }
441 441
442 m_root_theme.reset(new RootTheme(imageControl(), this)); 442 m_root_theme.reset(new RootTheme(imageControl()));
443 m_root_theme->reconfigTheme(); 443 m_root_theme->reconfigTheme();
444 444
445 m_windowtheme->setFocusedAlpha(*resource.focused_alpha); 445 m_windowtheme->setFocusedAlpha(*resource.focused_alpha);
diff --git a/src/Window.hh b/src/Window.hh
index 4923ca6..1e55fb5 100644
--- a/src/Window.hh
+++ b/src/Window.hh
@@ -198,8 +198,7 @@ public:
198 // map this window 198 // map this window
199 void show(); 199 void show();
200 // unmap this window 200 // unmap this window
201 void hide() { hide(true); } 201 void hide(bool interrupt_moving = true);
202 void hide(bool interrupt_moving);
203 void iconify(); 202 void iconify();
204 void deiconify(bool reassoc = true, bool do_raise = true); 203 void deiconify(bool reassoc = true, bool do_raise = true);
205 204