Skip to content

Commit ef883fc

Browse files
committed
Workspace: fixed "Tools->Dock" menu items title and state.
1 parent 8e4730a commit ef883fc

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

Applications/Workspace/Controller.m

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1336,12 +1336,21 @@ - (BOOL)validateMenuItem:(id<NSMenuItem>)menuItem
13361336
} else if ([menuTitle isEqualToString:@"Dock"]) {
13371337
if ([[menuItem title] isEqualToString:@"Collapse"] ||
13381338
[[menuItem title] isEqualToString:@"Uncollapse"]) {
1339+
if (wDefaultScreen()->dock->collapsed) {
1340+
[menuItem setTitle:@"Uncollapse"];
1341+
} else {
1342+
[menuItem setTitle:@"Collapse"];
1343+
}
13391344
if (!wDefaultScreen()->dock->mapped) {
13401345
return NO;
13411346
}
13421347
}
1343-
if ([[menuItem title] isEqualToString:@"Hide"] && !wDefaultScreen()->dock->mapped) {
1344-
[menuItem setTitle:@"Show"];
1348+
if ([[menuItem title] isEqualToString:@"Hide"] || [[menuItem title] isEqualToString:@"Show"]) {
1349+
if (wDefaultScreen()->dock->mapped) {
1350+
[menuItem setTitle:@"Hide"];
1351+
} else {
1352+
[menuItem setTitle:@"Show"];
1353+
}
13451354
}
13461355
} else if ([menuTitle isEqualToString:@"Icon Yard"]) {
13471356
if ([[menuItem title] isEqualToString:@"Hide"] && !wDefaultScreen()->flags.icon_yard_mapped) {

0 commit comments

Comments
 (0)