Commit 36400c7d authored by Alan Third's avatar Alan Third

Fix mouse-scrollbar offset on GNUstep and old macOS (bug#29053)

* src/nsterm.m (EmacsScroller::mouseDown,
EmacsScroller::mouseDragged): Take scroller buttons into account when
calculating scroller knob position.
parent 04bc1410
......@@ -8912,10 +8912,20 @@ - (void)mouseDown: (NSEvent *)e
}
last_mouse_offset = kloc;
if (part != NSScrollerKnob)
/* this is a slot click on GNUstep: go straight there */
/* if knob, tell emacs a location offset by knob pos
(to indicate top of handle) */
if (part == NSScrollerKnob)
pos = (loc - last_mouse_offset);
else
/* else this is a slot click on GNUstep: go straight there */
pos = loc;
/* If there are buttons in the scroller area, we need to
recalculate pos as emacs expects the scroller slot to take up
the entire available length. */
if (length != pixel_length)
pos = pos * pixel_length / length;
/* send a fake mouse-up to super to preempt modal -trackKnob: mode */
fake_event = [NSEvent mouseEventWithType: NSEventTypeLeftMouseUp
location: [e locationInWindow]
......@@ -8980,6 +8990,13 @@ - (void)mouseDragged: (NSEvent *)e
}
pos = (loc - last_mouse_offset);
/* If there are buttons in the scroller area, we need to
recalculate pos as emacs expects the scroller slot to take up
the entire available length. */
if (length != pixel_length)
pos = pos * pixel_length / length;
[self sendScrollEventAtLoc: pos fromEvent: e];
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment