gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-22 16:10:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update to fix coordinate conversion between views.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@3585 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 1999-01-22 20:28:12 +00:00
parent 61333abe17
commit 96ba007614
2 changed files with 96 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Source/NSScroller.m
View file

@ -477,9 +477,10 @@ PSMatrix* matrix;
NSEventType eventType;
NSRect knobRect = {{0,0},{0,0}};
int periodCount = 0; // allows a forced update
NSArray* path = [self _pathBetweenSubview:self
NSMutableArray* path = [self _pathBetweenSubview:self
toSuperview:[window contentView]];
[path addObject: [window contentView]];
matrix = [self _concatenateMatricesInReverseOrderFromPath:path];
[matrix inverse];

160
Source/NSView.m
View file

@ -514,104 +514,132 @@ float sx, sy;
return NSZeroRect;
}
- (PSMatrix*)_concatenateMatricesInReverseOrderFromPath:(NSArray*)viewsPath
- (PSMatrix*) _concatenateMatricesInReverseOrderFromPath: (NSArray*)viewsPath
{
int i, count = [viewsPath count];
PSMatrix* matrix = [[PSMatrix new] autorelease];
unsigned i = [viewsPath count];
PSMatrix *matrix = [[PSMatrix new] autorelease];
NSView *parent;
BOOL wasFlipped;
BOOL isFlipped;
for (i = count - 1; i >= 0; i--)
{
NSView* view = [viewsPath objectAtIndex:i];
[matrix concatenateWith:view->frameMatrix];
[matrix concatenateWith:view->boundsMatrix];
}
if (i-- < 2)
return matrix;
parent = [viewsPath objectAtIndex: i];
wasFlipped = [parent isFlipped];
while (i-- > 0)
{
NSView *view = [viewsPath objectAtIndex: i];
return matrix;
[matrix concatenateWith: view->frameMatrix];
isFlipped = [view isFlipped];
if (isFlipped != wasFlipped)
{
PSMatrix *flip = nil;
float vals[6] = { 1, 0, 0, -1, 0, 1 };
vals[5] = parent->bounds.size.height;
flip = [PSMatrix matrixFrom: vals];
[matrix concatenateWith: flip];
}
[matrix concatenateWith: view->boundsMatrix];
parent = view;
wasFlipped = isFlipped;
}
return matrix;
}
- (NSArray*)_pathBetweenSubview:(NSView*)subview
toSuperview:(NSView*)_superview
- (NSMutableArray*) _pathBetweenSubview: (NSView*)subview
toSuperview: (NSView*)_superview
{
NSMutableArray* array = [NSMutableArray array];
NSView* view = subview;
NSMutableArray *array = [NSMutableArray array];
NSView *view = subview;
while (view && view != _superview)
{
[array addObject:view];
view = view->super_view;
}
while (view && view != _superview)
{
[array addObject:view];
view = view->super_view;
}
return array;
return array;
}
- (NSPoint)convertPoint:(NSPoint)aPoint fromView:(NSView*)aView
- (NSPoint) convertPoint: (NSPoint)aPoint fromView: (NSView*)aView
{
NSPoint new;
PSMatrix* matrix;
NSPoint new;
PSMatrix *matrix;
if (!aView)
aView = [window contentView];
if (!aView)
aView = [window contentView];
if ([self isDescendantOf:aView])
{
NSArray* path = [self _pathBetweenSubview:self toSuperview:aView];
if ([self isDescendantOf: aView])
{
NSMutableArray *path;
matrix = [self _concatenateMatricesInReverseOrderFromPath:path];
[matrix inverse];
new = [matrix pointInMatrixSpace:aPoint];
}
else
if ([aView isDescendantOf:self])
{
NSArray* path = [self _pathBetweenSubview:aView toSuperview:self];
path = [self _pathBetweenSubview: self toSuperview: aView];
[path addObject: aView];
matrix = [self _concatenateMatricesInReverseOrderFromPath:path];
[matrix inverse];
new = [matrix pointInMatrixSpace:aPoint];
}
else if ([aView isDescendantOf: self])
{
NSMutableArray *path;
matrix = [self _concatenateMatricesInReverseOrderFromPath:path];
new = [matrix pointInMatrixSpace:aPoint];
} // The views are not in the same hierarchy of views.
else // Convert the point to window from the other's view
{ // coordinates and then to our view coordinates.
new = [aView convertPoint:aPoint toView:nil];
new = [self convertPoint:new fromView:nil];
}
path = [self _pathBetweenSubview: aView toSuperview: self];
[path addObject: self];
matrix = [self _concatenateMatricesInReverseOrderFromPath: path];
new = [matrix pointInMatrixSpace: aPoint];
}
else
{
new = [aView convertPoint: aPoint toView: nil];
new = [self convertPoint: new fromView: nil];
}
return new;
return new;
}
- (NSPoint)convertPoint:(NSPoint)aPoint toView:(NSView *)aView
- (NSPoint) convertPoint: (NSPoint)aPoint toView: (NSView*)aView
{
if (!aView)
aView = [window contentView];
if (!aView)
aView = [window contentView];
return [aView convertPoint:aPoint fromView:self];
return [aView convertPoint: aPoint fromView: self];
}
- (NSRect)convertRect:(NSRect)aRect fromView:(NSView *)aView
- (NSRect) convertRect: (NSRect)aRect fromView: (NSView*)aView
{
NSRect r;
NSRect r;
if (aView && window != [aView window]) // Must belong to the
return NSZeroRect; // same window
/* Must belong to the same window */
if (aView && window != [aView window])
return NSZeroRect;
r = aRect;
r.origin = [self convertPoint:r.origin fromView:aView];
r.size = [self convertSize:r.size fromView:aView];
r = aRect;
r.origin = [self convertPoint: r.origin fromView: aView];
r.size = [self convertSize: r.size fromView: aView];
if ([aView isFlipped] != [self isFlipped])
r.origin.y -= r.size.height;
return r;
return r;
}
- (NSRect)convertRect:(NSRect)aRect toView:(NSView *)aView
- (NSRect) convertRect: (NSRect)aRect toView: (NSView*)aView
{
NSRect r;
NSRect r;
if (aView && window != [aView window]) // Must belong to the
return NSZeroRect; // same window
/* Must belong to the same window */
if (aView && window != [aView window])
return NSZeroRect;
r = aRect;
r.origin = [self convertPoint:r.origin toView:aView];
r.size = [self convertSize:r.size toView:aView];
r = aRect;
r.origin = [self convertPoint: r.origin toView: aView];
r.size = [self convertSize: r.size toView: aView];
if ([aView isFlipped] != [self isFlipped])
r.origin.y -= r.size.height;
return r;
return r;
}
- (PSMatrix*)_concatenateBoundsMatricesInReverseOrderFromPath:(NSArray*)viewsPath