gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-22 13:10:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix scroller knob jump

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@3661 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 1999-02-05 06:44:40 +00:00
parent 77c8c6a28d
commit 6fb1e83973
2 changed files with 33 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Fri Feb 5 6:00:00 1999 Richard Frith-Macdonald <richard@brainstorm.co.uk>
* Source/NSScroller.m: ([-knobRect:]) Correctd code so that the knob
doesn't jump if you click on it.
Thu Feb 4 18:50:00 1999 Richard Frith-Macdonald <richard@brainstorm.co.uk>
* Source/NSScroller.m: More fixes by Benhur-de-Oliveira.Stein@imag.fr

31
Source/NSScroller.m
View file

@ -510,7 +510,7 @@ static BOOL preCalcValues = NO;
_hitPart = NSScrollerNoPart;
}
- (void)trackKnob: (NSEvent*)theEvent
- (void) trackKnob: (NSEvent*)theEvent
{
unsigned int eventMask = NSLeftMouseDownMask | NSLeftMouseUpMask
| NSLeftMouseDraggedMask | NSMouseMovedMask
@ -519,6 +519,8 @@ static BOOL preCalcValues = NO;
NSPoint point, apoint;
float oldFloatValue = _floatValue;
float floatValue;
float xoffset = 0;
float yoffset = 0;
NSDate *theDistantFuture = [NSDate distantFuture];
NSEventType eventType;
NSRect knobRect = {{0,0},{0,0}};
@ -526,6 +528,27 @@ static BOOL preCalcValues = NO;
[self _preCalcParts]; // pre calc scroller parts
preCalcValues = YES;
knobRect = [self rectForPart: NSScrollerKnob];
if (_hitPart == NSScrollerKnob)
{
apoint = [theEvent locationInWindow];
point = [self convertPoint: apoint fromView: nil];
if (_isHorizontal)
{
if (point.x != knobRect.origin.x + knobRect.size.width/2)
{
xoffset = knobRect.origin.x + knobRect.size.width/2 - point.x;
}
}
else
{
if (point.y != knobRect.origin.y + knobRect.size.height/2)
{
yoffset = knobRect.origin.y + knobRect.size.height/2 - point.y;
}
}
}
_hitPart = NSScrollerKnob;
// set periodic events rate to achieve max of ~30fps
@ -547,7 +570,9 @@ static BOOL preCalcValues = NO;
if (periodCount == 6)
apoint = [window mouseLocationOutsideOfEventStream];
point = [self convertPoint:apoint fromView:nil];
point = [self convertPoint: apoint fromView: nil];
point.x += xoffset;
point.y += yoffset;
if (point.x != knobRect.origin.x || point.y != knobRect.origin.y)
{
@ -703,7 +728,7 @@ static BOOL preCalcValues = NO;
NSRectFill(rect);
}
- (NSRect)rectForPart: (NSScrollerPart)partCode
- (NSRect) rectForPart: (NSScrollerPart)partCode
{
NSRect scrollerFrame = frame;
float x = 1, y = 1, width = 0, height = 0, floatValue;