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

Slight cleanup to last rounding fix

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/branches/gnustep_testplant_branch@40249 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Marcian Lytwyn 2016-12-01 17:48:44 +00:00
parent 3d23c53d98
commit 61e111f14f
1 changed files with 40 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

50
Source/NSView.m
View file

@ -94,6 +94,32 @@
#define nKV(O) ((GSIArray)(O->_nextKeyView)) #define nKV(O) ((GSIArray)(O->_nextKeyView))
#define pKV(O) ((GSIArray)(O->_previousKeyView)) #define pKV(O) ((GSIArray)(O->_previousKeyView))
#ifdef fpclassify
#define GSIsNAN(n) (fpclassify(n) == FP_NAN)
#define GSIsInf(n) (fpclassify(n) == FP_INFINITE)
#else
#warning C99 macro fpclassify not found: Cannot determine NAN/Inf float-values
#define GSIsNAN(n) (0)
#define GSIsInf(n) (0)
#endif
#define GSIsNegPoint(point) ((point.x < 0.0) || (point.y < 0.0))
#define GSIsNegSize(size) ((size.width < 0.0) || (size.height < 0.0))
#define GSIsNanPoint(point) (GSIsNAN(point.x) || GSIsNAN(point.y))
#define GSIsNanSize(size) (GSIsNAN(size.width) || GSIsNAN(size.height))
#define GSIsInfPoint(point) (GSIsInf(point.x) || GSIsInf(point.y))
#define GSIsInfSize(size) (GSIsInf(size.width) || GSIsInf(size.height))
#define GSIsNegRect(rect) (GSIsNegPoint(rect.origin) || GSIsNegSize(rect.size))
#define GSIsNanRect(rect) (GSIsNanPoint(rect.origin) || GSIsNanSize(rect.size))
#define GSIsInfRect(rect) (GSIsInfPoint(rect.origin) || GSIsInfSize(rect.size))
#define GSIsOOBValue(value) (GSIsNAN(value) || GSIsInf(value))
#define GSIsOOBPoint(point) (GSIsNanPoint(point) || GSIsInfPoint(point))
#define GSIsOOBSize(size) (GSIsNanSize(size) || GSIsInfSize(size))
#define GSIsOOBRect(rect) (GSIsNanRect(rect) || GSIsInfRect(rect) || GSIsNegRect(rect))
/* Variable tells this view and subviews that we're printing. Not really /* Variable tells this view and subviews that we're printing. Not really
a class variable because we want it visible to subviews also a class variable because we want it visible to subviews also
*/ */
@ -606,6 +632,7 @@ GSSetDragTypes(NSView* obj, NSArray *types)
_frame = frameRect; // Set frame rectangle _frame = frameRect; // Set frame rectangle
_bounds.origin = NSZeroPoint; // Set bounds rectangle _bounds.origin = NSZeroPoint; // Set bounds rectangle
_bounds.size = _frame.size; _bounds.size = _frame.size;
_autoresizingFrameError = NSZeroRect;
// _frameMatrix = [NSAffineTransform new]; // Map fromsuperview to frame // _frameMatrix = [NSAffineTransform new]; // Map fromsuperview to frame
// _boundsMatrix = [NSAffineTransform new]; // Map from superview to bounds // _boundsMatrix = [NSAffineTransform new]; // Map from superview to bounds
@ -1140,9 +1167,9 @@ static NSSize _computeScale(NSSize fs, NSSize bs)
{ {
NSSize scale; NSSize scale;
if (bs.width == 0) if (GSRoundTowardsInfinity(bs.width) == 0)
{ {
if (fs.width == 0) if (GSRoundTowardsInfinity(fs.width) == 0)
scale.width = 1; scale.width = 1;
else else
scale.width = FLT_MAX; scale.width = FLT_MAX;
@ -1151,9 +1178,9 @@ static NSSize _computeScale(NSSize fs, NSSize bs)
{ {
scale.width = fs.width / bs.width; scale.width = fs.width / bs.width;
} }
if (bs.height == 0) if (GSRoundTowardsInfinity(bs.height) == 0)
{ {
if (fs.height == 0) if (GSRoundTowardsInfinity(fs.height) == 0)
scale.height = 1; scale.height = 1;
else else
scale.height = FLT_MAX; scale.height = FLT_MAX;
@ -1976,12 +2003,12 @@ static void autoresize(CGFloat oldContainerSize,
BOOL sizeFlexible, BOOL sizeFlexible,
BOOL maxMarginFlexible) BOOL maxMarginFlexible)
{ {
const CGFloat change = floor(newContainerSize) - floor(oldContainerSize); const CGFloat change = (newContainerSize) - (oldContainerSize);
const CGFloat oldContentSize = floor(*contentSizeInOut); const CGFloat oldContentSize = (*contentSizeInOut);
const CGFloat oldContentPosition = floor(*contentPositionInOut); const CGFloat oldContentPosition = (*contentPositionInOut);
CGFloat flexibleSpace = 0.0; CGFloat flexibleSpace = 0.0;
// See how much flexible space we have to distrube the change over // See how much flexible space we have to distribute the change over
if (sizeFlexible) if (sizeFlexible)
flexibleSpace += oldContentSize; flexibleSpace += oldContentSize;
@ -1992,7 +2019,10 @@ static void autoresize(CGFloat oldContainerSize,
if (maxMarginFlexible) if (maxMarginFlexible)
flexibleSpace += oldContainerSize - oldContentPosition - oldContentSize; flexibleSpace += oldContainerSize - oldContentPosition - oldContentSize;
// Watch for TINY double precision numbers - otherwise the divide in the else
// case will cause an Inf result for changePerPoint...
flexibleSpace = GSRoundTowardsInfinity(flexibleSpace);
if (flexibleSpace <= 0.0) if (flexibleSpace <= 0.0)
{ {
/** /**
@ -2053,7 +2083,7 @@ static void autoresize(CGFloat oldContainerSize,
newFrame.size.height -= _autoresizingFrameError.size.height; newFrame.size.height -= _autoresizingFrameError.size.height;
} }
superViewFrameSize = NSMakeSize(0,0); superViewFrameSize = NSZeroSize;
if (_super_view) if (_super_view)
superViewFrameSize = [_super_view frame].size; superViewFrameSize = [_super_view frame].size;