kode54
/
cog
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Play Time Field: Now pads with spaces up to the duration size plus hyphen, as necessary

CQTexperiment
Christopher Snowhill 2022-01-20 22:30:31 -08:00
parent 71347aab83
commit 6e68494f09
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Window/TimeField.m
View File

@ -10,8 +10,10 @@
static NSString *kTimerModeKey = @"timerShowTimeRemaining"; static NSString *kTimerModeKey = @"timerShowTimeRemaining";
NSString * formatTimer(long minutes, long seconds, unichar prefix) { NSString * formatTimer(long minutes, long seconds, unichar prefix, int padding) {
return [NSString localizedStringWithFormat:@"%C%lu:%02lu", prefix, minutes, seconds];; NSString *paddingChar = [NSString stringWithFormat:@"%C", (unichar)0x2007]; // Digit-width space
NSString *paddingString = [@"" stringByPaddingToLength:padding withString:paddingChar startingAtIndex:0];
return [NSString localizedStringWithFormat:@"%@%C%lu:%02lu", paddingString, prefix, minutes, seconds];
} }
@implementation TimeField { @implementation TimeField {
@ -39,18 +41,36 @@ NSString * formatTimer(long minutes, long seconds, unichar prefix) {
@{NSFontAttributeName : font}; @{NSFontAttributeName : font};
} }
static int _exp10(long minutes)
{
int ret = 1;
while (minutes >= 10) {
minutes /= 10;
ret++;
}
return ret;
}
- (void)update - (void)update
{ {
NSString *text; NSString *text;
if (showTimeRemaining == NO) if (showTimeRemaining == NO)
{ {
long sec = self.currentTime; long sec = self.currentTime;
text = formatTimer(sec / 60, sec % 60, 0x2007); // Digit-width space long sectotal = self.duration;
int minutedigits = _exp10(sec / 60);
int otherminutedigits = _exp10(sectotal / 60) + 1; // Plus hyphen
int padding = MAX(0, otherminutedigits - minutedigits);
text = formatTimer(sec / 60, sec % 60, 0x200B, padding); // Zero-width space
} }
else else
{ {
long sec = MAX(0, self.duration - self.currentTime); long sec = MAX(0, self.duration - self.currentTime);
text = formatTimer(sec / 60, sec % 60, 0x2212); // Minus long sectotal = self.duration;
int minutedigits = _exp10(sec / 60) + 1; // Plus hyphen
int otherminutedigits = _exp10(sectotal / 60) + 1; // Also plus hyphen
int padding = MAX(0, otherminutedigits - minutedigits);
text = formatTimer(sec / 60, sec % 60, 0x2212, padding); // Minus
} }
NSAttributedString *string = [[NSAttributedString alloc] initWithString:text NSAttributedString *string = [[NSAttributedString alloc] initWithString:text
attributes:fontAttributes]; attributes:fontAttributes];