diff options
author | Mark Tiefenbruck <mark@fluxbox.org> | 2007-12-16 08:50:59 (GMT) |
---|---|---|
committer | Mark Tiefenbruck <mark@fluxbox.org> | 2007-12-16 08:50:59 (GMT) |
commit | 4a7a143713c7febe7d3a7df9c044ed767b8bd3c6 (patch) | |
tree | f4d1f31c5167469f77408d42d6eca83a29d42b4c /src/Screen.cc | |
parent | 8516f1e2a21a374127ccfa3f7b8de2443e67fe33 (diff) | |
download | fluxbox-4a7a143713c7febe7d3a7df9c044ed767b8bd3c6.zip fluxbox-4a7a143713c7febe7d3a7df9c044ed767b8bd3c6.tar.bz2 |
load style before loading theme objects, remove duplicate theme load
Diffstat (limited to 'src/Screen.cc')
-rw-r--r-- | src/Screen.cc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/Screen.cc b/src/Screen.cc index d27f8c4..a74ba0e 100644 --- a/src/Screen.cc +++ b/src/Screen.cc | |||
@@ -525,12 +525,6 @@ BScreen::BScreen(FbTk::ResourceManager &rm, | |||
525 | // and after we've load the resources | 525 | // and after we've load the resources |
526 | // else we get some bad handle/grip height/width | 526 | // else we get some bad handle/grip height/width |
527 | // FbTk::ThemeManager::instance().loadTheme(*m_windowtheme.get()); | 527 | // FbTk::ThemeManager::instance().loadTheme(*m_windowtheme.get()); |
528 | //!! TODO: For some strange reason we must load everything, | ||
529 | // else the focus label doesn't get updated | ||
530 | // This must be fixed in the future. | ||
531 | FbTk::ThemeManager::instance().load(fluxbox->getStyleFilename(), | ||
532 | fluxbox->getStyleOverlayFilename(), | ||
533 | m_root_theme->screenNum()); | ||
534 | m_root_theme->setLineAttributes(*resource.gc_line_width, | 528 | m_root_theme->setLineAttributes(*resource.gc_line_width, |
535 | *resource.gc_line_style, | 529 | *resource.gc_line_style, |
536 | *resource.gc_cap_style, | 530 | *resource.gc_cap_style, |