Browse Source

Minor change to scroller.

master
Abhishek Banthia 9 months ago
parent
commit
f5c661361f
  1. 12
      Clocker/Clocker/en.lproj/Panel.xib
  2. 4
      Clocker/Panel/ParentPanelController+ModernSlider.swift
  3. 2
      Clocker/Panel/Rate Controller/UpcomingEventView.swift

12
Clocker/Clocker/en.lproj/Panel.xib

@ -335,8 +335,8 @@
</subviews>
<color key="backgroundColor" name="systemIndigoColor" catalog="System" colorSpace="catalog"/>
</clipView>
<scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" focusRingType="none" verticalHuggingPriority="750" horizontal="YES" id="8II-oP-xbd" customClass="ThinScroller" customModule="Clocker" customModuleProvider="target">
<rect key="frame" x="-100" y="-100" width="340" height="16"/>
<scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" focusRingType="none" verticalHuggingPriority="750" controlSize="mini" horizontal="YES" id="8II-oP-xbd" customClass="ThinScroller" customModule="Clocker" customModuleProvider="target">
<rect key="frame" x="-100" y="-100" width="340" height="11"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
<scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="f9b-8n-Bt1">
@ -518,11 +518,11 @@
<scrollView wantsLayer="YES" focusRingType="none" borderType="none" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasVerticalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5BT-DM-xru">
<rect key="frame" x="0.0" y="0.0" width="379" height="75"/>
<clipView key="contentView" drawsBackground="NO" id="QHw-sR-BYe">
<rect key="frame" x="0.0" y="0.0" width="379" height="60"/>
<rect key="frame" x="0.0" y="0.0" width="379" height="64"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<collectionView id="Tp2-pl-yIm">
<rect key="frame" x="0.0" y="0.0" width="379" height="60"/>
<rect key="frame" x="0.0" y="0.0" width="379" height="64"/>
<autoresizingMask key="autoresizingMask" heightSizable="YES"/>
<collectionViewFlowLayout key="collectionViewLayout" minimumInteritemSpacing="10" minimumLineSpacing="10" scrollDirection="horizontal" id="g4p-GT-v9Y">
<size key="itemSize" width="50" height="50"/>
@ -533,8 +533,8 @@
</subviews>
<color key="backgroundColor" name="Accent Color"/>
</clipView>
<scroller key="horizontalScroller" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="Akw-Iw-iVY" customClass="ThinScroller" customModule="Clocker" customModuleProvider="target">
<rect key="frame" x="0.0" y="60" width="379" height="15"/>
<scroller key="horizontalScroller" wantsLayer="YES" verticalHuggingPriority="750" controlSize="mini" horizontal="YES" id="Akw-Iw-iVY" customClass="ThinScroller" customModule="Clocker" customModuleProvider="target">
<rect key="frame" x="0.0" y="64" width="379" height="11"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
<scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="MXo-gV-Bdf">

4
Clocker/Panel/ParentPanelController+ModernSlider.swift

@ -30,6 +30,10 @@ extension ParentPanelController {
resetModernSliderButton.layer?.masksToBounds = true
resetModernSliderButton.layer?.cornerRadius = resetModernSliderButton.frame.width / 2
}
if let scrollView = modernSlider.superview?.superview as? NSScrollView {
scrollView.scrollerStyle = NSScroller.Style.overlay
}
goBackwardsButton.image = Themer.shared().goBackwardsImage()
goForwardButton.image = Themer.shared().goForwardsImage()

2
Clocker/Panel/Rate Controller/UpcomingEventView.swift

@ -34,7 +34,7 @@ class ThinScroller: NSScroller {
private var trackingArea: NSTrackingArea?
override class func scrollerWidth(for _: NSControl.ControlSize, scrollerStyle _: NSScroller.Style) -> CGFloat {
return 15
return 10
}
override func drawKnobSlot(in _: NSRect, highlight _: Bool) {

Loading…
Cancel
Save