Implementations

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@4363 72102866-910b-0410-8b05-ffd578937521

Headers/gnustep/gui/NSImageCell.h

@@ -0,0 +1,88 @@
+/* 
+   NSImageCell.h
+
+   The cell class for NSImage
+
+   Copyright (C) 1999 Free Software Foundation, Inc.
+
+   Author:  Jonathan Gapen <jagapen@chem.wisc.edu>
+   Date: 1999
+   
+   This file is part of the GNUstep GUI Library.
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+   
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with this library; see the file COPYING.LIB.
+   If not, write to the Free Software Foundation,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+*/ 
+
+#ifndef _GNUstep_H_NSImageCell
+#define _GNUstep_H_NSImageCell
+
+#include <AppKit/NSCell.h>
+#include <AppKit/NSImageView.h>
+
+/*
+typedef enum _NSImageAlignment {
+  NSImageAlignLeft,
+  NSImageAlignRight,
+  NSImageAlignCenter,
+  NSImageAlignTop,
+  NSImageAlignBottom,
+  NSImageAlignTopLeft,
+  NSImageAlignTopRight,
+  NSImageAlignBottomLeft,
+  NSImageAlignBottomRight
+} NSImageAlignment;
+
+typedef enum _NSImageFrameStyle {
+  NSImageFrameNone,
+  NSImageFramePhoto,
+  NSImageFrameGrayBezel,
+  NSImageFrameGroove,
+  NSImageFrameButton
+} NSImageFrameStyle;
+
+typedef enum _NSImageScaling {
+  NSScaleProportionally,
+  NSScaleToFit,
+  NSScaleNone
+} NSImageScaling;
+*/
+
+@interface NSImageCell : NSCell <NSCopying, NSCoding>
+{
+  // Attributes
+  NSImageAlignment _imageAlignment;
+  NSImageFrameStyle _frameStyle;
+  NSImageScaling _imageScaling;
+  NSSize _original_image_size;
+}
+
+//
+// Aligning and scaling the image
+//
+- (NSImageAlignment) imageAlignment;
+- (void) setImageAlignment: (NSImageAlignment)anAlignment;
+- (NSImageScaling) imageScaling;
+- (void) setImageScaling: (NSImageScaling)scaling;
+
+//
+// Choosing the frame
+//
+- (NSImageFrameStyle) imageFrameStyle;
+- (void) setImageFrameStyle: (NSImageFrameStyle)aFrameStyle;
+
+@end
+
+#endif // _GNUstep_H_NSImageCell

Source/NSImageCell.m

