aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Screen.cc18
1 files changed, 11 insertions, 7 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index 0d08768..abb4a94 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.46 2002/04/12 14:56:15 fluxgen Exp $ 25// $Id: Screen.cc,v 1.47 2002/04/28 19:54:10 fluxgen Exp $
26 26
27//use GNU extensions 27//use GNU extensions
28#ifndef _GNU_SOURCE 28#ifndef _GNU_SOURCE
@@ -589,35 +589,39 @@ void BScreen::reconfigure(void) {
589 if (tmp) image_control->removeImage(tmp); 589 if (tmp) image_control->removeImage(tmp);
590 590
591 XSetWindowBorderWidth(getBaseDisplay()->getXDisplay(), geom_window, 591 XSetWindowBorderWidth(getBaseDisplay()->getXDisplay(), geom_window,
592 theme->getBorderWidth()); 592 theme->getBorderWidth());
593 XSetWindowBorder(getBaseDisplay()->getXDisplay(), geom_window, 593 XSetWindowBorder(getBaseDisplay()->getXDisplay(), geom_window,
594 theme->getBorderColor().getPixel()); 594 theme->getBorderColor().getPixel());
595 595
596 //reconfigure menus
596 workspacemenu->reconfigure(); 597 workspacemenu->reconfigure();
597 iconmenu->reconfigure(); 598 iconmenu->reconfigure();
598 599
600 configmenu->reconfigure();
601
599 { 602 {
600 int remember_sub = rootmenu->currentSubmenu(); 603 int remember_sub = rootmenu->currentSubmenu();
601 initMenu(); 604 initMenu();
602 raiseWindows(0, 0); 605 raiseWindows(0, 0);
603 rootmenu->reconfigure(); 606 rootmenu->reconfigure();
604 rootmenu->drawSubmenu(remember_sub); 607 rootmenu->drawSubmenu(remember_sub);
605 } 608 }
606 609
607 configmenu->reconfigure();
608 610
609 toolbar->reconfigure(); 611 toolbar->reconfigure();
610 612
611#ifdef SLIT 613#ifdef SLIT
612 slit->reconfigure(); 614 slit->reconfigure();
613#endif // SLIT 615#endif // SLIT
614 616
617 //reconfigure workspaces
615 Workspaces::iterator wit = workspacesList.begin(); 618 Workspaces::iterator wit = workspacesList.begin();
616 Workspaces::iterator wit_end = workspacesList.end(); 619 Workspaces::iterator wit_end = workspacesList.end();
617 for (; wit != wit_end; ++wit) { 620 for (; wit != wit_end; ++wit) {
618 (*wit)->reconfigure(); 621 (*wit)->reconfigure();
619 } 622 }
620 623
624 //reconfigure Icons
621 Icons::iterator iit = iconList.begin(); 625 Icons::iterator iit = iconList.begin();
622 Icons::iterator iit_end = iconList.end(); 626 Icons::iterator iit_end = iconList.end();
623 for (; iit != iit_end; ++iit) { 627 for (; iit != iit_end; ++iit) {
@@ -1194,7 +1198,7 @@ void BScreen::initMenu(void) {
1194 rootmenuList.erase(rootmenuList.begin(), rootmenuList.end()); 1198 rootmenuList.erase(rootmenuList.begin(), rootmenuList.end());
1195 1199
1196 while (rootmenu->numberOfItems()) 1200 while (rootmenu->numberOfItems())
1197 rootmenu->remove(0); 1201 rootmenu->remove(0);
1198 } else 1202 } else
1199 rootmenu = new Rootmenu(this); 1203 rootmenu = new Rootmenu(this);
1200 1204