Author: mlytwyn
Date: Fri Sep 11 23:41:13 2015
New Revision: 38984
URL: http://svn.gna.org/viewcvs/gnustep?rev=38984&view=rev
Log:
Reverting to change prior to Doug/Paul/Marcian changes - flicker problem exists
but clears on toggle of scaled/unscaled modes
Modified:
libs/gui/branches/gnustep_testplant_branch/Source/NSView.m
Modified: libs/gui/branches/gnustep_testplant_branch/Source/NSView.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Source/NSView.m?rev=38984&r1=38983&r2=38984&view=diff
==============================================================================
--- libs/gui/branches/gnustep_testplant_branch/Source/NSView.m (original)
+++ libs/gui/branches/gnustep_testplant_branch/Source/NSView.m Fri Sep 11
23:41:13 2015
@@ -78,9 +78,6 @@
#import "GSBindingHelpers.h"
#import "GSGuiPrivate.h"
#import "NSViewPrivate.h"
-
-#define USE_INVALID_RECT_CLEANUP
-
/*
* We need a fast array that can store objects without retain/release ...
@@ -2548,9 +2545,6 @@
flush = YES;
[_window disableFlushWindow];
aRect = NSIntersectionRect(aRect, visibleRect);
-#if defined(USE_INVALID_RECT_CLEANUP)
- aRect = NSIntegralRect(aRect);
-#endif
neededRect = NSIntersectionRect(_invalidRect, visibleRect);
/*
@@ -2560,52 +2554,11 @@
* If the drawn rectangle cuts off a complete part of the
* _invalidRect, we should remove that part.
*/
-#if defined(USE_INVALID_RECT_CLEANUP)
- if (NSEqualRects(aRect, NSUnionRect(neededRect, aRect)) == YES ||
neededRect.size.width < 1 || neededRect.size.height < 1)
-#else
if (NSEqualRects(aRect, NSUnionRect(neededRect, aRect)) == YES)
-#endif
{
_invalidRect = NSZeroRect;
_rFlags.needs_display = NO;
}
-#if defined(USE_INVALID_RECT_CLEANUP)
- // Testplant-MAL-2015-07-08: keeping testplant branch code...
- else
- {
- NSRectEdge sliceEdge = NSNotFound;
- float distance = 0;
-
- // check that intersection of aRect and _invalidRect either has an
equal height or width to _invalidRect
- // eg, if they are equal heights, we might be a slice on the left or
right side
- NSRect invalidAndRedrawn = NSIntersectionRect(aRect, neededRect);
- if ( invalidAndRedrawn.size.height == neededRect.size.height ) {
- // then check that aRect contains one of the side (corner?) points
of _invalidRect (inclusive)
- if ( NSPointInRect(NSMakePoint(NSMinX(neededRect),
NSMidY(neededRect)), aRect) ) {
- sliceEdge = NSMinXEdge;
- distance = invalidAndRedrawn.size.width;
- } else if ( NSPointInRect(NSMakePoint(NSMaxX(neededRect),
NSMidY(neededRect)), aRect) ) {
- sliceEdge = NSMaxXEdge;
- distance = invalidAndRedrawn.size.width;
- }
- } else if ( invalidAndRedrawn.size.width == neededRect.size.width
) {
- if ( NSPointInRect(NSMakePoint(NSMidX(neededRect),
NSMinY(neededRect)), aRect) ) {
- sliceEdge = NSMinYEdge;
- distance = invalidAndRedrawn.size.height;
- } else if ( NSPointInRect(NSMakePoint(NSMidX(neededRect),
NSMaxY(neededRect)), aRect) ) {
- sliceEdge = NSMaxYEdge;
- distance = invalidAndRedrawn.size.height;
- }
- }
-
- // remove the drawn area from _invalidRect
- if ( sliceEdge != NSNotFound && fabsf(distance) >= 1 ) {
- NSRect newInvalid;
- NSDivideRect(_invalidRect, 0, &newInvalid, distance, sliceEdge);
- _invalidRect = newInvalid;
- }
- }
-#endif
}
if (NSIsEmptyRect(aRect) == NO)
@@ -2616,9 +2569,6 @@
[self _lockFocusInContext: context inRect: aRect];
[self drawRect: aRect];
[self unlockFocusNeedsFlush: flush];
-#if !defined(USE_INVALID_RECT_CLEANUP)
- _rFlags.needs_display = NO;
-#endif
}
/*
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
