|
|
|
@ -425,8 +425,7 @@ class ParentPanelController: NSWindowController {
|
|
|
|
|
newHeight = userFontSize == 4 ? 68.0 : 68.0 |
|
|
|
|
if let note = object?.note, note.isEmpty == false { |
|
|
|
|
newHeight += 20 |
|
|
|
|
} else if DataStore.shared().shouldDisplay(.dstTransitionInfo), |
|
|
|
|
let obj = object, |
|
|
|
|
} else if let obj = object, |
|
|
|
|
TimezoneDataOperations(with: obj).nextDaylightSavingsTransitionIfAvailable(with: futureSliderValue) != nil |
|
|
|
|
{ |
|
|
|
|
newHeight += 20 |
|
|
|
@ -437,7 +436,7 @@ class ParentPanelController: NSWindowController {
|
|
|
|
|
// Set it to 90 expicity in case the row height is calculated be higher. |
|
|
|
|
newHeight = 88.0 |
|
|
|
|
|
|
|
|
|
if let note = object?.note, note.isEmpty, DataStore.shared().shouldDisplay(.dstTransitionInfo) == false, let obj = object, TimezoneDataOperations(with: obj).nextDaylightSavingsTransitionIfAvailable(with: futureSliderValue) == nil { |
|
|
|
|
if let note = object?.note, note.isEmpty, let obj = object, TimezoneDataOperations(with: obj).nextDaylightSavingsTransitionIfAvailable(with: futureSliderValue) == nil { |
|
|
|
|
newHeight -= 20.0 |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
@ -636,9 +635,7 @@ class ParentPanelController: NSWindowController {
|
|
|
|
|
} |
|
|
|
|
if let note = model.note, !note.isEmpty { |
|
|
|
|
cellView.noteLabel.stringValue = note |
|
|
|
|
} else if DataStore.shared().shouldDisplay(.dstTransitionInfo), |
|
|
|
|
let value = TimezoneDataOperations(with: model).nextDaylightSavingsTransitionIfAvailable(with: futureSliderValue) |
|
|
|
|
{ |
|
|
|
|
} else if let value = TimezoneDataOperations(with: model).nextDaylightSavingsTransitionIfAvailable(with: futureSliderValue) { |
|
|
|
|
cellView.noteLabel.stringValue = value |
|
|
|
|
} else { |
|
|
|
|
cellView.noteLabel.stringValue = CLEmptyString |
|
|
|
|