playground
/
menu-clock-macos
mirror of https://github.com/n0shake/Clocker.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Minor change to scroller.

master
Abhishek Banthia 9 months ago
parent
4d42f4374e
commit
f5c661361f
3 changed files with 11 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  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
Unescape View File

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

4
Clocker/Panel/ParentPanelController+ModernSlider.swift
Unescape View File

@ -31,6 +31,10 @@ extension ParentPanelController {
resetModernSliderButton.layer?.cornerRadius = resetModernSliderButton.frame.width / 2 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() goBackwardsButton.image = Themer.shared().goBackwardsImage()
goForwardButton.image = Themer.shared().goForwardsImage() goForwardButton.image = Themer.shared().goForwardsImage()

2
Clocker/Panel/Rate Controller/UpcomingEventView.swift
Unescape View File

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

Write Preview
Loading…
Cancel
Save