Browse Source

Merge branch 'master' of https://github.com/n0shake/Clocker

pull/101/head
Abhishek 4 years ago
parent
commit
d37b25e459
  1. 2
      Clocker/Panel/ParentPanelController.swift
  2. 12
      Clocker/Panel/UI/HourMarkerViewItem.swift

2
Clocker/Panel/ParentPanelController.swift

@ -592,7 +592,7 @@ class ParentPanelController: NSWindowController {
if let futureSliderCell = futureSlider.cell as? CustomSliderCell, futureSliderCell.tracking == true {
return
}
if modernSlider.isHidden == false, modernContainerView.currentlyInFocus {
if modernContainerView != nil, modernSlider.isHidden == false, modernContainerView.currentlyInFocus {
return
}
let dataOperation = TimezoneDataOperations(with: model)

12
Clocker/Panel/UI/HourMarkerViewItem.swift

@ -18,18 +18,6 @@ class HourMarkerViewItem: NSCollectionViewItem {
verticalLineView.layer?.backgroundColor = NSColor.lightGray.cgColor
}
func setupLineColor() {
for subview in view.subviews where subview is NSBox {
subview.layer?.backgroundColor = NSColor.black.cgColor
}
}
func resetLineColor() {
for subview in view.subviews where subview is NSBox {
subview.layer?.backgroundColor = nil
}
}
override var acceptsFirstResponder: Bool {
return false
}

Loading…
Cancel
Save