fix: shift key + scroll should scroll the ui
This commit is contained in:
1 parent
3420a60332
commit
d64a6a520a
1 file changed
+22
-4
@@ -29,9 +29,9 @@ class ThumbnailsView: NSVisualEffectView {
|
|||||||
guard window.shouldShowTheUser else { continue }
|
guard window.shouldShowTheUser else { continue }
|
||||||
let view = ThumbnailsView.recycledViews[index]
|
let view = ThumbnailsView.recycledViews[index]
|
||||||
view.updateRecycledCellWithNewContent(window,
|
view.updateRecycledCellWithNewContent(window,
|
||||||
{ () -> Void in App.app.focusSelectedWindow(window) },
|
{ () -> Void in App.app.focusSelectedWindow(window) },
|
||||||
{ () -> Void in Windows.updateFocusedWindowIndex(index) },
|
{ () -> Void in Windows.updateFocusedWindowIndex(index) },
|
||||||
height, screen)
|
height, screen)
|
||||||
let width = view.frame.size.width
|
let width = view.frame.size.width
|
||||||
if (currentX + width).rounded(.down) > widthMax {
|
if (currentX + width).rounded(.down) > widthMax {
|
||||||
currentX = CGFloat(0)
|
currentX = CGFloat(0)
|
||||||
@@ -87,6 +87,9 @@ class ThumbnailsView: NSVisualEffectView {
|
|||||||
}
|
}
|
||||||
|
|
||||||
class ScrollView: NSScrollView {
|
class ScrollView: NSScrollView {
|
||||||
|
// overriding scrollWheel() turns this false; we force it to be true to enable responsive scrolling
|
||||||
|
override class var isCompatibleWithResponsiveScrolling: Bool { true }
|
||||||
|
|
||||||
convenience init() {
|
convenience init() {
|
||||||
self.init(frame: .zero)
|
self.init(frame: .zero)
|
||||||
documentView = FlippedView(frame: .zero)
|
documentView = FlippedView(frame: .zero)
|
||||||
@@ -94,9 +97,24 @@ class ScrollView: NSScrollView {
|
|||||||
hasVerticalScroller = true
|
hasVerticalScroller = true
|
||||||
scrollerStyle = .overlay
|
scrollerStyle = .overlay
|
||||||
scrollerKnobStyle = .light
|
scrollerKnobStyle = .light
|
||||||
|
horizontalScrollElasticity = .none
|
||||||
|
usesPredominantAxisScrolling = true
|
||||||
forceOverlayStyle()
|
forceOverlayStyle()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// holding shift and using the scrolling wheel will generate a horizontal movement
|
||||||
|
// shift can be part of shortcuts so we force shift scrolls to be vertical
|
||||||
|
override func scrollWheel(with event: NSEvent) {
|
||||||
|
if event.modifierFlags.contains(.shift) && event.scrollingDeltaY == 0 {
|
||||||
|
let cgEvent = event.cgEvent!
|
||||||
|
cgEvent.setDoubleValueField(.scrollWheelEventDeltaAxis1, value: cgEvent.getDoubleValueField(.scrollWheelEventDeltaAxis2))
|
||||||
|
cgEvent.setDoubleValueField(.scrollWheelEventDeltaAxis2, value: 0)
|
||||||
|
super.scrollWheel(with: NSEvent(cgEvent: cgEvent)!)
|
||||||
|
} else {
|
||||||
|
super.scrollWheel(with: event)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// force overlay style after a change in System Preference > General > Show scroll bars
|
// force overlay style after a change in System Preference > General > Show scroll bars
|
||||||
private func forceOverlayStyle() {
|
private func forceOverlayStyle() {
|
||||||
NotificationCenter.default.addObserver(forName: NSScroller.preferredScrollerStyleDidChangeNotification, object: nil, queue: nil) { [weak self] _ in
|
NotificationCenter.default.addObserver(forName: NSScroller.preferredScrollerStyleDidChangeNotification, object: nil, queue: nil) { [weak self] _ in
|
||||||
@@ -107,4 +125,4 @@ class ScrollView: NSScrollView {
|
|||||||
|
|
||||||
class FlippedView: NSView {
|
class FlippedView: NSView {
|
||||||
override var isFlipped: Bool { true }
|
override var isFlipped: Bool { true }
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user