nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

removed call to ThemeManager load in constructor, we call it load theme later

Browse source
This commit is contained in:
fluxgen 2003-12-29 01:06:32 +00:00
parent 5286977393
commit 3c3f805fcd
1 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/Screen.cc
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Screen.cc,v 1.253 2003/12/19 00:34:22 fluxgen Exp $ // $Id: Screen.cc,v 1.254 2003/12/29 01:06:32 fluxgen Exp $
#include "Screen.hh" #include "Screen.hh"
@ -445,18 +445,12 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
// load this screens resources // load this screens resources
fluxbox->load_rc(*this); fluxbox->load_rc(*this);
FbTk::ThemeManager::instance().load(Fluxbox::instance()->getStyleFilename());
// setup image cache engine // setup image cache engine
m_image_control.reset(new FbTk::ImageControl(scrn, true, fluxbox->colorsPerChannel(), m_image_control.reset(new FbTk::ImageControl(scrn, true, fluxbox->colorsPerChannel(),
fluxbox->getCacheLife(), fluxbox->getCacheMax())); fluxbox->getCacheLife(), fluxbox->getCacheMax()));
imageControl().installRootColormap(); imageControl().installRootColormap();
root_colormap_installed = true; root_colormap_installed = true;
#ifdef SLIT
if (slit()) // this will load theme and reconfigure slit
FbTk::ThemeManager::instance().loadTheme(slit()->theme());
#endif // SLIT
m_menutheme->setAlpha(*resource.menu_alpha); m_menutheme->setAlpha(*resource.menu_alpha);
@ -539,10 +533,8 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
#ifdef SLIT #ifdef SLIT
m_slit.reset(new Slit(*this, *layerManager().getLayer(Fluxbox::instance()->getDesktopLayer()), m_slit.reset(new Slit(*this, *layerManager().getLayer(Fluxbox::instance()->getDesktopLayer()),
Fluxbox::instance()->getSlitlistFilename().c_str())); Fluxbox::instance()->getSlitlistFilename().c_str()));
#endif // SLIT #endif // SLIT
//!! TODO: we shouldn't do this more than once, but since slit handles their //!! TODO: we shouldn't do this more than once, but since slit handles their
// own resources we must do this. // own resources we must do this.
fluxbox->load_rc(*this); fluxbox->load_rc(*this);
@ -753,8 +745,6 @@ void BScreen::reconfigure() {
m_menutheme->setDelayOpen(*resource.menu_delay); m_menutheme->setDelayOpen(*resource.menu_delay);
m_menutheme->setDelayClose(*resource.menu_delay_close); m_menutheme->setDelayClose(*resource.menu_delay_close);
Fluxbox::instance()->loadRootCommand(*this);
// setup windowtheme, toolbartheme for antialias // setup windowtheme, toolbartheme for antialias
winFrameTheme().font().setAntialias(*resource.antialias); winFrameTheme().font().setAntialias(*resource.antialias);
m_menutheme->titleFont().setAntialias(*resource.antialias); m_menutheme->titleFont().setAntialias(*resource.antialias);
@ -2414,6 +2404,7 @@ WinClient *BScreen::getLastFocusedWindow(int workspace) {
} }
void BScreen::updateSize() { void BScreen::updateSize() {
cerr<<"update Size"<<endl;
// force update geometry // force update geometry
rootWindow().updateGeometry(); rootWindow().updateGeometry();