From 986cccb800996f9760402cf9bf5d25e73b6d8a6a Mon Sep 17 00:00:00 2001 From: daboe01 Date: Sat, 12 Nov 2016 23:03:45 +0100 Subject: [PATCH 1/2] fixed: legacy scroller was not clickable under some circumstances --- AppKit/CPScroller.j | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AppKit/CPScroller.j b/AppKit/CPScroller.j index 98110ef5f..ebd54ac60 100644 --- a/AppKit/CPScroller.j +++ b/AppKit/CPScroller.j @@ -316,7 +316,7 @@ CPThemeStateScrollerKnobDark = CPThemeState("scroller-knob-dark"); // The ordering of these tests is important. We check the knob and // page rects first since they may overlap with the arrows. - if (![self hasThemeState:CPThemeStateSelected]) + if (![self hasThemeState:CPThemeStateSelected] && ![self hasThemeState:CPThemeStateScrollViewLegacy]) return CPScrollerNoPart; if (CGRectContainsPoint([self rectForPart:CPScrollerKnob], aPoint)) From 12b274ab434cc3b1758f415d9e7c3e17b5dc36ff Mon Sep 17 00:00:00 2001 From: daboe01 Date: Sun, 13 Nov 2016 22:55:29 +0100 Subject: [PATCH 2/2] formatting --- AppKit/CPScroller.j | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AppKit/CPScroller.j b/AppKit/CPScroller.j index ebd54ac60..c58e87a1d 100644 --- a/AppKit/CPScroller.j +++ b/AppKit/CPScroller.j @@ -316,7 +316,7 @@ CPThemeStateScrollerKnobDark = CPThemeState("scroller-knob-dark"); // The ordering of these tests is important. We check the knob and // page rects first since they may overlap with the arrows. - if (![self hasThemeState:CPThemeStateSelected] && ![self hasThemeState:CPThemeStateScrollViewLegacy]) + if (![self hasThemeState:CPThemeStateSelected] && ![self hasThemeState:CPThemeStateScrollViewLegacy]) return CPScrollerNoPart; if (CGRectContainsPoint([self rectForPart:CPScrollerKnob], aPoint))