git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@5399 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
richard 1999-12-07 06:40:21 +00:00
parent b768de6402
commit f16e1bb031

View file

@ -41,8 +41,10 @@
+ (void) initialize + (void) initialize
{ {
if (self == [NSImageCell class]) if (self == [NSImageCell class])
{
[self setVersion: 1]; [self setVersion: 1];
} }
}
// //
// Instance methods // Instance methods
@ -148,22 +150,26 @@
[controlView unlockFocus]; [controlView unlockFocus];
} }
static inline float xLeftInRect(NSSize innerSize, NSRect outerRect) static inline float
xLeftInRect(NSSize innerSize, NSRect outerRect)
{ {
return NSMinX(outerRect); return NSMinX(outerRect);
} }
static inline float xCenterInRect(NSSize innerSize, NSRect outerRect) static inline float
xCenterInRect(NSSize innerSize, NSRect outerRect)
{ {
return MAX(NSMidX(outerRect) - (innerSize.width/2.0), 0.0); return MAX(NSMidX(outerRect) - (innerSize.width/2.0), 0.0);
} }
static inline float xRightInRect(NSSize innerSize, NSRect outerRect) static inline float
xRightInRect(NSSize innerSize, NSRect outerRect)
{ {
return MAX(NSMaxX(outerRect) - innerSize.width, 0.0); return MAX(NSMaxX(outerRect) - innerSize.width, 0.0);
} }
static inline float yTopInRect(NSSize innerSize, NSRect outerRect, BOOL flipped) static inline float
yTopInRect(NSSize innerSize, NSRect outerRect, BOOL flipped)
{ {
if (flipped) if (flipped)
return NSMinY(outerRect); return NSMinY(outerRect);
@ -171,12 +177,14 @@ static inline float yTopInRect(NSSize innerSize, NSRect outerRect, BOOL flipped)
return MAX(NSMaxY(outerRect) - innerSize.height, 0.0); return MAX(NSMaxY(outerRect) - innerSize.height, 0.0);
} }
static inline float yCenterInRect(NSSize innerSize, NSRect outerRect, BOOL flipped) static inline float
yCenterInRect(NSSize innerSize, NSRect outerRect, BOOL flipped)
{ {
return MAX(NSMidY(outerRect) - innerSize.height/2.0, 0.0); return MAX(NSMidY(outerRect) - innerSize.height/2.0, 0.0);
} }
static inline float yBottomInRect(NSSize innerSize, NSRect outerRect, BOOL flipped) rtatic inline float
yBottomInRect(NSSize innerSize, NSRect outerRect, BOOL flipped)
{ {
if (flipped) if (flipped)
return MAX(NSMaxY(outerRect) - innerSize.height, 0.0); return MAX(NSMaxY(outerRect) - innerSize.height, 0.0);
@ -184,7 +192,8 @@ static inline float yBottomInRect(NSSize innerSize, NSRect outerRect, BOOL flipp
return NSMinY(outerRect); return NSMinY(outerRect);
} }
static inline NSSize scaleProportionally(NSSize imageSize, NSRect canvasRect) static inline NSSize
scaleProportionally(NSSize imageSize, NSRect canvasRect)
{ {
float ratio; float ratio;