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

Move main part of affine transform code to base for MacOS-X compatibility

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@24133 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2006-11-19 11:32:51 +00:00
parent ae92dd8ca2
commit 65f7efa8fd
6 changed files with 61 additions and 331 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Source/NSView.m
View file

@ -306,16 +306,12 @@ GSSetDragTypes(NSView* obj, NSArray *types)
NSRect superviewsVisibleRect;
BOOL wasFlipped = _super_view->_rFlags.flipped_view;
NSAffineTransform *pMatrix = [_super_view _matrixToWindow];
NSAffineTransform *tMatrix = nil;
[_matrixToWindow takeMatrixFromTransform: pMatrix];
NSAffineTransformStruct ts = [pMatrix transformStruct];
/* prepend translation */
tMatrix = _matrixToWindow;
tMatrix->matrix.tX = NSMinX(_frame) * tMatrix->matrix.m11 +
NSMinY(_frame) * tMatrix->matrix.m21 + tMatrix->matrix.tX;
tMatrix->matrix.tY = NSMinX(_frame) * tMatrix->matrix.m12 +
NSMinY(_frame) * tMatrix->matrix.m22 + tMatrix->matrix.tY;
ts.tX = NSMinX(_frame) * ts.m11 + NSMinY(_frame) * ts.m21 + ts.tX;
ts.tY = NSMinX(_frame) * ts.m12 + NSMinY(_frame) * ts.m22 + ts.tY;
[_matrixToWindow setTransformStruct: ts];
/* prepend rotation */
if (_frameMatrix != nil)
@ -330,11 +326,14 @@ GSSetDragTypes(NSView* obj, NSArray *types)
* exactly overlays the original. To do that, we must translate
* the origin by the height of the view.
*/
flip->matrix.tY = _frame.size.height;
ts = [flip transformStruct];
ts.tY = _frame.size.height;
[flip setTransformStruct: ts];
(*preImp)(_matrixToWindow, preSel, flip);
}
(*preImp)(_matrixToWindow, preSel, _boundsMatrix);
[_matrixFromWindow takeMatrixFromTransform: _matrixToWindow];
ts = [_matrixToWindow transformStruct];
[_matrixFromWindow setTransformStruct: ts];
[_matrixFromWindow invert];
superviewsVisibleRect = [self convertRect: [_super_view visibleRect]