aboutsummaryrefslogtreecommitdiff
path: root/src/Screen.cc
diff options
context:
space:
mode:
authormathias <mathias>2005-11-16 22:08:05 (GMT)
committermathias <mathias>2005-11-16 22:08:05 (GMT)
commit28837ee6e1e3226bec37a7854bd36c45406058f6 (patch)
treeb86d4fe57ec4b637d0480be8f9ce16c2dacb179e /src/Screen.cc
parent6403deb65e7ce00c94d22c4b6893437a6cafe481 (diff)
downloadfluxbox-28837ee6e1e3226bec37a7854bd36c45406058f6.zip
fluxbox-28837ee6e1e3226bec37a7854bd36c45406058f6.tar.bz2
introduced session.styleOverlay (~/.fluxbox/overlay), all style settings
made in that file will override/overlay the ones made in the used style. TODO: write more specific docu about it
Diffstat (limited to 'src/Screen.cc')
-rw-r--r--src/Screen.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index 80c382f..c7fe1d3 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -358,6 +358,7 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
358 // This must be fixed in the future. 358 // This must be fixed in the future.
359 m_root_theme->lock(true); 359 m_root_theme->lock(true);
360 FbTk::ThemeManager::instance().load(fluxbox->getStyleFilename(), 360 FbTk::ThemeManager::instance().load(fluxbox->getStyleFilename(),
361 fluxbox->getStyleOverlayFilename(),
361 m_root_theme->screenNum()); 362 m_root_theme->screenNum());
362 m_root_theme->lock(false); 363 m_root_theme->lock(false);
363 m_root_theme->setLineAttributes(*resource.gc_line_width, 364 m_root_theme->setLineAttributes(*resource.gc_line_width,
@@ -789,6 +790,7 @@ void BScreen::reconfigure() {
789 790
790 // Reload style 791 // Reload style
791 FbTk::ThemeManager::instance().load(fluxbox->getStyleFilename(), 792 FbTk::ThemeManager::instance().load(fluxbox->getStyleFilename(),
793 fluxbox->getStyleOverlayFilename(),
792 m_root_theme->screenNum()); 794 m_root_theme->screenNum());
793} 795}
794 796