diff options
author | fluxgen <fluxgen> | 2003-12-31 00:38:40 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2003-12-31 00:38:40 (GMT) |
commit | b2ba9c135591cce3fd28c23cbac2b0dc153ca242 (patch) | |
tree | 144093d506d841b92f4bbd34795bd9ddada93e2c /src | |
parent | 3ecca36129ae9ab0e7a0d80e074b483ef81fa505 (diff) | |
download | fluxbox-b2ba9c135591cce3fd28c23cbac2b0dc153ca242.zip fluxbox-b2ba9c135591cce3fd28c23cbac2b0dc153ca242.tar.bz2 |
minor fix for theme loading on start
Diffstat (limited to 'src')
-rw-r--r-- | src/Screen.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/Screen.cc b/src/Screen.cc index 9936c14..fb4ee34 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.255 2003/12/29 01:23:04 fluxgen Exp $ | 25 | // $Id: Screen.cc,v 1.256 2003/12/31 00:38:40 fluxgen Exp $ |
26 | 26 | ||
27 | 27 | ||
28 | #include "Screen.hh" | 28 | #include "Screen.hh" |
@@ -410,9 +410,6 @@ BScreen::BScreen(FbTk::ResourceManager &rm, | |||
410 | m_xinerama_headinfo(0), | 410 | m_xinerama_headinfo(0), |
411 | m_shutdown(false) { | 411 | m_shutdown(false) { |
412 | 412 | ||
413 | // we need to load win frame theme before we create any fluxbox window | ||
414 | // else we get some bad handle/grip height/width | ||
415 | FbTk::ThemeManager::instance().loadTheme(*m_windowtheme.get()); | ||
416 | 413 | ||
417 | Display *disp = FbTk::App::instance()->display(); | 414 | Display *disp = FbTk::App::instance()->display(); |
418 | 415 | ||
@@ -557,7 +554,12 @@ BScreen::BScreen(FbTk::ResourceManager &rm, | |||
557 | // start with workspace 0 | 554 | // start with workspace 0 |
558 | changeWorkspaceID(0); | 555 | changeWorkspaceID(0); |
559 | updateNetizenWorkspaceCount(); | 556 | updateNetizenWorkspaceCount(); |
560 | 557 | ||
558 | // we need to load win frame theme before we create any fluxbox window | ||
559 | // and after we've load the resources | ||
560 | // else we get some bad handle/grip height/width | ||
561 | FbTk::ThemeManager::instance().loadTheme(*m_windowtheme.get()); | ||
562 | |||
561 | int i; | 563 | int i; |
562 | unsigned int nchild; | 564 | unsigned int nchild; |
563 | Window r, p, *children; | 565 | Window r, p, *children; |