diff options
author | rathnor <rathnor> | 2003-10-31 10:37:09 (GMT) |
---|---|---|
committer | rathnor <rathnor> | 2003-10-31 10:37:09 (GMT) |
commit | b88f9b2a9e6a08cfb663b7177a9c037250d48fea (patch) | |
tree | 6c790fef10cbfdd1eab211572932d7bdf2425d13 /src/Screen.cc | |
parent | d617c5288fe37972b474f86b653e5541553f93de (diff) | |
download | fluxbox-b88f9b2a9e6a08cfb663b7177a9c037250d48fea.zip fluxbox-b88f9b2a9e6a08cfb663b7177a9c037250d48fea.tar.bz2 |
fix a number of positioning and sizing issues
Diffstat (limited to 'src/Screen.cc')
-rw-r--r-- | src/Screen.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Screen.cc b/src/Screen.cc index 34173a3..1aa2e73 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.239 2003/10/28 17:39:59 rathnor Exp $ | 25 | // $Id: Screen.cc,v 1.240 2003/10/31 10:37:09 rathnor Exp $ |
26 | 26 | ||
27 | 27 | ||
28 | #include "Screen.hh" | 28 | #include "Screen.hh" |
@@ -328,17 +328,17 @@ BScreen::BScreen(FbTk::ResourceManager &rm, | |||
328 | rootWindow().setCursor(XCreateFontCursor(disp, XC_left_ptr)); | 328 | rootWindow().setCursor(XCreateFontCursor(disp, XC_left_ptr)); |
329 | 329 | ||
330 | Fluxbox *fluxbox = Fluxbox::instance(); | 330 | Fluxbox *fluxbox = Fluxbox::instance(); |
331 | // load this screens resources | ||
332 | fluxbox->load_rc(*this); | ||
333 | |||
334 | FbTk::ThemeManager::instance().load(Fluxbox::instance()->getStyleFilename()); | ||
335 | |||
331 | // setup image cache engine | 336 | // setup image cache engine |
332 | m_image_control.reset(new FbTk::ImageControl(scrn, true, fluxbox->colorsPerChannel(), | 337 | m_image_control.reset(new FbTk::ImageControl(scrn, true, fluxbox->colorsPerChannel(), |
333 | fluxbox->getCacheLife(), fluxbox->getCacheMax())); | 338 | fluxbox->getCacheLife(), fluxbox->getCacheMax())); |
334 | imageControl().installRootColormap(); | 339 | imageControl().installRootColormap(); |
335 | root_colormap_installed = true; | 340 | root_colormap_installed = true; |
336 | 341 | ||
337 | // load this screens resources | ||
338 | fluxbox->load_rc(*this); | ||
339 | |||
340 | FbTk::ThemeManager::instance().load(Fluxbox::instance()->getStyleFilename()); | ||
341 | |||
342 | #ifdef SLIT | 342 | #ifdef SLIT |
343 | if (slit()) // this will load theme and reconfigure slit | 343 | if (slit()) // this will load theme and reconfigure slit |
344 | FbTk::ThemeManager::instance().loadTheme(slit()->theme()); | 344 | FbTk::ThemeManager::instance().loadTheme(slit()->theme()); |