aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-01-08 00:04:03 (GMT)
committerfluxgen <fluxgen>2002-01-08 00:04:03 (GMT)
commit89c5a1e8fa0d36281b269a05602ed16c3312a095 (patch)
treedc151f35fd5bda9be61623c460c2bd62661cebde
parentb197eab01d1bf3c88c32fb158f0eeed9ca650443 (diff)
downloadfluxbox_pavel-89c5a1e8fa0d36281b269a05602ed16c3312a095.zip
fluxbox_pavel-89c5a1e8fa0d36281b269a05602ed16c3312a095.tar.bz2
Fixed rootcommand for theme
-rw-r--r--src/Screen.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index 6f83536..944821d 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -188,7 +188,8 @@ BScreen::BScreen(Fluxbox *b, int scrn) : ScreenInfo(b, scrn) {
188 188
189 image_control->setDither(resource.image_dither); 189 image_control->setDither(resource.image_dither);
190 theme = new Theme(getBaseDisplay()->getXDisplay(), getRootWindow(), getColormap(), getScreenNumber(), 190 theme = new Theme(getBaseDisplay()->getXDisplay(), getRootWindow(), getColormap(), getScreenNumber(),
191 image_control, fluxbox->getStyleFilename()); 191 image_control, fluxbox->getStyleFilename(), fluxbox->getRootCommand());
192
192#ifdef GNOME 193#ifdef GNOME
193 /* create the GNOME window */ 194 /* create the GNOME window */
194 Window gnome_win = XCreateSimpleWindow(getBaseDisplay()->getXDisplay(), 195 Window gnome_win = XCreateSimpleWindow(getBaseDisplay()->getXDisplay(),
@@ -429,7 +430,10 @@ BScreen::~BScreen(void) {
429} 430}
430 431
431void BScreen::reconfigure(void) { 432void BScreen::reconfigure(void) {
432 433 if (Fluxbox::instance()->getRootCommand())
434 theme->setRootCommand(Fluxbox::instance()->getRootCommand());
435 else
436 theme->setRootCommand("");
433 theme->load(fluxbox->getStyleFilename()); 437 theme->load(fluxbox->getStyleFilename());
434 theme->reconfigure(); 438 theme->reconfigure();
435 I18n *i18n = I18n::instance(); 439 I18n *i18n = I18n::instance();