aboutsummaryrefslogtreecommitdiff
path: root/src/Screen.cc
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2004-01-02 13:29:01 (GMT)
committerfluxgen <fluxgen>2004-01-02 13:29:01 (GMT)
commit345ef845c94bb4d77ed210e2c7a2c252d3068d59 (patch)
tree48df8829a4a14fc744b901b1b3c30990bd6c4862 /src/Screen.cc
parente9b5ad4e401e8742b0871889476ddc4eeae60b08 (diff)
downloadfluxbox_pavel-345ef845c94bb4d77ed210e2c7a2c252d3068d59.zip
fluxbox_pavel-345ef845c94bb4d77ed210e2c7a2c252d3068d59.tar.bz2
lock roottheme so it doesn't get run twice
Diffstat (limited to 'src/Screen.cc')
-rw-r--r--src/Screen.cc11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index fb4ee34..1e5d94d 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.256 2003/12/31 00:38:40 fluxgen Exp $ 25// $Id: Screen.cc,v 1.257 2004/01/02 13:29:01 fluxgen Exp $
26 26
27 27
28#include "Screen.hh" 28#include "Screen.hh"
@@ -558,7 +558,14 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
558 // we need to load win frame theme before we create any fluxbox window 558 // we need to load win frame theme before we create any fluxbox window
559 // and after we've load the resources 559 // and after we've load the resources
560 // else we get some bad handle/grip height/width 560 // else we get some bad handle/grip height/width
561 FbTk::ThemeManager::instance().loadTheme(*m_windowtheme.get()); 561 // FbTk::ThemeManager::instance().loadTheme(*m_windowtheme.get());
562 //!! TODO: For some strange reason we must load everything,
563 // else the focus label doesn't get updated
564 // So we lock root theme temporary so it doesn't uses RootTheme::reconfigTheme
565 // This must be fixed in the future.
566 m_root_theme->lock(true);
567 FbTk::ThemeManager::instance().load(Fluxbox::instance()->getStyleFilename());
568 m_root_theme->lock(false);
562 569
563 int i; 570 int i;
564 unsigned int nchild; 571 unsigned int nchild;