@@ -0,0 +1,333 @@
+/*
+   NSImageCell.m
+
+   The image cell class
+
+   Copyright (C) 1999 Free Software Foundation, Inc.
+
+   Author:  Jonathan Gapen   <jagapen@smithlab.chem.wisc.edu>
+   Date: 1999
+
+   This file is part of the GNUstep GUI Library.
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with this library; see the file COPYING.LIB.
+   If not, write to the Free Software Foundation,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+*/
+
+#include <gnustep/gui/config.h>
+#include <Foundation/NSDebug.h>
+#include <AppKit/NSCell.h>
+#include <AppKit/NSGraphics.h>
+#include <AppKit/NSImageCell.h>
+#include <AppKit/NSImage.h>
+
+@implementation NSImageCell
+
+//
+// Class methods
+//
++ (void) initialize
+{
+  if (self == [NSImageCell class])
+    [self setVersion: 1];
+}
+
+//
+// Instance methods
+//
+- (id) init
+{
+  [self initImageCell: nil];
+
+  return self;
+}
+
+- (id) initImageCell: (NSImage *)anImage
+{
+  NSDebugLLog(@"NSImageCell", @"NSImageCell -initImageCell");
+  [super initImageCell: anImage];
+
+  return self;
+}
+
+- (void) dealloc
+{
+  [super dealloc];
+}
+
+- (void)setImage:(NSImage *)anImage
+{
+  [super setImage:anImage];
+  _original_image_size = [anImage size];
+}
+
+//
+// Aligning and scaling the image
+//
+- (NSImageAlignment)imageAlignment
+{
+  return _imageAlignment;
+}
+
+- (void)setImageAlignment: (NSImageAlignment)anAlignment
+{
+  NSDebugLLog(@"NSImageCell", @"NSImageCell -setImageAlignment");
+  _imageAlignment = anAlignment;
+}
+
+- (NSImageScaling)imageScaling
+{
+  return _imageScaling;
+}
+
+- (void)setImageScaling: (NSImageScaling)scaling
+{
+  _imageScaling = scaling;
+}
+
+//
+// Choosing the frame
+//
+- (NSImageFrameStyle)imageFrameStyle
+{
+  return _frameStyle;
+}
+
+- (void)setImageFrameStyle: (NSImageFrameStyle)aFrameStyle
+{
+  _frameStyle = aFrameStyle;
+}
+
+//
+// Displaying
+//
+- (void) drawWithFrame: (NSRect)cellFrame inView: (NSView *)controlView
+{
+  NSDebugLLog(@"NSImageCell", @"NSImageCell -drawWithFrame");
+  // Save last view drawn to
+  [self setControlView: controlView];
+
+  // do nothing if cell's frame rect is zero
+  if( NSIsEmptyRect(cellFrame) )
+    return;
+
+  // draw the border if needed
+  switch( [self imageFrameStyle] )
+  {
+    case NSImageFrameNone:
+      // nada
+      break;
+    case NSImageFramePhoto:
+      // what does this one look like?
+      break;
+    case NSImageFrameGrayBezel:
+      NSDrawGrayBezel(cellFrame, NSZeroRect);
+      break;
+    case NSImageFrameGroove:
+      NSDrawGroove(cellFrame, NSZeroRect);
+      break;
+    case NSImageFrameButton:
+      NSDrawButton(cellFrame, NSZeroRect);
+      break;
+  }
+
+  [self drawInteriorWithFrame: cellFrame inView: controlView];
+}
+
+static inline float xLeftInRect(NSSize innerSize, NSRect outerRect)
+{
+  return NSMinX(outerRect);
+}
+
+static inline float xCenterInRect(NSSize innerSize, NSRect outerRect)
+{
+  return MAX(NSMidX(outerRect) - (innerSize.width/2.0), 0.0);
+}
+
+static inline float xRightInRect(NSSize innerSize, NSRect outerRect)
+{
+  return MAX(NSMaxX(outerRect) - innerSize.width, 0.0);
+}
+
+static inline float yTopInRect(NSSize innerSize, NSRect outerRect, BOOL flipped)
+{
+  if( flipped )
+    return NSMinY(outerRect);
+  else
+    return MAX(NSMaxY(outerRect) - innerSize.height, 0.0);
+}
+
+static inline float yCenterInRect(NSSize innerSize, NSRect outerRect, BOOL flipped)
+{
+  return MAX(NSMidY(outerRect) - innerSize.height/2.0, 0.0);
+}
+
+static inline float yBottomInRect(NSSize innerSize, NSRect outerRect, BOOL flipped)
+{
+  if( flipped )
+    return MAX(NSMaxY(outerRect) - innerSize.height, 0.0);
+  else
+    return NSMinY(outerRect);
+}
+
+static inline NSSize scaleProportionally(NSSize imageSize, NSRect canvasRect)
+{
+  float ratio;
+
+  // get the smaller ratio and scale the image size by it
+  ratio = MIN(NSWidth(canvasRect) / imageSize.width,
+                NSHeight(canvasRect) / imageSize.height);
+
+  imageSize.width *= ratio;
+  imageSize.height *= ratio;
+
+  return imageSize;
+}
+
+- (void) drawInteriorWithFrame: (NSRect)cellFrame inView: (NSView *)controlView
+{
+  NSImage *image;
+  NSPoint position;
+  BOOL is_flipped = [controlView isFlipped];
+
+  NSDebugLLog(@"NSImageCell", @"NSImageCell drawInteriorWithFrame called");
+
+  image = [self image];
+  if( !image )
+    return;
+
+  // leave room for the frame
+  cellFrame = NSInsetRect(cellFrame, xDist, yDist);
+
+  switch( [self imageScaling] )
+  {
+    case NSScaleProportionally:
+    {
+      NSDebugLLog(@"NSImageCell", @"NSScaleProportionally");
+      [image setScalesWhenResized:YES];
+      [image setSize: scaleProportionally(_original_image_size, cellFrame)];
+      break;
+    }
+    case NSScaleToFit:
+    {
+      NSDebugLLog(@"NSImageCell", @"NSScaleToFit");
+      [image setScalesWhenResized:YES];
+      [image setSize: cellFrame.size];
+      break;
+    }
+    case NSScaleNone:
+    {
+      NSDebugLLog(@"NSImageCell", @"NSScaleNone");
+      [image setScalesWhenResized:NO];
+      // don't let the image size overrun the space available
+      if( _original_image_size.width > cellFrame.size.width ||
+             _original_image_size.height > cellFrame.size.height )
+        [image setSize: cellFrame.size];
+      else
+        [image setSize: _original_image_size];
+      break;
+    }
+  }
+
+  switch( [self imageAlignment] )
+  {
+    case NSImageAlignLeft:
+      position.x = xLeftInRect([image size], cellFrame);
+      position.y = yCenterInRect([image size], cellFrame, is_flipped);
+      break;
+    case NSImageAlignRight:
+      position.x = xRightInRect([image size], cellFrame);
+      position.y = yCenterInRect([image size], cellFrame, is_flipped);
+      break;
+    case NSImageAlignCenter:
+      position.x = xCenterInRect([image size], cellFrame);
+      position.y = yCenterInRect([image size], cellFrame, is_flipped);
+      break;
+    case NSImageAlignTop:
+      position.x = xCenterInRect([image size], cellFrame);
+      position.y = yTopInRect([image size], cellFrame, is_flipped);
+      break;
+    case NSImageAlignBottom:
+      position.x = xCenterInRect([image size], cellFrame);
+      position.y = yBottomInRect([image size], cellFrame, is_flipped);
+      break;
+    case NSImageAlignTopLeft:
+      position.x = xLeftInRect([image size], cellFrame);
+      position.y = yTopInRect([image size], cellFrame, is_flipped);
+      break;
+    case NSImageAlignTopRight:
+      position.x = xRightInRect([image size], cellFrame);
+      position.y = yTopInRect([image size], cellFrame, is_flipped);
+      break;
+    case NSImageAlignBottomLeft:
+      position.x = xLeftInRect([image size], cellFrame);
+      position.y = yBottomInRect([image size], cellFrame, is_flipped);
+      break;
+    case NSImageAlignBottomRight:
+      position.x = xRightInRect([image size], cellFrame);
+      position.y = yBottomInRect([image size], cellFrame, is_flipped);
+      break;
+  }
+
+  // account for flipped views
+  if( is_flipped )
+    position.y += [image size].height;
+
+  // draw!
+  [image compositeToPoint: position operation: NSCompositeCopy];
+}
+
+- (id) copyWithZone: (NSZone *)zone
+{
+  NSImageCell *c = [super copyWithZone: zone];
+
+  c->_imageAlignment = _imageAlignment;
+  c->_frameStyle = _frameStyle;
+  c->_imageScaling = _imageScaling;
+  c->_original_image_size = _original_image_size;
+
+  return c;
+}
+
+//
+// NSCoding protocol
+//
+- (void) encodeWithCoder: (NSCoder *)aCoder
+{
+  [super encodeWithCoder: aCoder];
+
+  NSDebugLog(@"NSImageCell: start encoding");
+  [aCoder encodeValueOfObjCType: @encode(NSImageAlignment) at: &_imageAlignment];
+  [aCoder encodeValueOfObjCType: @encode(NSImageFrameStyle) at: &_frameStyle];
+  [aCoder encodeValueOfObjCType: @encode(NSImageScaling) at: &_imageScaling];
+  [aCoder encodeSize: _original_image_size];
+  NSDebugLog(@"NSImageCell: finish encoding");
+}
+
+- (id) initWithCoder: (NSCoder *)aDecoder
+{
+  [super initWithCoder: aDecoder];
+
+  NSDebugLog(@"NSImageCell: start decoding");
+  [aDecoder decodeValueOfObjCType: @encode(NSImageAlignment) at: &_imageAlignment];
+  [aDecoder decodeValueOfObjCType: @encode(NSImageFrameStyle) at: &_frameStyle];
+  [aDecoder decodeValueOfObjCType: @encode(NSImageScaling) at: &_imageScaling];
+  _original_image_size = [aDecoder decodeSize];
+  NSDebugLog(@"NSImageCell: finish decoding");
+
+  return self;
+}
+
+@end

