]>
Commit | Line | Data |
---|---|---|
8ae06a01 | 1 | diff -ur o-WildMenus/Menus.m WildMenus/Menus.m |
2 | --- o-WildMenus/Menus.m 2004-02-11 06:57:36.000000000 -0700 | |
3 | +++ WildMenus/Menus.m 2004-11-13 15:41:54.022387334 -0700 | |
4 | @@ -291,7 +291,7 @@ | |
5 | break; | |
6 | ||
7 | case NSImageLeft: | |
8 | - cellFrame.origin.x += 4 + _imageWidth + xDist; // _horizontalEdgePad | |
9 | + cellFrame.origin.x += 4 + _imageWidth + GSCellTextImageXDist; // _horizontalEdgePad | |
10 | cellFrame.size.width = _titleWidth; | |
11 | break; | |
12 | ||
13 | @@ -583,7 +583,7 @@ | |
14 | NSMenuItemCell *msr = [[[_attachedMenu supermenu] menuRepresentation] | |
15 | menuItemCellForItemAtIndex: | |
16 | [[_attachedMenu supermenu] indexOfItemWithTitle: [_attachedMenu title]]]; | |
17 | - neededImageAndTitleWidth += [msr titleWidth] + xDist; | |
18 | + neededImageAndTitleWidth += [msr titleWidth] + GSCellTextImageXDist; | |
19 | } | |
20 | ||
21 | if (_titleView) | |
22 | @@ -627,7 +627,7 @@ | |
23 | ||
24 | case NSImageLeft: | |
25 | case NSImageRight: | |
26 | - anImageAndTitleWidth = anImageWidth + aTitleWidth + xDist; | |
27 | + anImageAndTitleWidth = anImageWidth + aTitleWidth + GSCellTextImageXDist; | |
28 | break; | |
29 | ||
30 | case NSImageBelow: | |
31 | @@ -883,7 +883,7 @@ | |
32 | ||
33 | if ([aCell imageWidth]) | |
34 | { | |
35 | - titleWidth += [aCell imageWidth] + xDist; | |
36 | + titleWidth += [aCell imageWidth] + GSCellTextImageXDist; | |
37 | } | |
38 | ||
39 | elem.rect = NSMakeRect (currentX, |