gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-30 04:20:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Tidyup conversion code

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@3779 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 1999-02-22 06:03:26 +00:00
parent ea86b25c57
commit f99c78791f
1 changed files with 76 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

87
Source/NSView.m
View file

@ -632,6 +632,9 @@ static SEL invalidateSel = @selector(_invalidateCoordinates);
if (!aView)
aView = [window contentView];
if (aView == self)
return aPoint;
NSAssert(window == [aView window], NSInvalidArgumentException);
#if 1
/*
@ -677,40 +680,83 @@ static SEL invalidateSel = @selector(_invalidateCoordinates);
- (NSPoint) convertPoint: (NSPoint)aPoint toView: (NSView*)aView
{
NSPoint new;
PSMatrix *matrix;
if (!aView)
aView = [window contentView];
if (aView == self)
return aPoint;
NSAssert(window == [aView window], NSInvalidArgumentException);
#if 1
matrix = [self _windowMatrix];
new = [matrix pointInMatrixSpace: aPoint];
matrix = [[aView _windowMatrix] copy];
[matrix inverse];
new = [matrix pointInMatrixSpace: new];
[matrix release];
return new;
#else
return [aView convertPoint: aPoint fromView: self];
#endif
}
- (NSRect) convertRect: (NSRect)aRect fromView: (NSView*)aView
{
NSRect r;
PSMatrix *matrix;
NSRect r;
/* Must belong to the same window */
if (aView && window != [aView window])
return NSZeroRect;
if (!aView)
aView = [window contentView];
if (aView == self)
return aRect;
NSAssert(window == [aView window], NSInvalidArgumentException);
#if 1
matrix = [aView _windowMatrix];
r.origin = [matrix pointInMatrixSpace: aRect.origin];
r.size = [matrix sizeInMatrixSpace: aRect.size];
matrix = [[self _windowMatrix] copy];
[matrix inverse];
r.origin = [matrix pointInMatrixSpace: r.origin];
r.size = [matrix sizeInMatrixSpace: r.size];
[matrix release];
#else
r = aRect;
r.origin = [self convertPoint: r.origin fromView: aView];
r.size = [self convertSize: r.size fromView: aView];
#endif
if ([aView isFlipped] != [self isFlipped])
r.origin.y -= r.size.height;
return r;
}
- (NSRect) convertRect: (NSRect)aRect toView: (NSView*)aView
{
NSRect r;
PSMatrix *matrix;
NSRect r;
/* Must belong to the same window */
if (aView && window != [aView window])
return NSZeroRect;
if (!aView)
aView = [window contentView];
if (aView == self)
return aRect;
NSAssert(window == [aView window], NSInvalidArgumentException);
#if 1
matrix = [self _windowMatrix];
r.origin = [matrix pointInMatrixSpace: aRect.origin];
r.size = [matrix sizeInMatrixSpace: aRect.size];
matrix = [[aView _windowMatrix] copy];
[matrix inverse];
r.origin = [matrix pointInMatrixSpace: r.origin];
r.size = [matrix sizeInMatrixSpace: r.size];
[matrix release];
#else
r = aRect;
r.origin = [self convertPoint: r.origin toView: aView];
r.size = [self convertSize: r.size toView: aView];
#endif
if ([aView isFlipped] != [self isFlipped])
r.origin.y -= r.size.height;
@ -719,11 +765,14 @@ static SEL invalidateSel = @selector(_invalidateCoordinates);
- (NSSize) convertSize: (NSSize)aSize fromView: (NSView*)aView
{
NSSize new;
PSMatrix* matrix;
NSSize new;
PSMatrix *matrix;
if (!aView)
aView = [window contentView];
if (aView == self)
return aSize;
NSAssert(window == [aView window], NSInvalidArgumentException);
#if 1
/*
@ -765,10 +814,26 @@ static SEL invalidateSel = @selector(_invalidateCoordinates);
- (NSSize) convertSize: (NSSize)aSize toView: (NSView*)aView
{
NSSize new;
PSMatrix *matrix;
if (!aView)
aView = [window contentView];
if (aView == self)
return aSize;
NSAssert(window == [aView window], NSInvalidArgumentException);
#if 1
matrix = [self _windowMatrix];
new = [matrix sizeInMatrixSpace: aSize];
matrix = [[aView _windowMatrix] copy];
[matrix inverse];
new = [matrix sizeInMatrixSpace: new];
[matrix release];
return new;
#else
return [aView convertSize: aSize fromView: self];
#endif
}
- (void) setPostsFrameChangedNotifications: (BOOL)flag