Source/NSImageView.m

@@ -5,6 +5,8 @@
 
    Author: Ovidiu Predescu <ovidiu@net-community.com>
    Date: January 1998
+   Updated by: Jonathan Gapen <jagapen@smithlab.chem.wisc.edu>
+   Date: May 1999
    
    This file is part of the GNUstep GUI Library.
 
@@ -23,34 +25,121 @@
    Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#include <AppKit/NSDragging.h>
+#include <AppKit/NSImageCell.h>
 #include <AppKit/NSImageView.h>
 
 @implementation NSImageView
 
-- (void)setImage:(NSImage *)image
++ (Class) cellClass
 {
+  return [NSImageCell class];
 }
 
-- (void)setImageAlignment:(NSImageAlignment)align
+- (id) init
 {
+  return [self initWithFrame: NSZeroRect];
 }
 
-- (void)setImageScaling:(NSImageScaling)scaling
+- (id) initWithFrame: (NSRect)frame
 {
+  [super initWithFrame: frame];
+
+  // allocate the image cell
+  [self setCell: [[NSImageCell alloc] init]];
+
+  // set the default values
+  [self setImageAlignment: NSImageAlignCenter];
+  [self setImageFrameStyle: NSImageFrameNone];
+  [self setImageScaling: NSScaleProportionally];
+  [self setEditable: YES];
+
+  return self;
 }
 
