M src/RootTheme.cc → src/RootTheme.cc

@@ -142,9 +142,8 @@ bool m_changed, m_loaded;
 };
 
 
-RootTheme::RootTheme(FbTk::ImageControl &image_control, BScreen *scrn):
+RootTheme::RootTheme(FbTk::ImageControl &image_control):
     FbTk::Theme(image_control.screenNumber()),
-    m_screen(scrn),
     m_background(new BackgroundItem(*this, "background", "Background")),
     m_opgc(RootWindow(FbTk::App::instance()->display(), image_control.screenNumber())),
     m_image_ctrl(image_control) {
@@ -184,7 +183,7 @@ "Background missing warning")<<endl;
         return;
     }
 
-    if (!m_background->changed() || !m_screen)
+    if (!m_background->changed())
         return;
 
     // style doesn't wish to change the background
@@ -194,9 +193,6 @@ 
     //
     // Else parse background from style 
     //
-
-    // root window helper
-    FbRootWindow &rootwin = m_screen->rootWindow();
 
     m_background->setApplied();
 
@@ -263,7 +259,5 @@ 
         FbCommands::ExecuteCmd exec(commandargs, screenNum());
         exec.execute();
     }
-
-    rootwin.clear();
 
 }

M src/RootTheme.hh → src/RootTheme.hh

@@ -46,7 +46,7 @@ public:
     /// constructor
     /// @param resmanager resource manager for finding specific resources
     /// @param image_control for rendering background texture
-    RootTheme(FbTk::ImageControl &image_control, BScreen *scrn = 0);
+    RootTheme(FbTk::ImageControl &image_control);
     ~RootTheme();
 
     bool fallback(FbTk::ThemeItem_base &item);
@@ -62,7 +62,6 @@ m_opgc.setLineAttributes(width, line_style, cap_style, join_style);
     }
     
 private:
-    BScreen *m_screen;
     BackgroundItem *m_background;///< background image/texture
     FbTk::GContext m_opgc;
     FbTk::ImageControl &m_image_ctrl; ///< image control for rendering background texture

M src/Screen.cc → src/Screen.cc

@@ -439,7 +439,7 @@ FbCommands::ExecuteCmd cmd(*resource.rootcommand, screenNumber());
         cmd.execute();
     }
 
-    m_root_theme.reset(new RootTheme(imageControl(), this));
+    m_root_theme.reset(new RootTheme(imageControl()));
     m_root_theme->reconfigTheme();
 
     m_windowtheme->setFocusedAlpha(*resource.focused_alpha);

M src/Window.hh → src/Window.hh

@@ -198,8 +198,7 @@ void setFocusFlag(bool flag);
     // map this window
     void show();
     // unmap this window
-    void hide() { hide(true); }
-    void hide(bool interrupt_moving);
+    void hide(bool interrupt_moving = true);
     void iconify();
     void deiconify(bool reassoc = true, bool do_raise = true);