summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlack <lack@cygnus.(none)>2009-05-02 00:24:23 (GMT)
committerlack <lack@cygnus.(none)>2009-05-02 00:24:23 (GMT)
commit0137dac2d494b772019fda2723dbae5d59c53ae3 (patch)
treef191cb9464602f058c66c3863268f36cb873678b
parent8c7f2ea10eadb76de4eb42d1b4c841171539db17 (diff)
downloadfluxbox_lack-work-in-progress/argb1.zip
fluxbox_lack-work-in-progress/argb1.tar.bz2
Reorder screen initwork-in-progress/argb1
-rw-r--r--src/Screen.cc2
-rw-r--r--src/Screen.hh2
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,
322 int scrn, int num_layers) : 322 int scrn, int num_layers) :
323 m_reconfigure_sig(*this), // reconfigure signal 323 m_reconfigure_sig(*this), // reconfigure signal
324 m_layermanager(num_layers), 324 m_layermanager(num_layers),
325 m_root_window(scrn),
325 m_focused_windowtheme(new FbWinFrameTheme(scrn, ".focus", ".Focus")), 326 m_focused_windowtheme(new FbWinFrameTheme(scrn, ".focus", ".Focus")),
326 m_unfocused_windowtheme(new FbWinFrameTheme(scrn, ".unfocus", ".Unfocus")), 327 m_unfocused_windowtheme(new FbWinFrameTheme(scrn, ".unfocus", ".Unfocus")),
327 // the order of windowtheme and winbutton theme is important 328 // the order of windowtheme and winbutton theme is important
@@ -331,7 +332,6 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
331 m_unfocused_winbutton_theme(new WinButtonTheme(scrn, ".unfocus", ".Unfocus", *m_unfocused_windowtheme)), 332 m_unfocused_winbutton_theme(new WinButtonTheme(scrn, ".unfocus", ".Unfocus", *m_unfocused_windowtheme)),
332 m_pressed_winbutton_theme(new WinButtonTheme(scrn, ".pressed", ".Pressed", *m_focused_windowtheme)), 333 m_pressed_winbutton_theme(new WinButtonTheme(scrn, ".pressed", ".Pressed", *m_focused_windowtheme)),
333 m_menutheme(new FbTk::MenuTheme(scrn)), 334 m_menutheme(new FbTk::MenuTheme(scrn)),
334 m_root_window(scrn),
335 m_geom_window(new OSDWindow(m_root_window, *this, *m_focused_windowtheme)), 335 m_geom_window(new OSDWindow(m_root_window, *this, *m_focused_windowtheme)),
336 m_pos_window(new OSDWindow(m_root_window, *this, *m_focused_windowtheme)), 336 m_pos_window(new OSDWindow(m_root_window, *this, *m_focused_windowtheme)),
337 m_tooltip_window(new TooltipWindow(m_root_window, *this, *m_focused_windowtheme)), 337 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:
496 ScreenSignal m_workspacenames_sig; ///< workspace names signal 496 ScreenSignal m_workspacenames_sig; ///< workspace names signal
497 497
498 FbTk::MultLayers m_layermanager; 498 FbTk::MultLayers m_layermanager;
499 FbRootWindow m_root_window;
499 500
500 bool root_colormap_installed, managed; 501 bool root_colormap_installed, managed;
501 502
@@ -528,7 +529,6 @@ private:
528 std::auto_ptr<FbTk::MenuTheme> m_menutheme; 529 std::auto_ptr<FbTk::MenuTheme> m_menutheme;
529 std::auto_ptr<RootTheme> m_root_theme; 530 std::auto_ptr<RootTheme> m_root_theme;
530 531
531 FbRootWindow m_root_window;
532 std::auto_ptr<OSDWindow> m_geom_window, m_pos_window; 532 std::auto_ptr<OSDWindow> m_geom_window, m_pos_window;
533 std::auto_ptr<TooltipWindow> m_tooltip_window; 533 std::auto_ptr<TooltipWindow> m_tooltip_window;
534 FbTk::FbWindow m_dummy_window; 534 FbTk::FbWindow m_dummy_window;