aboutsummaryrefslogtreecommitdiff
path: root/src/Screen.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/Screen.cc')
-rw-r--r--src/Screen.cc11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index 2bb243f..a50d1ba 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -62,7 +62,7 @@
62#include "CommandParser.hh" 62#include "CommandParser.hh"
63#include "AtomHandler.hh" 63#include "AtomHandler.hh"
64#include "HeadArea.hh" 64#include "HeadArea.hh"
65 65#include "FbCommands.hh"
66 66
67#include "FbTk/I18n.hh" 67#include "FbTk/I18n.hh"
68#include "FbTk/Subject.hh" 68#include "FbTk/Subject.hh"
@@ -430,7 +430,13 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
430 imageControl().installRootColormap(); 430 imageControl().installRootColormap();
431 root_colormap_installed = true; 431 root_colormap_installed = true;
432 432
433 m_root_theme.reset(new RootTheme(*resource.rootcommand, imageControl())); 433 // if user specified background in the config then use it
434 if (!resource.rootcommand->empty()) {
435 FbCommands::ExecuteCmd cmd(*resource.rootcommand, screenNumber());
436 cmd.execute();
437 }
438
439 m_root_theme.reset(new RootTheme(imageControl()));
434 440
435 m_windowtheme->setFocusedAlpha(*resource.focused_alpha); 441 m_windowtheme->setFocusedAlpha(*resource.focused_alpha);
436 m_windowtheme->setUnfocusedAlpha(*resource.unfocused_alpha); 442 m_windowtheme->setUnfocusedAlpha(*resource.unfocused_alpha);
@@ -505,7 +511,6 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
505 // FbTk::ThemeManager::instance().loadTheme(*m_windowtheme.get()); 511 // FbTk::ThemeManager::instance().loadTheme(*m_windowtheme.get());
506 //!! TODO: For some strange reason we must load everything, 512 //!! TODO: For some strange reason we must load everything,
507 // else the focus label doesn't get updated 513 // else the focus label doesn't get updated
508 // So we lock root theme temporary so it doesn't uses RootTheme::reconfigTheme
509 // This must be fixed in the future. 514 // This must be fixed in the future.
510 FbTk::ThemeManager::instance().load(fluxbox->getStyleFilename(), 515 FbTk::ThemeManager::instance().load(fluxbox->getStyleFilename(),
511 fluxbox->getStyleOverlayFilename(), 516 fluxbox->getStyleOverlayFilename(),