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

More CGFloat, NSUInteger and NSInteger changes.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@36163 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fredkiefer 2013-02-17 22:44:47 +00:00
parent 6880e50086
commit 8793a644bd
20 changed files with 211 additions and 182 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Source/NSScroller.m
View file

@ -224,7 +224,7 @@ static float buttonsOffset = 1.0; // buttonsWidth = sw - 2*buttonsOffset
{
BOOL flag;
[aCoder encodeValueOfObjCType: @encode(unsigned int) at: &_arrowsPosition];
[aCoder encodeValueOfObjCType: @encode(NSUInteger) at: &_arrowsPosition];
flag = _scFlags.isEnabled;
[aCoder encodeValueOfObjCType: @encode(BOOL) at: &flag];
[aCoder encodeConditionalObject: _target];
@ -329,7 +329,7 @@ static float buttonsOffset = 1.0; // buttonsWidth = sw - 2*buttonsOffset
_doubleValue = 1.0;
}
[aDecoder decodeValueOfObjCType: @encode(unsigned int)
[aDecoder decodeValueOfObjCType: @encode(NSUInteger)
at: &_arrowsPosition];
[aDecoder decodeValueOfObjCType: @encode(BOOL) at: &flag];
_scFlags.isEnabled = flag;
@ -473,8 +473,8 @@ static float buttonsOffset = 1.0; // buttonsWidth = sw - 2*buttonsOffset
- (void) checkSpaceForParts
{
NSSize frameSize = _frame.size;
float size = (_scFlags.isHorizontal ? frameSize.width : frameSize.height);
int buttonsWidth = [[self class] scrollerWidth] - 2*buttonsOffset;
CGFloat size = (_scFlags.isHorizontal ? frameSize.width : frameSize.height);
CGFloat buttonsWidth = [[self class] scrollerWidth] - 2*buttonsOffset;
if (_arrowsPosition == NSScrollerArrowsNone)
{
@ -1145,10 +1145,10 @@ static float buttonsOffset = 1.0; // buttonsWidth = sw - 2*buttonsOffset
- (NSRect) rectForPart: (NSScrollerPart)partCode
{
NSRect scrollerFrame = _frame;
float x, y;
float width, height;
float buttonsWidth;
float buttonsSize;
CGFloat x, y;
CGFloat width, height;
CGFloat buttonsWidth;
CGFloat buttonsSize;
NSUsableScrollerParts usableParts;
NSInterfaceStyle interfaceStyle;
BOOL arrowsSameEnd = NO;
@ -1220,7 +1220,7 @@ static float buttonsOffset = 1.0; // buttonsWidth = sw - 2*buttonsOffset
slotHeight = height - (_arrowsPosition == NSScrollerArrowsNone
? 0 : buttonsSize);
knobHeight = _knobProportion * slotHeight;
knobHeight = (float)floor(knobHeight);
knobHeight = floor(knobHeight);
if (knobHeight < buttonsWidth)
knobHeight = buttonsWidth;