diff options
| author | Dana Jansens <danakj@orodu.net> | 2002-07-14 20:54:03 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2002-07-14 20:54:03 +0000 |
| commit | 90dbcb271c5e6d7ca73c19a519b93885b833db0a (patch) | |
| tree | df98b2ed99b8dd6546be1d7d03221ee6d54e6ea4 /src/Toolbar.cc | |
| parent | c6a826bf663d3cb286025642f5e2a725b5d1c660 (diff) | |
properly handle workspace names, and changes to them.
Diffstat (limited to 'src/Toolbar.cc')
| -rw-r--r-- | src/Toolbar.cc | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/Toolbar.cc b/src/Toolbar.cc index a2c3442b..a1a6e118 100644 --- a/src/Toolbar.cc +++ b/src/Toolbar.cc @@ -916,13 +916,9 @@ void Toolbar::keyPressEvent(const XKeyEvent *ke) { blackbox->setFocusedWindow(0); } - Workspace *wkspc = screen->getCurrentWorkspace(); - wkspc->setName(new_workspace_name); - wkspc->getMenu()->hide(); - - screen->getWorkspacemenu()->changeItemLabel(wkspc->getID() + 2, - wkspc->getName()); - screen->getWorkspacemenu()->update(); + // the toolbar will be reconfigured when the change to the workspace name + // gets caught in the PropertyNotify event handler + screen->getCurrentWorkspace()->setName(new_workspace_name); new_workspace_name.erase(); new_name_pos = 0; @@ -938,7 +934,6 @@ void Toolbar::keyPressEvent(const XKeyEvent *ke) { else XSetWindowBackgroundPixmap(display, frame.workspace_label, frame.wlabel); - reconfigure(); } else if (! (ks == XK_Shift_L || ks == XK_Shift_R || ks == XK_Control_L || ks == XK_Control_R || ks == XK_Caps_Lock || ks == XK_Shift_Lock || |