-- (void)setImageFrameStyle:(NSImageFrameStyle)style
+- (void) setImage: (NSImage *)image
 {
+  [[self cell] setImage: image];
 }
 
-- (void)setEditable:(BOOL)flag
+- (void) setImageAlignment: (NSImageAlignment)align
 {
+  [[self cell] setImageAlignment: align];
 }
 
-- (NSImage *)image			{ return nil; }
-- (NSImageAlignment)imageAlignment	{ return 0; }
-- (NSImageScaling)imageScaling		{ return 0; }
-- (NSImageFrameStyle)imageFrameStyle	{ return 0; }
-- (BOOL)isEditable			{ return 0; }
+- (void) setImageScaling: (NSImageScaling)scaling
+{
+  [[self cell] setImageScaling: scaling];
+}
+
+- (void) setImageFrameStyle: (NSImageFrameStyle)style
+{
+  [[self cell] setImageFrameStyle: style];
+}
+
+- (void) setEditable: (BOOL)flag
+{
+  [[self cell] setEditable: flag];
+}
+
+- (NSImage *) image
+{
+  return [[self cell] image];
+}
+
+- (NSImageAlignment) imageAlignment
+{
+  return [[self cell] imageAlignment];
+}
+
+- (NSImageScaling) imageScaling
+{
+  return [[self cell] imageScaling];
+}
+
+- (NSImageFrameStyle) imageFrameStyle
+{
+  return [[self cell] imageFrameStyle];
+}
+
+- (BOOL) isEditable
+{
+  return [[self cell] isEditable];
+}
 
 @end
+
+@implementation NSImageView (NSDraggingDestination)
+
+- (unsigned int) draggingEntered: (id <NSDraggingInfo>)sender
+{
+  // FIX - should highlight to show that we are a valid target
+  return NSDragOperationNone;
+}
+
+- (void) draggingExited: (id <NSDraggingInfo>)sender
+{
+  // FIX - should remove highlighting
+}
+
+- (BOOL) prepareForDragOperation: (id <NSDraggingInfo>)sender
+{
+  if ([self isEditable])
+    return YES;
+  else
+    return NO;
+}
+
+- (BOOL) performDragOperation: (id <NSDraggingInfo>)sender
+{
+  // FIX - should copy image data into image cell here
+  return NO;
+}
+
+- (void) concludeDragOperation: (id <NSDraggingInfo>)sender
+{
+  // FIX - should update refresh image here
+}
+
+@end
+