Multiple font sizes.

tgunr · Aug 20, 2013 · 95851db · 95851db
1 parent 8fa6b43
commit 95851db
Show file tree

Hide file tree

Showing 11 changed files with 338 additions and 185 deletions.
diff --git a/Classes/Dialogs/Preferences/TDCPreferencesController.m b/Classes/Dialogs/Preferences/TDCPreferencesController.m
@@ -828,6 +828,11 @@ - (void)onChangedUserListModeColor:(id)sender
 	[self.masterController.memberList reloadAllDrawings];
 }
 
+- (void)onChangedMainInputTextFieldFontSize:(id)sender
+{
+	[self.masterController.inputTextField updateTextBoxBasedOnPreferredFontSize];
+}
+
 - (void)onResetUserListModeColorsToDefaults:(id)sender
 {
 	TVCMemberList *memberList = self.masterController.memberList;

diff --git a/Classes/Dialogs/TDCTopicSheet.m b/Classes/Dialogs/TDCTopicSheet.m
@@ -55,7 +55,7 @@ - (void)start:(NSString *)topic
 
 	[self.headerTitleField setStringValue:[NSString stringWithFormat:self.headerTitleField.stringValue, c.name]];
 
-	[self.topicValueField setAttributedStringValue:[topic attributedStringWithIRCFormatting:TXDefaultTextFieldFont
+	[self.topicValueField setAttributedStringValue:[topic attributedStringWithIRCFormatting:[self.topicValueField defaultTextFieldFont]
 																  honorFormattingPreference:NO]];
 
 	[self.masterController.formattingMenu enableSheetField:self.topicValueField];

diff --git a/Classes/Headers/TDCPreferencesController.h b/Classes/Headers/TDCPreferencesController.h
@@ -105,6 +105,8 @@
 - (void)onChangedUserListModeColor:(id)sender;
 - (void)onChangedUserListModeSortOrder:(id)sender;
 
+- (void)onChangedMainInputTextFieldFontSize:(id)sender;
+
 - (void)onResetUserListModeColorsToDefaults:(id)sender;
 
 - (void)onOpenPathToScripts:(id)sender;

diff --git a/Classes/Headers/TPCPreferences.h b/Classes/Headers/TPCPreferences.h
@@ -79,6 +79,12 @@ typedef enum TXHostmaskBanFormat : NSInteger {
 	TXHostmaskBanExactFormat  = 3, // Exact Match
 } TXHostmaskBanFormat;
 
+typedef enum TXMainTextBoxFontSize : NSInteger {
+	TXMainTextBoxFontNormalSize			= 1,
+	TXMainTextBoxFontLargeSize			= 2,
+	TXMainTextBoxFontExtraLargeSize		= 3,
+} TXMainTextBoxFontSize;
+
 @interface TPCPreferences : NSObject
 + (BOOL)isDefaultIRCClient;
 
@@ -128,6 +134,8 @@ typedef enum TXHostmaskBanFormat : NSInteger {
 
 + (BOOL)automaticallyDetectHighlightSpam;
 
++ (TXMainTextBoxFontSize)mainTextBoxFontSize;
+
 + (BOOL)logTranscript;
 + (BOOL)logTranscriptInBatches;
 

diff --git a/Classes/Headers/TVCInputTextField.h b/Classes/Headers/TVCInputTextField.h
@@ -41,6 +41,8 @@
 @property (nonatomic, strong) NSAttributedString *placeholderString;
 
 - (void)updateTextDirection;
+- (void)updateTextBoxBasedOnPreferredFontSize;
+
 - (void)redrawOriginPoints;
 - (void)resetTextFieldCellSize:(BOOL)force;
 

diff --git a/Classes/Headers/TVCTextField.h b/Classes/Headers/TVCTextField.h
@@ -39,10 +39,13 @@
 
 #define TXDefaultTextFieldFontColor         [NSColor colorWithCalibratedWhite:0.15 alpha:1.0]
 #define TXDefaultTextFieldFont              [NSFont fontWithName:@"Helvetica" size:12.0]
+#define TXDefaultTextFieldWidthPadding		1.0
+#define TXDefaultTextFieldHeightPadding		2.0
 
 @interface TVCTextField : NSTextView 
 @property (nonatomic, strong) TLOKeyEventHandler *keyHandler;
 @property (nonatomic, assign) dispatch_queue_t formattingQueue;
+@property (nonatomic, strong) NSFont *defaultTextFieldFont;
 
 - (BOOL)isAtTopOfView;
 - (BOOL)isAtBottomOfView;

diff --git a/Classes/Library/Color Formatting/IRCColorFormat.m b/Classes/Library/Color Formatting/IRCColorFormat.m
@@ -423,13 +423,13 @@ - (void)sanitizeIRCCompatibleAttributedString:(BOOL)clearAttributes
 {
 	if (clearAttributes) {
 		NSDictionary *attributes = @{
-			NSFontAttributeName				: TXDefaultTextFieldFont,
+			NSFontAttributeName				: [self defaultTextFieldFont],
 			NSForegroundColorAttributeName	: TXDefaultTextFieldFontColor,
 		};
 
 		[self setTypingAttributes:attributes];
 	} else {
-		[self setFont:TXDefaultTextFieldFont];
+		[self setFont:[self defaultTextFieldFont]];
 	}
 }
 

diff --git a/Classes/Preferences/TPCPreferences.m b/Classes/Preferences/TPCPreferences.m
@@ -827,6 +827,11 @@ + (TXHostmaskBanFormat)banFormat
 	return (TXHostmaskBanFormat)[RZUserDefaults() integerForKey:@"DefaultBanCommandHostmaskFormat"];
 }
 
++ (TXMainTextBoxFontSize)mainTextBoxFontSize
+{
+	return (TXMainTextBoxFontSize)[RZUserDefaults() integerForKey:@"Main Input Text Field -> Font Size"];
+}
+
 #pragma mark -
 #pragma mark Theme
 
@@ -1452,6 +1457,7 @@ + (void)initPreferences
 	d[@"InlineMediaMaximumHeight"]				= @(0);
 	d[@"Keyboard -> Tab Key Action"]			= @(TXTabKeyNickCompleteAction);
 	d[@"Keyboard -> Command+W Action"]			= @(TXCommandWKeyCloseWindowAction);
+	d[@"Main Input Text Field -> Font Size"]	= @(TXMainTextBoxFontNormalSize);
 	d[@"NicknameHighlightMatchingType"]			= @(TXNicknameHighlightExactMatchType);
 	d[@"DefaultBanCommandHostmaskFormat"]		= @(TXHostmaskBanWHAINNFormat);
 	d[@"DestinationOfNonserverNotices"]			= @(TXNoticeSendServerConsoleType);