mirror of
https://github.com/TomHarte/CLK.git
synced 2025-08-07 23:25:00 +00:00
Rename protocol method.
This commit is contained in:
@@ -787,13 +787,13 @@ class MachineDocument:
|
|||||||
return subview == self.volumeView || subview == self.optionsView
|
return subview == self.volumeView || subview == self.optionsView
|
||||||
}
|
}
|
||||||
|
|
||||||
internal func scanTargetViewDidShowOSMouseCursor(_ view: CSScanTargetView) {
|
internal func scanTargetViewDidMouseoverSubviews(_ view: CSScanTargetView) {
|
||||||
// The OS mouse cursor became visible, so show the volume controls.
|
// The OS mouse cursor became visible, so show the options.
|
||||||
optionsFader.animateIn()
|
optionsFader.animateIn()
|
||||||
}
|
}
|
||||||
|
|
||||||
internal func scanTargetViewWouldHideOSMouseCursor(_ view: CSScanTargetView) {
|
internal func scanTargetViewWouldHideOSMouseCursor(_ view: CSScanTargetView) {
|
||||||
// The OS mouse cursor will be hidden, so hide the volume controls.
|
// The OS mouse cursor will be hidden, so hide the options if visible.
|
||||||
optionsFader.animateOut(delay: 0.0)
|
optionsFader.animateOut(delay: 0.0)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -77,7 +77,7 @@
|
|||||||
Announces that the OS mouse cursor is now being displayed again, after having been invisible.
|
Announces that the OS mouse cursor is now being displayed again, after having been invisible.
|
||||||
@param view The view making the announcement.
|
@param view The view making the announcement.
|
||||||
*/
|
*/
|
||||||
- (void)scanTargetViewDidShowOSMouseCursor:(nonnull CSScanTargetView *)view;
|
- (void)scanTargetViewDidMouseoverSubviews:(nonnull CSScanTargetView *)view;
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
Announces that the OS mouse cursor would now be hidden; 'would' means that if this is not
|
Announces that the OS mouse cursor would now be hidden; 'would' means that if this is not
|
||||||
|
@@ -306,7 +306,7 @@ static CVReturn DisplayLinkCallback(__unused CVDisplayLinkRef displayLink, const
|
|||||||
[self scheduleMouseHideAfter:standardMouseHideInterval];
|
[self scheduleMouseHideAfter:standardMouseHideInterval];
|
||||||
}
|
}
|
||||||
if(event.trackingArea == _subviewTrackingArea && !_mouseIsCaptured) {
|
if(event.trackingArea == _subviewTrackingArea && !_mouseIsCaptured) {
|
||||||
[self.responderDelegate scanTargetViewDidShowOSMouseCursor:self];
|
[self.responderDelegate scanTargetViewDidMouseoverSubviews:self];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -339,7 +339,7 @@ static CVReturn DisplayLinkCallback(__unused CVDisplayLinkRef displayLink, const
|
|||||||
_subviewTrackingArea &&
|
_subviewTrackingArea &&
|
||||||
NSPointInRect([self convertPoint:event.locationInWindow fromView:nil], _subviewTrackingArea.rect)
|
NSPointInRect([self convertPoint:event.locationInWindow fromView:nil], _subviewTrackingArea.rect)
|
||||||
) {
|
) {
|
||||||
[self.responderDelegate scanTargetViewDidShowOSMouseCursor:self];
|
[self.responderDelegate scanTargetViewDidMouseoverSubviews:self];
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// Mouse capture is on, so move the cursor back to the middle of the window, and
|
// Mouse capture is on, so move the cursor back to the middle of the window, and
|
||||||
|
Reference in New Issue
Block a user