diff options
author | Mark Tiefenbruck <mark@fluxbox.org> | 2008-10-05 02:08:50 (GMT) |
---|---|---|
committer | Mark Tiefenbruck <mark@fluxbox.org> | 2008-10-05 02:08:50 (GMT) |
commit | e1eb5e225b316a55aaab34547c20ad8c67168c3e (patch) | |
tree | f90d406c98c745e43bcdca9d73cdc1a8c702615f /src/Screen.cc | |
parent | ab25696328c49b7551ea242b740ff9c79953f722 (diff) | |
download | fluxbox_pavel-e1eb5e225b316a55aaab34547c20ad8c67168c3e.zip fluxbox_pavel-e1eb5e225b316a55aaab34547c20ad8c67168c3e.tar.bz2 |
remove line style resources from init file
Diffstat (limited to 'src/Screen.cc')
-rw-r--r-- | src/Screen.cc | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/src/Screen.cc b/src/Screen.cc index 2a89bad..2c54d5d 100644 --- a/src/Screen.cc +++ b/src/Screen.cc | |||
@@ -311,20 +311,6 @@ BScreen::ScreenResource::ScreenResource(FbTk::ResourceManager &rm, | |||
311 | tab_width(rm, 64, scrname + ".tab.width", altscrname+".Tab.Width"), | 311 | tab_width(rm, 64, scrname + ".tab.width", altscrname+".Tab.Width"), |
312 | tooltip_delay(rm, 500, scrname + ".tooltipDelay", altscrname+".TooltipDelay"), | 312 | tooltip_delay(rm, 500, scrname + ".tooltipDelay", altscrname+".TooltipDelay"), |
313 | menu_mode(rm, FbTk::MenuTheme::DELAY_OPEN, scrname+".menuMode", altscrname+".MenuMode"), | 313 | menu_mode(rm, FbTk::MenuTheme::DELAY_OPEN, scrname+".menuMode", altscrname+".MenuMode"), |
314 | |||
315 | gc_line_width(rm, 1, scrname+".overlay.lineWidth", altscrname+".Overlay.LineWidth"), | ||
316 | gc_line_style(rm, | ||
317 | FbTk::GContext::LINESOLID, | ||
318 | scrname+".overlay.lineStyle", | ||
319 | altscrname+".Overlay.LineStyle"), | ||
320 | gc_join_style(rm, | ||
321 | FbTk::GContext::JOINMITER, | ||
322 | scrname+".overlay.joinStyle", | ||
323 | altscrname+".Overlay.JoinStyle"), | ||
324 | gc_cap_style(rm, | ||
325 | FbTk::GContext::CAPNOTLAST, | ||
326 | scrname+".overlay.capStyle", | ||
327 | altscrname+".overlay.CapStyle"), | ||
328 | allow_remote_actions(rm, false, scrname+".allowRemoteActions", altscrname+".AllowRemoteActions"), | 314 | allow_remote_actions(rm, false, scrname+".allowRemoteActions", altscrname+".AllowRemoteActions"), |
329 | clientmenu_use_pixmap(rm, true, scrname+".clientMenu.usePixmap", altscrname+".ClientMenu.UsePixmap"), | 315 | clientmenu_use_pixmap(rm, true, scrname+".clientMenu.usePixmap", altscrname+".ClientMenu.UsePixmap"), |
330 | tabs_use_pixmap(rm, true, scrname+".tabs.usePixmap", altscrname+".Tabs.UsePixmap"), | 316 | tabs_use_pixmap(rm, true, scrname+".tabs.usePixmap", altscrname+".Tabs.UsePixmap"), |
@@ -532,15 +518,6 @@ BScreen::BScreen(FbTk::ResourceManager &rm, | |||
532 | 518 | ||
533 | changeWorkspaceID(first_desktop); | 519 | changeWorkspaceID(first_desktop); |
534 | 520 | ||
535 | // we need to load win frame theme before we create any fluxbox window | ||
536 | // and after we've load the resources | ||
537 | // else we get some bad handle/grip height/width | ||
538 | // FbTk::ThemeManager::instance().loadTheme(*m_windowtheme.get()); | ||
539 | m_root_theme->setLineAttributes(*resource.gc_line_width, | ||
540 | *resource.gc_line_style, | ||
541 | *resource.gc_cap_style, | ||
542 | *resource.gc_join_style); | ||
543 | |||
544 | #ifdef SLIT | 521 | #ifdef SLIT |
545 | m_slit.reset(new Slit(*this, *layerManager().getLayer(Layer::DESKTOP), | 522 | m_slit.reset(new Slit(*this, *layerManager().getLayer(Layer::DESKTOP), |
546 | fluxbox->getSlitlistFilename().c_str())); | 523 | fluxbox->getSlitlistFilename().c_str())); |
@@ -948,11 +925,6 @@ void BScreen::reconfigure() { | |||
948 | if (*resource.menu_delay_close < 0) | 925 | if (*resource.menu_delay_close < 0) |
949 | *resource.menu_delay_close = 0; | 926 | *resource.menu_delay_close = 0; |
950 | 927 | ||
951 | m_root_theme->setLineAttributes(*resource.gc_line_width, | ||
952 | *resource.gc_line_style, | ||
953 | *resource.gc_cap_style, | ||
954 | *resource.gc_join_style); | ||
955 | |||
956 | m_menutheme->setDelayOpen(*resource.menu_delay); | 928 | m_menutheme->setDelayOpen(*resource.menu_delay); |
957 | m_menutheme->setDelayClose(*resource.menu_delay_close); | 929 | m_menutheme->setDelayClose(*resource.menu_delay_close); |
958 | 930 | ||