summaryrefslogtreecommitdiff
path: root/src/Screen.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/Screen.cc')
-rw-r--r--src/Screen.cc26
1 files changed, 22 insertions, 4 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index a723f3c..c6155fe 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -696,6 +696,24 @@ void BScreen::update(FbTk::Subject *subj) {
696 696
697 renderGeomWindow(); 697 renderGeomWindow();
698 renderPosWindow(); 698 renderPosWindow();
699
700 Fluxbox *fluxbox = Fluxbox::instance();
701
702 // and update frame extents on theme changes
703 Workspaces::iterator w_it = getWorkspacesList().begin();
704 const Workspaces::iterator w_it_end = getWorkspacesList().end();
705 for (; w_it != w_it_end; ++w_it) {
706 Workspace::Windows::iterator win_it = (*w_it)->windowList().begin();
707 const Workspace::Windows::iterator win_it_end = (*w_it)->windowList().end();
708 for (; win_it != win_it_end; ++win_it)
709 fluxbox->updateFrameExtents(**win_it);
710 }
711
712 Icons::iterator it = iconList().begin();
713 const Icons::iterator it_end = iconList().end();
714 for (; it != it_end; ++it)
715 fluxbox->updateFrameExtents(**it);
716
699} 717}
700 718
701FbTk::Menu *BScreen::createMenu(const std::string &label) { 719FbTk::Menu *BScreen::createMenu(const std::string &label) {
@@ -749,7 +767,7 @@ void BScreen::hideMenus() {
749#endif // SLIT 767#endif // SLIT
750 768
751 // hide icon menus 769 // hide icon menus
752 if (iconList().size()) { 770 if (!iconList().empty()) {
753 Icons::iterator it = iconList().begin(); 771 Icons::iterator it = iconList().begin();
754 const Icons::iterator it_end = iconList().end(); 772 const Icons::iterator it_end = iconList().end();
755 for (; it != it_end; ++it) 773 for (; it != it_end; ++it)
@@ -764,7 +782,7 @@ void BScreen::hideWindowMenus(const FluxboxWindow* except) {
764 Workspaces::iterator w_it = getWorkspacesList().begin(); 782 Workspaces::iterator w_it = getWorkspacesList().begin();
765 const Workspaces::iterator w_it_end = getWorkspacesList().end(); 783 const Workspaces::iterator w_it_end = getWorkspacesList().end();
766 for (; w_it != w_it_end; ++w_it) { 784 for (; w_it != w_it_end; ++w_it) {
767 if ((*w_it)->windowList().size()) { 785 if (!(*w_it)->windowList().empty()) {
768 Workspace::Windows::iterator win_it = (*w_it)->windowList().begin(); 786 Workspace::Windows::iterator win_it = (*w_it)->windowList().begin();
769 const Workspace::Windows::iterator win_it_end = (*w_it)->windowList().end(); 787 const Workspace::Windows::iterator win_it_end = (*w_it)->windowList().end();
770 for (; win_it != win_it_end; ++win_it) { 788 for (; win_it != win_it_end; ++win_it) {
@@ -895,7 +913,7 @@ void BScreen::reconfigureTabs() {
895 Workspaces::iterator w_it = getWorkspacesList().begin(); 913 Workspaces::iterator w_it = getWorkspacesList().begin();
896 const Workspaces::iterator w_it_end = getWorkspacesList().end(); 914 const Workspaces::iterator w_it_end = getWorkspacesList().end();
897 for (; w_it != w_it_end; ++w_it) { 915 for (; w_it != w_it_end; ++w_it) {
898 if ((*w_it)->windowList().size()) { 916 if (!(*w_it)->windowList().empty()) {
899 Workspace::Windows::iterator win_it = (*w_it)->windowList().begin(); 917 Workspace::Windows::iterator win_it = (*w_it)->windowList().begin();
900 const Workspace::Windows::iterator win_it_end = (*w_it)->windowList().end(); 918 const Workspace::Windows::iterator win_it_end = (*w_it)->windowList().end();
901 for (; win_it != win_it_end; ++win_it) { 919 for (; win_it != win_it_end; ++win_it) {
@@ -1517,7 +1535,7 @@ void BScreen::initMenu() {
1517 m_rootmenu.reset(createMenu("")); 1535 m_rootmenu.reset(createMenu(""));
1518 1536
1519 Fluxbox * const fb = Fluxbox::instance(); 1537 Fluxbox * const fb = Fluxbox::instance();
1520 if (fb->getMenuFilename().size() > 0) { 1538 if (!fb->getMenuFilename().empty()) {
1521 m_rootmenu.reset(MenuCreator::createFromFile(fb->getMenuFilename(), 1539 m_rootmenu.reset(MenuCreator::createFromFile(fb->getMenuFilename(),
1522 screenNumber(), true)); 1540 screenNumber(), true));
1523 1541