1 files changed, 11 insertions, 28 deletions

diff --git a/src/Screen.cc b/src/Screen.cc
index f26a0e6..eab425b 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -773,21 +773,12 @@ void BScreen::update(FbTk::Subject *subj) {
     renderPosWindow();
 
     Fluxbox *fluxbox = Fluxbox::instance();
-
-    // and update frame extents on theme changes
-    Workspaces::iterator w_it = getWorkspacesList().begin();
-    const Workspaces::iterator w_it_end = getWorkspacesList().end();
-    for (; w_it != w_it_end; ++w_it) {
-        Workspace::Windows::iterator win_it = (*w_it)->windowList().begin();
-        const Workspace::Windows::iterator win_it_end = (*w_it)->windowList().end();
-        for (; win_it != win_it_end; ++win_it)
-            fluxbox->updateFrameExtents(**win_it);
-    }
-
-    Icons::iterator it = iconList().begin();
-    const Icons::iterator it_end = iconList().end();
+    const std::list<Focusable *> winlist =
+            focusControl().focusedOrderWinList().clientList();
+    std::list<Focusable *>::const_iterator it = winlist.begin(),
+                                           it_end = winlist.end();
     for (; it != it_end; ++it)
-        fluxbox->updateFrameExtents(**it);
+        fluxbox->updateFrameExtents(*(*it)->fbwindow());
 
 }
 
@@ -986,20 +977,12 @@ void BScreen::reconfigure() {
 }
 
 void BScreen::reconfigureTabs() {
-    Workspaces::iterator w_it = getWorkspacesList().begin();
-    const Workspaces::iterator w_it_end = getWorkspacesList().end();
-    for (; w_it != w_it_end; ++w_it) {
-        if (!(*w_it)->windowList().empty()) {
-            Workspace::Windows::iterator win_it = (*w_it)->windowList().begin();
-            const Workspace::Windows::iterator win_it_end = (*w_it)->windowList().end();
-            for (; win_it != win_it_end; ++win_it)
-                (*win_it)->applyDecorations();
-        }
-    }
-    Icons::iterator icon_it = m_icon_list.begin();
-    Icons::iterator icon_it_end = m_icon_list.end();
-    for (; icon_it != icon_it_end; ++icon_it)
-        (*icon_it)->applyDecorations();
+    const std::list<Focusable *> winlist =
+            focusControl().focusedOrderWinList().clientList();
+    std::list<Focusable *>::const_iterator it = winlist.begin(),
+                                           it_end = winlist.end();
+    for (; it != it_end; ++it)
+        (*it)->fbwindow()->applyDecorations();
 }