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

* Source/GSGuiPrivate.h: New rounding rounding function

Browse source 
GSRoundTowardsInfinity which is simply floor(x+0.5)
* Source/NSBrowser.m:
* Source/NSSliderCell.m:
* Source/NSButtonCell.m:
* Source/NSClipView.m:
* Source/NSOutlineView.m:
* Source/NSRulerView.m:
Switch rint[f] to GSRoundTowardsInfinity


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@33539 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
ericwa 2011-07-12 21:12:22 +00:00
parent adca33937f
commit c7e05f2c7b
8 changed files with 45 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Source/NSRulerView.m
View file

@ -42,8 +42,7 @@
#import "AppKit/NSRulerView.h"
#import "AppKit/NSScrollView.h"
#import "AppKit/NSStringDrawing.h"
DEFINE_RINT_IF_MISSING
#import "GSGuiPrivate.h"
#define MIN_LABEL_DISTANCE 40
#define MIN_MARK_DISTANCE 5
@ -581,9 +580,9 @@ static NSMutableDictionary *units = nil;
}
/* calculate number of small marks in each bigger mark */
_marksToMidMark = rint([self _stepForIndex: convIndex + 1]);
_marksToMidMark = GSRoundTowardsInfinity([self _stepForIndex: convIndex + 1]);
_marksToBigMark = _marksToMidMark
* rint([self _stepForIndex: convIndex + 2]);
* GSRoundTowardsInfinity([self _stepForIndex: convIndex + 2]);
/* Calculate distance between labels.
It must not be less than MIN_LABEL_DISTANCE. */
@ -595,7 +594,7 @@ static NSMutableDictionary *units = nil;
}
/* number of small marks between two labels */
_marksToLabel = rint(_labelDistance / _markDistance);
_marksToLabel = GSRoundTowardsInfinity(_labelDistance / _markDistance);
/* format of labels */
if (_labelDistance / _unitToRuler >= 1)