From 0137dac2d494b772019fda2723dbae5d59c53ae3 Mon Sep 17 00:00:00 2001 From: lack Date: Fri, 1 May 2009 20:24:23 -0400 Subject: Reorder screen init --- src/Screen.cc | 2 +- src/Screen.hh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Screen.cc b/src/Screen.cc index 416b6be..922a9a3 100644 --- a/src/Screen.cc +++ b/src/Screen.cc @@ -322,6 +322,7 @@ BScreen::BScreen(FbTk::ResourceManager &rm, int scrn, int num_layers) : m_reconfigure_sig(*this), // reconfigure signal m_layermanager(num_layers), + m_root_window(scrn), m_focused_windowtheme(new FbWinFrameTheme(scrn, ".focus", ".Focus")), m_unfocused_windowtheme(new FbWinFrameTheme(scrn, ".unfocus", ".Unfocus")), // the order of windowtheme and winbutton theme is important @@ -331,7 +332,6 @@ BScreen::BScreen(FbTk::ResourceManager &rm, m_unfocused_winbutton_theme(new WinButtonTheme(scrn, ".unfocus", ".Unfocus", *m_unfocused_windowtheme)), m_pressed_winbutton_theme(new WinButtonTheme(scrn, ".pressed", ".Pressed", *m_focused_windowtheme)), m_menutheme(new FbTk::MenuTheme(scrn)), - m_root_window(scrn), m_geom_window(new OSDWindow(m_root_window, *this, *m_focused_windowtheme)), m_pos_window(new OSDWindow(m_root_window, *this, *m_focused_windowtheme)), m_tooltip_window(new TooltipWindow(m_root_window, *this, *m_focused_windowtheme)), diff --git a/src/Screen.hh b/src/Screen.hh index 2267d86..06046d6 100644 --- a/src/Screen.hh +++ b/src/Screen.hh @@ -496,6 +496,7 @@ private: ScreenSignal m_workspacenames_sig; ///< workspace names signal FbTk::MultLayers m_layermanager; + FbRootWindow m_root_window; bool root_colormap_installed, managed; @@ -528,7 +529,6 @@ private: std::auto_ptr m_menutheme; std::auto_ptr m_root_theme; - FbRootWindow m_root_window; std::auto_ptr m_geom_window, m_pos_window; std::auto_ptr m_tooltip_window; FbTk::FbWindow m_dummy_window; -- cgit v0.11.2