From f13cbcacce558155112de3ffbea785173b226099 Mon Sep 17 00:00:00 2001 From: Bradley Sepos Date: Mon, 4 Dec 2017 10:49:59 -0500 Subject: [PATCH] Revert "MacGui: show PAR and DAR in the summary panel." This reverts commit f0200cb414f57e50361e263ddb78ef2ed8f6cbdc. --- macosx/HBPicture+UIAdditions.m | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/macosx/HBPicture+UIAdditions.m b/macosx/HBPicture+UIAdditions.m index 9223a47f1..21b92d851 100644 --- a/macosx/HBPicture+UIAdditions.m +++ b/macosx/HBPicture+UIAdditions.m @@ -91,35 +91,7 @@ - (NSString *)shortInfo { - return [NSString stringWithFormat:NSLocalizedString(@"%dx%d Storage, %dx%d Display\n %d : %d PAR, %@ DAR", nil), - self.width, self.height, self.displayWidth, self.height, - self.parWidth, self.parHeight, [self displayAspectInfo]]; -} - -- (NSString *)displayAspectInfo -{ - int dar_width, dar_height; - NSString *str; - - hb_reduce(&dar_width, &dar_height, self.displayWidth, self.height); - int iaspect = dar_width * 9 / dar_height; - if (dar_width > 2 * dar_height) - { - str = [NSString stringWithFormat:@"%.2g : 1", (double)dar_width / dar_height]; - } - else if (iaspect <= 16 && iaspect >= 15) - { - str = [NSString stringWithFormat:@"%.2g : 9", (double)dar_width * 9 / dar_height]; - } - else if (iaspect <= 12 && iaspect >= 11) - { - str = [NSString stringWithFormat:@"%.2g : 3", (double)dar_width * 3 / dar_height]; - } - else - { - str = [NSString stringWithFormat:@"%d : %d", dar_width, dar_height]; - } - return str; + return [NSString stringWithFormat:NSLocalizedString(@"%dx%d Storage, %dx%d Display", nil), self.width, self.height, self.displayWidth, self.height]; } - (NSString *)sourceInfo -- 2.40.0