Merge pull request #530 from armm77/review

Image scaling functionality is now complete.

Author: trunkmaster

Applications/Review/ImageWindow.h

@@ -67,6 +67,8 @@
 - (NSString *)imageGamma;
 - (NSString *)imageProgressive;
 
+- (void)scaleImageFromPopup:(id)sender;
+
 @end
 
 @interface NSObject (ImageWindowDelegates)

Applications/Review/ImageWindow.m

@@ -253,6 +253,8 @@ - (id)initWithContentsOfFile:(NSString *)path
     [scalePopup addItemWithTitle:@"700%"];
     [scalePopup setAutoresizingMask:(NSViewMaxYMargin | NSViewMinXMargin)];
     [scalePopup selectItemWithTitle:@"100%"];
+    [scalePopup setTarget:self];
+    [scalePopup setAction:@selector(scaleImageFromPopup:)];
     scrollView.scaleView = scalePopup;
 
     [box addSubview:scrollView];
@@ -315,6 +317,24 @@ - (id)initWithContentsOfFile:(NSString *)path
   return self;
 }
 
+- (void)scaleImageFromPopup:(id)sender
+{
+  NSString *title = [scalePopup titleOfSelectedItem];
+  /* Parse the percentage value — strip the trailing '%' */
+  double percent = [[title substringToIndex:[title length] - 1] doubleValue];
+  double factor  = percent / 100.0;
+
+  NSSize baseSize = NSMakeSize(_visibleRep.pixelsWide, _visibleRep.pixelsHigh);
+  NSSize scaledSize = NSMakeSize(round(baseSize.width  * factor),
+                                 round(baseSize.height * factor));
+
+  /* Resize the image to the scaled size — NSImageView will stretch it */
+  [_image setSize:scaledSize];
+  [imageView setFrameSize:scaledSize];
+  [imageView setImage:nil];   /* force redraw */
+  [imageView setImage:_image];
+}
+
 - (void)dealloc
 {
   RELEASE(_window);