v1.0.9 - Fixed 3x resizing to 1x issue on retina Macs

The 1x did not resize to 1x but rather to 2x. Now fixed.
terwanerik · Apr 30, 2016 · 315b845 · 315b845
1 parent 7dfa2dd
commit 315b845
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/Retini.zip b/Retini.zip
diff --git a/Retini/Info.plist b/Retini/Info.plist
@@ -38,7 +38,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
+<<<<<<< HEAD
+	<string>1.0.9</string>
+=======
 	<string>1.0.8</string>
+>>>>>>> 7dfa2ddc8d939ef44733a4eb1abea3f2e711bc9b
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/Retini/ResizeModel.m b/Retini/ResizeModel.m
@@ -97,7 +97,11 @@ - (void)resize3x:(NSString *)fileName
 	NSImage *newImg2x = [self imageResize:[original copy] newSize:NSMakeSize(width, height)];
 
 	if([self saveImage:newImg2x toPath:[fileName stringByReplacingOccurrencesOfString:@"@3x" withString:@"@2x"]]){
+<<<<<<< HEAD
+		NSImage *newImg = [self imageResize:[original copy] newSize:NSMakeSize(original.size.width / screenScale, original.size.height / screenScale)];
+=======
 		NSImage *newImg = [self imageResize:[original copy] newSize:NSMakeSize(original.size.width, original.size.height)];
+>>>>>>> 7dfa2ddc8d939ef44733a4eb1abea3f2e711bc9b
 		[self saveImage:newImg toPath:[fileName stringByReplacingOccurrencesOfString:@"@3x" withString:@""]];
 	}