aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkt <markt>2007-10-23 21:19:12 (GMT)
committermarkt <markt>2007-10-23 21:19:12 (GMT)
commitecead0f5ede328a75103c32398114586e40f5e45 (patch)
tree931b4caeea34dac912dd216cb8425e8587e56bb9
parentda545ea02e95e9c28f41cc013db84fc71cb9278e (diff)
downloadfluxbox_paul-ecead0f5ede328a75103c32398114586e40f5e45.zip
fluxbox_paul-ecead0f5ede328a75103c32398114586e40f5e45.tar.bz2
adding/removing workspaces wasn't updating menu
-rw-r--r--ChangeLog2
-rw-r--r--src/Screen.cc2
-rw-r--r--src/WorkspaceMenu.cc2
3 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c1c6a20..c18c86c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.0.1: 2Changes for 1.0.1:
3*07/10/23: 3*07/10/23:
4 * Adding/removing workspaces wasn't updating menu (Mark)
5 Screen.cc
4 * Support remembering maximized, minimized, and fullscreen state (Mark) 6 * Support remembering maximized, minimized, and fullscreen state (Mark)
5 - [Maximized] {yes|no|horz|vert} 7 - [Maximized] {yes|no|horz|vert}
6 - [Minimized] {yes|no} 8 - [Minimized] {yes|no}
diff --git a/src/Screen.cc b/src/Screen.cc
index 0589d2f..55517d8 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -1202,6 +1202,7 @@ int BScreen::addWorkspace() {
1202 addWorkspaceName(wkspc->name().c_str()); //update names 1202 addWorkspaceName(wkspc->name().c_str()); //update names
1203 1203
1204 saveWorkspaces(m_workspaces_list.size()); 1204 saveWorkspaces(m_workspaces_list.size());
1205 workspaceCountSig().notify();
1205 1206
1206 return m_workspaces_list.size(); 1207 return m_workspaces_list.size();
1207 1208
@@ -1231,6 +1232,7 @@ int BScreen::removeLastWorkspace() {
1231 m_workspaces_list.pop_back(); 1232 m_workspaces_list.pop_back();
1232 1233
1233 saveWorkspaces(m_workspaces_list.size()); 1234 saveWorkspaces(m_workspaces_list.size());
1235 workspaceCountSig().notify();
1234 // must be deleted after we send notify!! 1236 // must be deleted after we send notify!!
1235 // so we dont get bad pointers somewhere 1237 // so we dont get bad pointers somewhere
1236 // while processing the notify signal 1238 // while processing the notify signal
diff --git a/src/WorkspaceMenu.cc b/src/WorkspaceMenu.cc
index 1083ea3..43cd3a3 100644
--- a/src/WorkspaceMenu.cc
+++ b/src/WorkspaceMenu.cc
@@ -95,7 +95,7 @@ void WorkspaceMenu::update(FbTk::Subject *subj) {
95 wkspc->name().c_str(), 95 wkspc->name().c_str(),
96 &wkspc->menu()); 96 &wkspc->menu());
97 FbTk::RefCount<FbTk::Command> jump_cmd(new JumpToWorkspaceCmd(wkspc->workspaceID())); 97 FbTk::RefCount<FbTk::Command> jump_cmd(new JumpToWorkspaceCmd(wkspc->workspaceID()));
98 mb_menu->setCommand(2, jump_cmd); 98 mb_menu->setCommand(3, jump_cmd);
99 insert(mb_menu, workspace + IDX_AFTER_ICONS); 99 insert(mb_menu, workspace + IDX_AFTER_ICONS);
100 } 100 }
101 101