colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-08-30 15:33:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

fontpanel color well fix

Browse Source
This commit is contained in:
daboe01
2015-06-06 19:03:37 +02:00
parent b1ed299286
commit 4987fb5f15
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/CPTextView/CPFontPanel.j
+1 -1
View File
@@ -248,7 +248,7 @@ var _availableTraits= [@"Normal", @"Italic", @"Bold", @"Bold Italic"],
if (![self isVisible])
return;
var attribs = [textView typingAttributes],
var attribs = [textView _attributesForFontPanel],
font = [attribs objectForKey:CPFontAttributeName] || [[textView textStorage] font] || [CPFont systemFontOfSize:12.0],
color = [attribs objectForKey:CPForegroundColorAttributeName];
AppKit/CPTextView/CPTextView.j
+10
View File
@@ -1341,6 +1341,16 @@ var kDelegateRespondsTo_textShouldBeginEditing
[_delegate textViewDidChangeTypingAttributes:[[CPNotification alloc] initWithName:CPTextViewDidChangeTypingAttributesNotification object:self userInfo:nil]];
}
- (CPDictionary)_attributesForFontPanel
{
var attributes = [[_textStorage attributesAtIndex:CPMaxRange(_selectionRange) effectiveRange:nil] copy];
if (![attributes containsKey:CPForegroundColorAttributeName])
[attributes setObject:[self textColor] forKey:CPForegroundColorAttributeName];
return attributes;
}
- (void)delete:(id)sender
{
[self deleteBackward:sender];