aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-12-29 01:06:32 (GMT)
committerfluxgen <fluxgen>2003-12-29 01:06:32 (GMT)
commit3c3f805fcdb42fe4c51ea100e33e5f3b796ce3a4 (patch)
tree150696e0ccfe222464e54a39150b7a3888b921dd
parent52869773937f18146f60b617e6c0618bbf40d751 (diff)
downloadfluxbox-3c3f805fcdb42fe4c51ea100e33e5f3b796ce3a4.zip
fluxbox-3c3f805fcdb42fe4c51ea100e33e5f3b796ce3a4.tar.bz2
removed call to ThemeManager load in constructor, we call it load theme later
-rw-r--r--src/Screen.cc13
1 files changed, 2 insertions, 11 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index 634e16a..7b9fa9c 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Screen.cc,v 1.253 2003/12/19 00:34:22 fluxgen Exp $ 25// $Id: Screen.cc,v 1.254 2003/12/29 01:06:32 fluxgen Exp $
26 26
27 27
28#include "Screen.hh" 28#include "Screen.hh"
@@ -445,18 +445,12 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
445 // load this screens resources 445 // load this screens resources
446 fluxbox->load_rc(*this); 446 fluxbox->load_rc(*this);
447 447
448 FbTk::ThemeManager::instance().load(Fluxbox::instance()->getStyleFilename());
449
450 // setup image cache engine 448 // setup image cache engine
451 m_image_control.reset(new FbTk::ImageControl(scrn, true, fluxbox->colorsPerChannel(), 449 m_image_control.reset(new FbTk::ImageControl(scrn, true, fluxbox->colorsPerChannel(),
452 fluxbox->getCacheLife(), fluxbox->getCacheMax())); 450 fluxbox->getCacheLife(), fluxbox->getCacheMax()));
453 imageControl().installRootColormap(); 451 imageControl().installRootColormap();
454 root_colormap_installed = true; 452 root_colormap_installed = true;
455 453
456#ifdef SLIT
457 if (slit()) // this will load theme and reconfigure slit
458 FbTk::ThemeManager::instance().loadTheme(slit()->theme());
459#endif // SLIT
460 454
461 455
462 m_menutheme->setAlpha(*resource.menu_alpha); 456 m_menutheme->setAlpha(*resource.menu_alpha);
@@ -539,10 +533,8 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
539#ifdef SLIT 533#ifdef SLIT
540 m_slit.reset(new Slit(*this, *layerManager().getLayer(Fluxbox::instance()->getDesktopLayer()), 534 m_slit.reset(new Slit(*this, *layerManager().getLayer(Fluxbox::instance()->getDesktopLayer()),
541 Fluxbox::instance()->getSlitlistFilename().c_str())); 535 Fluxbox::instance()->getSlitlistFilename().c_str()));
542
543#endif // SLIT 536#endif // SLIT
544 537
545
546 //!! TODO: we shouldn't do this more than once, but since slit handles their 538 //!! TODO: we shouldn't do this more than once, but since slit handles their
547 // own resources we must do this. 539 // own resources we must do this.
548 fluxbox->load_rc(*this); 540 fluxbox->load_rc(*this);
@@ -753,8 +745,6 @@ void BScreen::reconfigure() {
753 m_menutheme->setDelayOpen(*resource.menu_delay); 745 m_menutheme->setDelayOpen(*resource.menu_delay);
754 m_menutheme->setDelayClose(*resource.menu_delay_close); 746 m_menutheme->setDelayClose(*resource.menu_delay_close);
755 747
756 Fluxbox::instance()->loadRootCommand(*this);
757
758 // setup windowtheme, toolbartheme for antialias 748 // setup windowtheme, toolbartheme for antialias
759 winFrameTheme().font().setAntialias(*resource.antialias); 749 winFrameTheme().font().setAntialias(*resource.antialias);
760 m_menutheme->titleFont().setAntialias(*resource.antialias); 750 m_menutheme->titleFont().setAntialias(*resource.antialias);
@@ -2414,6 +2404,7 @@ WinClient *BScreen::getLastFocusedWindow(int workspace) {
2414} 2404}
2415 2405
2416void BScreen::updateSize() { 2406void BScreen::updateSize() {
2407 cerr<<"update Size"<<endl;
2417 // force update geometry 2408 // force update geometry
2418 rootWindow().updateGeometry(); 2409 rootWindow().updateGeometry();
2419 2410