diff options
author | Henrik Kinnunen <fluxgen@fluxbox.org> | 2008-09-28 08:53:16 (GMT) |
---|---|---|
committer | Henrik Kinnunen <fluxgen@fluxbox.org> | 2008-09-28 08:53:16 (GMT) |
commit | f2c8868724ebcaa6afaac4a71093f77b7eeaa23f (patch) | |
tree | e64111d54d58f819e261f4fa552fae8e111b30e8 /src/WorkspaceMenu.cc | |
parent | bcf37890b617730cfded161b9a3d18f7c377e724 (diff) | |
parent | 04a1d2a83b96eb6d1b1958e4f3e25ffdf295aa4d (diff) | |
download | fluxbox_paul-f2c8868724ebcaa6afaac4a71093f77b7eeaa23f.zip fluxbox_paul-f2c8868724ebcaa6afaac4a71093f77b7eeaa23f.tar.bz2 |
Merge branch 'master' of fluxbox@git.fluxbox.org:fluxbox
Conflicts:
ChangeLog
Diffstat (limited to 'src/WorkspaceMenu.cc')
-rw-r--r-- | src/WorkspaceMenu.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/WorkspaceMenu.cc b/src/WorkspaceMenu.cc index c343920..f03dd3c 100644 --- a/src/WorkspaceMenu.cc +++ b/src/WorkspaceMenu.cc | |||
@@ -80,7 +80,7 @@ void WorkspaceMenu::workspaceInfoChanged( BScreen& screen ) { | |||
80 | insert(mb_menu, workspace + IDX_AFTER_ICONS); | 80 | insert(mb_menu, workspace + IDX_AFTER_ICONS); |
81 | } | 81 | } |
82 | 82 | ||
83 | updateMenu(-1); | 83 | updateMenu(); |
84 | } | 84 | } |
85 | 85 | ||
86 | void WorkspaceMenu::workspaceChanged(BScreen& screen) { | 86 | void WorkspaceMenu::workspaceChanged(BScreen& screen) { |
@@ -89,12 +89,12 @@ void WorkspaceMenu::workspaceChanged(BScreen& screen) { | |||
89 | item = find(i + IDX_AFTER_ICONS); | 89 | item = find(i + IDX_AFTER_ICONS); |
90 | if (item && item->isSelected()) { | 90 | if (item && item->isSelected()) { |
91 | setItemSelected(i + IDX_AFTER_ICONS, false); | 91 | setItemSelected(i + IDX_AFTER_ICONS, false); |
92 | updateMenu(i + IDX_AFTER_ICONS); | 92 | updateMenu(); |
93 | break; | 93 | break; |
94 | } | 94 | } |
95 | } | 95 | } |
96 | setItemSelected(screen.currentWorkspace()->workspaceID() + IDX_AFTER_ICONS, true); | 96 | setItemSelected(screen.currentWorkspace()->workspaceID() + IDX_AFTER_ICONS, true); |
97 | updateMenu(screen.currentWorkspace()->workspaceID() + IDX_AFTER_ICONS); | 97 | updateMenu(); |
98 | } | 98 | } |
99 | 99 | ||
100 | void WorkspaceMenu::init(BScreen &screen) { | 100 | void WorkspaceMenu::init(BScreen &screen) { |