Skip to content

Fix for black illegible view and convenience method #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dominickm wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix for black illegible view and convenience method #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
61fe978
_colorFor will now check to make sure that a scheme and syntax exists…
Jun 23, 2012
00a7048
Adding custom init for creating a syntactView with defaults, however,…
Jun 23, 2012
ef0946a
Implementation for init with defaults --- still not compatible with N…
Jun 23, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions RKSyntaxView/RKSyntaxView.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@
@property (retain) NSDictionary *scheme;
@property (retain) NSDictionary *syntax;

@property (nonatomic, retain) NSString* defaultSchemePath;
@property (nonatomic, retain) NSString* defaultSyntaxPath;


- (id) initWithDefaultSchemePath:(NSString *)schemePath andSyntaxPath:(NSString *)syntaxPath; // do not use with Nibs

- (void) _setup;

#pragma mark - Handling text change
Expand All @@ -47,4 +53,7 @@
- (void) _setBackgroundColor:(NSColor *)color range:(NSRange)range content:(NSMutableAttributedString *)content;
- (void) _setFont:(NSFont *)font range:(NSRange)range content:(NSMutableAttributedString *)content;




@end
37 changes: 32 additions & 5 deletions RKSyntaxView/RKSyntaxView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ @implementation RKSyntaxView

@synthesize scheme=_scheme;
@synthesize syntax=_syntax;
@synthesize defaultSchemePath, defaultSyntaxPath;

#pragma mark - Lifecycle

Expand All @@ -23,19 +24,32 @@ - (id)init {
return self;
}

- (id) initWithDefaultSchemePath:(NSString *)schemePath andSyntaxPath:(NSString *)syntaxPath {
self = [super init];
if (self) {
[self setDefaultSchemePath:schemePath];
[self setDefaultSyntaxPath:syntaxPath];
[self loadScheme:[self defaultSchemePath]];
[self loadSyntax:[self defaultSyntaxPath]];
[self _setup];
}
return self;
}

- (void)awakeFromNib {
[self _setup];
}

- (void)_setup {
[self setTextContainerInset:NSMakeSize(10.0, 10.0)];
[self highlight];

[self addObserver:self forKeyPath:@"string" options:0 context:nil];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_textDidChange:) name:NSTextDidChangeNotification object:self];
}

- (void) dealloc {
[defaultSyntaxPath release];
[defaultSchemePath release];
[super dealloc];
}

Expand All @@ -52,11 +66,22 @@ - (void)_textDidChange:(NSNotification *)notif {
#pragma mark - Scheme

- (void)loadScheme:(NSString *)schemeFilename {
NSString *schemePath = [[NSBundle mainBundle] pathForResource:schemeFilename ofType:@"plist" inDirectory:nil];
self.scheme = [NSDictionary dictionaryWithContentsOfFile:schemePath];
if (schemeFilename) {
NSString *schemePath = [[NSBundle mainBundle] pathForResource:schemeFilename ofType:@"plist" inDirectory:nil];
self.scheme = [NSDictionary dictionaryWithContentsOfFile:schemePath];
}
}

- (NSColor *) _colorFor:(NSString *)key {
if (![self scheme] || ![self syntax]) {
if ([self defaultSyntaxPath] && [self defaultSchemePath]) {
[self loadSyntax:[self defaultSyntaxPath]];
[self loadScheme:[self defaultSchemePath]];
} else {
[self loadScheme:@"PageScheme"];
[self loadSyntax:@"PageSyntax"];
}
}
NSString *colorCode = [[self.scheme objectForKey:@"colors"] objectForKey:key];
if (!colorCode) return nil;
NSColor *color = [NSColor colorFromHexRGB:colorCode];
Expand Down Expand Up @@ -90,8 +115,10 @@ - (NSInteger) _defaultSize {
#pragma mark - Syntax

- (void)loadSyntax:(NSString *)syntaxFilename {
NSString *schemePath = [[NSBundle mainBundle] pathForResource:syntaxFilename ofType:@"plist" inDirectory:nil];
self.syntax = [NSDictionary dictionaryWithContentsOfFile:schemePath];
if (syntaxFilename) {
NSString *schemePath = [[NSBundle mainBundle] pathForResource:syntaxFilename ofType:@"plist" inDirectory:nil];
self.syntax = [NSDictionary dictionaryWithContentsOfFile:schemePath];
}
}

#pragma mark - Highlighting
Expand Down