gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-25 06:51:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge with trunk revision 40072

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/branches/gnustep_testplant_branch@40133 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Marcian Lytwyn 2016-10-05 22:33:28 +00:00
parent 8bdc94322b
commit 80883d716e
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Source/NSToolbar.m
View file

@ -423,7 +423,7 @@ static GSValidationCenter *vc = nil;
{ {
GSValidationObject *vobj; GSValidationObject *vobj;
NSMutableArray *observersWindow; NSMutableArray *observersWindow;
NSMutableArray *windows; NSArray *windows;
NSEnumerator *e; NSEnumerator *e;
NSWindow *w; NSWindow *w;

16
Source/NSView.m
View file

@ -1669,6 +1669,8 @@ static NSSize _computeScale(NSSize fs, NSSize bs)
- (NSRect) centerScanRect: (NSRect)aRect - (NSRect) centerScanRect: (NSRect)aRect
{ {
NSAffineTransform *matrix; NSAffineTransform *matrix;
CGFloat x_org;
CGFloat y_org;
/* /*
* Hmm - we assume that the windows coordinate system is centered on the * Hmm - we assume that the windows coordinate system is centered on the
@ -1683,10 +1685,12 @@ static NSSize _computeScale(NSSize fs, NSSize bs)
aRect.size.height = -aRect.size.height; aRect.size.height = -aRect.size.height;
} }
x_org = aRect.origin.x;
y_org = aRect.origin.y;
aRect.origin.x = GSRoundTowardsInfinity(aRect.origin.x); aRect.origin.x = GSRoundTowardsInfinity(aRect.origin.x);
aRect.origin.y = GSRoundTowardsInfinity(aRect.origin.y); aRect.origin.y = [self isFlipped] ? GSRoundTowardsNegativeInfinity(aRect.origin.y) : GSRoundTowardsInfinity(aRect.origin.y);
aRect.size.width = GSRoundTowardsInfinity(aRect.size.width); aRect.size.width = GSRoundTowardsInfinity(aRect.size.width + (x_org - aRect.origin.x) / 2.0);
aRect.size.height = GSRoundTowardsInfinity(aRect.size.height); aRect.size.height = GSRoundTowardsInfinity(aRect.size.height + (y_org - aRect.origin.y) / 2.0);
matrix = [self _matrixFromWindow]; matrix = [self _matrixFromWindow];
aRect.origin = [matrix transformPoint: aRect.origin]; aRect.origin = [matrix transformPoint: aRect.origin];
@ -2578,8 +2582,8 @@ static void autoresize(CGFloat oldContainerSize,
* If the rect we are going to display contains the _invalidRect * If the rect we are going to display contains the _invalidRect
* then we can empty _invalidRect. Do this before the drawing, * then we can empty _invalidRect. Do this before the drawing,
* as drawRect: may change this value. * as drawRect: may change this value.
* If the drawn rectangle cuts off a complete part of the * FIXME: If the drawn rectangle cuts of a complete part of the
* _invalidRect, we should remove that part. * _invalidRect, we should try to reduce this.
*/ */
if (NSEqualRects(aRect, NSUnionRect(neededRect, aRect)) == YES) if (NSEqualRects(aRect, NSUnionRect(neededRect, aRect)) == YES)
{ {
@ -4543,7 +4547,7 @@ static NSView* findByTag(NSView *view, NSInteger aTag, NSUInteger *level)
viewIsPrinting = nil; viewIsPrinting = nil;
} }
/* An exception occured while printing. Clean up */ /* An exception occurred while printing. Clean up */
- (void) _cleanupPrinting - (void) _cleanupPrinting
{ {
[self _invalidateCoordinates]; [self _invalidateCoordinates];