Skip to content
This repository has been archived by the owner on Sep 2, 2021. It is now read-only.

Brackets-shell build command fail in OSX with case sensitive FileSystem #410

Merged
merged 1 commit into from Feb 5, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 10 additions & 10 deletions appshell/FullScreenButton.mm
Expand Up @@ -20,13 +20,13 @@
* DEALINGS IN THE SOFTWARE.
*
*/
#import "FullScreenbutton.h"
#import "FullScreenButton.h"
//#define FS_HOT_TO_COLD

//these are defined in MainMainu.xib file
static const int FULLSCREEN_BUTTON_TAG = 1004;

@implementation FullScreenButton {
@implementation FullScreenButton {
NSImage *inactive;
NSImage *active;
NSImage *hover;
Expand All @@ -52,22 +52,22 @@ - (id)initWithFrame:(NSRect)frameRect {
return self;
}

- (void)setup {
- (void)setup {
inactive = [NSImage imageNamed:@"window-fullscreen-inactive"];
active = [NSImage imageNamed:@"window-fullscreen-active"];
hover = [NSImage imageNamed:@"window-fullscreen-hover"];
pressed = [NSImage imageNamed:@"window-fullscreen-pressed"];

#ifdef FS_HOT_TO_COLD
NSImage* saved = active;
active = pressed;
pressed = saved;
#endif

// assume active
activeState = YES;
[self updateButtonStates];

//get notified of state
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(updateActiveState)
Expand All @@ -81,13 +81,13 @@ - (void)setup {
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(updateActiveState)
name:NSWindowDidResignKeyNotification object:[self window]];


NSTrackingAreaOptions focusTrackingAreaOptions = NSTrackingActiveInActiveApp;
focusTrackingAreaOptions |= NSTrackingMouseEnteredAndExited;
focusTrackingAreaOptions |= NSTrackingAssumeInside;
focusTrackingAreaOptions |= NSTrackingInVisibleRect;

NSTrackingArea *focusTrackingArea = [[NSTrackingArea alloc] initWithRect:NSZeroRect
options:focusTrackingAreaOptions owner:self userInfo:nil];
[self addTrackingArea:focusTrackingArea];
Expand All @@ -96,7 +96,7 @@ - (void)setup {
- (void)mouseDown:(NSEvent *)theEvent {
pressedState = YES;
hoverState = NO;

if (!activeState) {
[self.window makeKeyAndOrderFront:self];
[self.window setOrderedIndex:0];
Expand Down
18 changes: 9 additions & 9 deletions appshell/TrafficLightButton.mm
Expand Up @@ -20,14 +20,14 @@
* DEALINGS IN THE SOFTWARE.
*
*/
#import "TrafficLightbutton.h"
#import "TrafficLightButton.h"

//these are defined in MainMainu.xib file
static const int CLOSE_BUTTON_TAG = 1000;
static const int MINIMIZE_BUTTON_TAG = 1001;
static const int ZOOM_BUTTON_TAG = 1002;

@implementation TrafficLightButton {
@implementation TrafficLightButton {
NSImage *inactive;
NSImage *active;
NSImage *hover;
Expand Down Expand Up @@ -59,7 +59,7 @@ - (id)initWithFrame:(NSRect)frameRect {
return self;
}

- (void)setup {
- (void)setup {
NSString* buttonName = nil;
//the numbers come from the XIB file.
if ([self tag] == CLOSE_BUTTON_TAG) {
Expand All @@ -80,11 +80,11 @@ - (void)setup {
dirtyHover = [NSImage imageNamed:[NSString stringWithFormat:@"window-%@-dirty-hover",buttonName]];
dirtyPressed = [NSImage imageNamed:[NSString stringWithFormat:@"window-%@-dirty-pressed",buttonName]];
}

// assume active
activeState = YES;
[self updateButtonStates];

//get notified of state
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(updateActiveState)
Expand All @@ -106,7 +106,7 @@ - (void)setup {
selector:@selector(hoverOut)
name:@"TrafficLightsMouseExit"
object:nil];

[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(setDocumentEdited)
name:@"TrafficLightsDirty"
Expand All @@ -116,7 +116,7 @@ - (void)setup {
- (void)mouseDown:(NSEvent *)theEvent {
pressedState = YES;
hoverState = NO;

if (!activeState) {
[self.window makeKeyAndOrderFront:self];
[self.window setOrderedIndex:0];
Expand All @@ -141,7 +141,7 @@ - (void)mouseUp:(NSEvent *)theEvent {
[[self window] performZoom:nil];
return;
}

[self updateButtonStates];
[super mouseUp:theEvent];
}
Expand Down Expand Up @@ -191,7 +191,7 @@ -(void)updateButtonStates{
}

- (void)hoverIn:(NSNotification *) notification {

if ([[notification object] isEqual:[self superview]]) {
hoverState = YES;
if (closeButton && dirtyState) {
Expand Down