mirror of
https://github.com/cappuccino/cappuccino.git
synced 2026-10-27 02:25:36 +00:00
Merge branch 'jake' into menus
This commit is contained in:
commit
a401dfddff
4 files changed
+14
-6
No files matched your search
@@ -1685,6 +1685,17 @@ CPTexturedBackgroundWindowMask
|
||||
if (!(_styleMask & CPClosableWindowMask))
|
||||
return;
|
||||
|
||||
if ([self isFullBridge])
|
||||
{
|
||||
var event = [CPApp currentEvent];
|
||||
|
||||
if ([event type] === CPKeyDown && [event characters] === "w" && ([event modifierFlags] & CPPlatformActionKeyMask))
|
||||
{
|
||||
[[self platformWindow] _propagateCurrentDOMEvent:YES];
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
// Only send ONE windowShouldClose: message.
|
||||
if ([_delegate respondsToSelector:@selector(windowShouldClose:)])
|
||||
{
|
||||
@@ -1745,9 +1756,6 @@ CPTexturedBackgroundWindowMask
|
||||
[[CPNotificationCenter defaultCenter] postNotificationName:CPWindowWillCloseNotification object:self];
|
||||
|
||||
[self orderOut:nil];
|
||||
|
||||
if ([self isFullBridge])
|
||||
[[self platformWindow] _propagateCurrentDOMEvent:YES];
|
||||
}
|
||||
|
||||
// Managing Main Status
|
||||
|
||||
@@ -48,7 +48,7 @@ var HUD_TITLEBAR_HEIGHT = 26.0;
|
||||
[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/HUD/CPWindowHUDBackground2.png"] size:CPSizeMake(6.0, 78.0)],
|
||||
|
||||
[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/HUD/CPWindowHUDBackground3.png"] size:CPSizeMake(6.0, 1.0)],
|
||||
[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/HUD/CPWindowHUDBackground4.png"] size:CPSizeMake(1.0, 1.0)],
|
||||
[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/HUD/CPWindowHUDBackground4.png"] size:CPSizeMake(5.0, 5.0)],
|
||||
[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/HUD/CPWindowHUDBackground5.png"] size:CPSizeMake(6.0, 1.0)],
|
||||
|
||||
[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/HUD/CPWindowHUDBackground6.png"] size:CPSizeMake(6.0, 6.0)],
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 107 B After Width: | Height: | Size: 118 B |
@@ -521,8 +521,8 @@
|
||||
*/
|
||||
- (id)objectAtIndex:(int)anIndex
|
||||
{
|
||||
if (anIndex >= length)
|
||||
[CPException raise:CPRangeException reason:@"index (" + anIndex + @") beyond bounds (" + length + @")"];
|
||||
if (anIndex >= length || anIndex < 0)
|
||||
[CPException raise:CPRangeException reason:@"index (" + anIndex + @") out of bounds (0 - " + length + @")"];
|
||||
|
||||
return self[anIndex];
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user