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

Replaced _rFlags.flipped_view use with -isFlipped and deprecated

Browse source 
_rFlagsType.flipped_view.
Still needs some work to automatically invalidate coordinates when the 
flipping changes e.g. between two drawing sessions.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@31233 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
qmathe 2010-09-03 08:21:52 +00:00
parent 3d9f597bca
commit 7c75329e42
6 changed files with 38 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Source/NSView.m
View file

@ -306,7 +306,7 @@ GSSetDragTypes(NSView* obj, NSArray *types)
else
{
NSRect superviewsVisibleRect;
BOOL wasFlipped = _super_view->_rFlags.flipped_view;
BOOL wasFlipped = [_super_view isFlipped];
NSAffineTransform *pMatrix = [_super_view _matrixToWindow];
NSAffineTransformStruct ts = [pMatrix transformStruct];
@ -321,7 +321,7 @@ GSSetDragTypes(NSView* obj, NSArray *types)
(*preImp)(_matrixToWindow, preSel, _frameMatrix);
}
if (_rFlags.flipped_view != wasFlipped)
if ([self isFlipped] != wasFlipped)
{
/*
* The flipping process must result in a coordinate system that
@ -604,9 +604,6 @@ GSSetDragTypes(NSView* obj, NSArray *types)
//_nextKeyView = 0;
//_previousKeyView = 0;
// cache as optimization
_rFlags.flipped_view = [self isFlipped];
return self;
}
@ -1953,7 +1950,7 @@ convert_rect_using_matrices(NSRect aRect, NSAffineTransform *matrix1,
}
if (_autoresizingMask & (NSViewMaxYMargin | NSViewMinYMargin))
{
if (_super_view && _super_view->_rFlags.flipped_view == YES)
if (_super_view && [_super_view isFlipped])
{
if (_autoresizingMask & NSViewMaxYMargin)
{
@ -2014,7 +2011,7 @@ convert_rect_using_matrices(NSRect aRect, NSAffineTransform *matrix1,
@"\t frame %@, flip %d",
NSStringFromRect(wrect),
self, _window, NSStringFromRect([_window frame]),
NSStringFromRect(_frame),_rFlags.flipped_view);
NSStringFromRect(_frame), [self isFlipped]);
if (viewIsPrinting == nil)
{
[_window->_rectsBeingDrawn addObject: [NSValue valueWithRect: wrect]];
@ -2110,7 +2107,7 @@ convert_rect_using_matrices(NSRect aRect, NSAffineTransform *matrix1,
/* Tell backends that images are drawn upside down. Obsolete?
This is needed when a backend is able to handle full image transformation. */
GSWSetViewIsFlipped(ctxt, _rFlags.flipped_view);
GSWSetViewIsFlipped(ctxt, [self isFlipped]);
}
- (void) _setIgnoresBacking: (BOOL) flag
@ -3362,7 +3359,7 @@ static NSView* findByTag(NSView *view, int aTag, unsigned *level)
*/
- (BOOL) mouse: (NSPoint)aPoint inRect: (NSRect)aRect
{
return NSMouseInRect (aPoint, aRect, _rFlags.flipped_view);
return NSMouseInRect (aPoint, aRect, [self isFlipped]);
}
- (BOOL) performKeyEquivalent: (NSEvent*)theEvent
@ -4568,8 +4565,6 @@ static NSView* findByTag(NSView *view, int aTag, unsigned *level)
* _previousKeyView = 0;
*/
_rFlags.flipped_view = [self isFlipped];
// previous and next key views...
prevKeyView = [aDecoder decodeObjectForKey: @"NSPreviousKeyView"];
nextKeyView = [aDecoder decodeObjectForKey: @"NSNextKeyView"];
@ -4653,8 +4648,6 @@ static NSView* findByTag(NSView *view, int aTag, unsigned *level)
[self setNextKeyView: [aDecoder decodeObject]];
[[aDecoder decodeObject] setNextKeyView: self];
_rFlags.flipped_view = [self isFlipped];
[aDecoder decodeValueOfObjCType: @encode(id) at: &subs];
NSDebugLLog(@"NSView", @"NSView: finish decoding\n");