summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ToolbarHandler.cc13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/ToolbarHandler.cc b/src/ToolbarHandler.cc
index adb1f8d..7e31e65 100644
--- a/src/ToolbarHandler.cc
+++ b/src/ToolbarHandler.cc
@@ -20,7 +20,7 @@
20// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 20// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
21// DEALINGS IN THE SOFTWARE. 21// DEALINGS IN THE SOFTWARE.
22 22
23// $Id: ToolbarHandler.cc,v 1.2 2003/03/10 21:38:47 rathnor Exp $ 23// $Id: ToolbarHandler.cc,v 1.3 2003/03/10 22:25:18 rathnor Exp $
24 24
25/** 25/**
26 * The ToolbarHandler class acts as a rough interface to the toolbar. 26 * The ToolbarHandler class acts as a rough interface to the toolbar.
@@ -275,9 +275,16 @@ void ToolbarHandler::updateState(FluxboxWindow &win) {
275void ToolbarHandler::updateWorkspace(FluxboxWindow &win) { 275void ToolbarHandler::updateWorkspace(FluxboxWindow &win) {
276 if (win.getScreen() != &m_screen) return; 276 if (win.getScreen() != &m_screen) return;
277 // don't care about current workspace except if in workspace mode 277 // don't care about current workspace except if in workspace mode
278 if (m_mode != WORKSPACE) return; 278 if (!(m_mode == WORKSPACE || (m_mode == WORKSPACEICONS && win.isIconic()))) return;
279
279 if (win.getWorkspaceNumber() == m_current_workspace) { 280 if (win.getWorkspaceNumber() == m_current_workspace) {
280 m_toolbar->addIcon(&win); 281 // TODO
282 // this shouldn't be needed, but is until Workspaces get fixed so that
283 // you only move between them, you don't 'add' and 'remove'
284 // alternatively, fix reassocaiteWindow so that the iconic stuff is
285 // done elsewhere
286 if (!m_toolbar->containsIcon(win))
287 m_toolbar->addIcon(&win);
281 } else { 288 } else {
282 // relies on the fact that this runs but does nothing if window isn't contained. 289 // relies on the fact that this runs but does nothing if window isn't contained.
283 m_toolbar->delIcon(&win); 290 m_toolbar->delIcon(&win);