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

Commit d896d7a

Browse files
committed
Merge pull request #410 from magarcia/master
Brackets-shell build command fail in OSX with case sensitive FileSystem
2 parents 124ca38 + 8aeab2e commit d896d7a

2 files changed

Lines changed: 19 additions & 19 deletions

File tree

appshell/FullScreenButton.mm

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020
* DEALINGS IN THE SOFTWARE.
2121
*
2222
*/
23-
#import "FullScreenbutton.h"
23+
#import "FullScreenButton.h"
2424
//#define FS_HOT_TO_COLD
2525

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

29-
@implementation FullScreenButton {
29+
@implementation FullScreenButton {
3030
NSImage *inactive;
3131
NSImage *active;
3232
NSImage *hover;
@@ -52,22 +52,22 @@ - (id)initWithFrame:(NSRect)frameRect {
5252
return self;
5353
}
5454

55-
- (void)setup {
55+
- (void)setup {
5656
inactive = [NSImage imageNamed:@"window-fullscreen-inactive"];
5757
active = [NSImage imageNamed:@"window-fullscreen-active"];
5858
hover = [NSImage imageNamed:@"window-fullscreen-hover"];
5959
pressed = [NSImage imageNamed:@"window-fullscreen-pressed"];
60-
60+
6161
#ifdef FS_HOT_TO_COLD
6262
NSImage* saved = active;
6363
active = pressed;
6464
pressed = saved;
6565
#endif
66-
66+
6767
// assume active
6868
activeState = YES;
6969
[self updateButtonStates];
70-
70+
7171
//get notified of state
7272
[[NSNotificationCenter defaultCenter] addObserver:self
7373
selector:@selector(updateActiveState)
@@ -81,13 +81,13 @@ - (void)setup {
8181
[[NSNotificationCenter defaultCenter] addObserver:self
8282
selector:@selector(updateActiveState)
8383
name:NSWindowDidResignKeyNotification object:[self window]];
84-
85-
84+
85+
8686
NSTrackingAreaOptions focusTrackingAreaOptions = NSTrackingActiveInActiveApp;
8787
focusTrackingAreaOptions |= NSTrackingMouseEnteredAndExited;
8888
focusTrackingAreaOptions |= NSTrackingAssumeInside;
8989
focusTrackingAreaOptions |= NSTrackingInVisibleRect;
90-
90+
9191
NSTrackingArea *focusTrackingArea = [[NSTrackingArea alloc] initWithRect:NSZeroRect
9292
options:focusTrackingAreaOptions owner:self userInfo:nil];
9393
[self addTrackingArea:focusTrackingArea];
@@ -96,7 +96,7 @@ - (void)setup {
9696
- (void)mouseDown:(NSEvent *)theEvent {
9797
pressedState = YES;
9898
hoverState = NO;
99-
99+
100100
if (!activeState) {
101101
[self.window makeKeyAndOrderFront:self];
102102
[self.window setOrderedIndex:0];

appshell/TrafficLightButton.mm

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@
2020
* DEALINGS IN THE SOFTWARE.
2121
*
2222
*/
23-
#import "TrafficLightbutton.h"
23+
#import "TrafficLightButton.h"
2424

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

30-
@implementation TrafficLightButton {
30+
@implementation TrafficLightButton {
3131
NSImage *inactive;
3232
NSImage *active;
3333
NSImage *hover;
@@ -59,7 +59,7 @@ - (id)initWithFrame:(NSRect)frameRect {
5959
return self;
6060
}
6161

62-
- (void)setup {
62+
- (void)setup {
6363
NSString* buttonName = nil;
6464
//the numbers come from the XIB file.
6565
if ([self tag] == CLOSE_BUTTON_TAG) {
@@ -80,11 +80,11 @@ - (void)setup {
8080
dirtyHover = [NSImage imageNamed:[NSString stringWithFormat:@"window-%@-dirty-hover",buttonName]];
8181
dirtyPressed = [NSImage imageNamed:[NSString stringWithFormat:@"window-%@-dirty-pressed",buttonName]];
8282
}
83-
83+
8484
// assume active
8585
activeState = YES;
8686
[self updateButtonStates];
87-
87+
8888
//get notified of state
8989
[[NSNotificationCenter defaultCenter] addObserver:self
9090
selector:@selector(updateActiveState)
@@ -106,7 +106,7 @@ - (void)setup {
106106
selector:@selector(hoverOut)
107107
name:@"TrafficLightsMouseExit"
108108
object:nil];
109-
109+
110110
[[NSNotificationCenter defaultCenter] addObserver:self
111111
selector:@selector(setDocumentEdited)
112112
name:@"TrafficLightsDirty"
@@ -116,7 +116,7 @@ - (void)setup {
116116
- (void)mouseDown:(NSEvent *)theEvent {
117117
pressedState = YES;
118118
hoverState = NO;
119-
119+
120120
if (!activeState) {
121121
[self.window makeKeyAndOrderFront:self];
122122
[self.window setOrderedIndex:0];
@@ -141,7 +141,7 @@ - (void)mouseUp:(NSEvent *)theEvent {
141141
[[self window] performZoom:nil];
142142
return;
143143
}
144-
144+
145145
[self updateButtonStates];
146146
[super mouseUp:theEvent];
147147
}
@@ -191,7 +191,7 @@ -(void)updateButtonStates{
191191
}
192192

193193
- (void)hoverIn:(NSNotification *) notification {
194-
194+
195195
if ([[notification object] isEqual:[self superview]]) {
196196
hoverState = YES;
197197
if (closeButton && dirtyState) {

0 commit comments

Comments
 (0)