Skip to content

Commit 622adea

Browse files
committed
Support date-only pickers in AppKitBackend
1 parent f635983 commit 622adea

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

Sources/AppKitBackend/AppKitBackend.swift

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1797,22 +1797,7 @@ public final class AppKitBackend: AppBackend {
17971797
parent.endSheet(sheet)
17981798
parent.nestedSheet = nil
17991799
}
1800-
}
1801-
1802-
public final class NSCustomSheet: NSCustomWindow, NSWindowDelegate {
1803-
public var onDismiss: (() -> Void)?
1804-
1805-
public var interactiveDismissDisabled: Bool = false
1806-
1807-
public var backgroundView: NSView?
1808-
1809-
@objc override public func cancelOperation(_ sender: Any?) {
1810-
if !interactiveDismissDisabled {
1811-
sheetParent?.endSheet(self)
1812-
onDismiss?()
1813-
}
1814-
}
1815-
1800+
18161801
public func createDatePicker() -> NSView {
18171802
let datePicker = CustomDatePicker()
18181803
datePicker.delegate = datePicker.strongDelegate
@@ -1865,7 +1850,7 @@ public final class NSCustomSheet: NSCustomWindow, NSWindowDelegate {
18651850
}
18661851
if components.contains(.hourMinuteAndSecond) {
18671852
elementFlags.insert(.hourMinuteSecond)
1868-
} else {
1853+
} else if components.contains(.hourAndMinute) {
18691854
elementFlags.insert(.hourMinute)
18701855
}
18711856

@@ -1888,6 +1873,21 @@ public final class NSCustomSheet: NSCustomWindow, NSWindowDelegate {
18881873
}
18891874
}
18901875

1876+
public final class NSCustomSheet: NSCustomWindow, NSWindowDelegate {
1877+
public var onDismiss: (() -> Void)?
1878+
1879+
public var interactiveDismissDisabled: Bool = false
1880+
1881+
public var backgroundView: NSView?
1882+
1883+
@objc override public func cancelOperation(_ sender: Any?) {
1884+
if !interactiveDismissDisabled {
1885+
sheetParent?.endSheet(self)
1886+
onDismiss?()
1887+
}
1888+
}
1889+
}
1890+
18911891
final class NSCustomTapGestureTarget: NSView {
18921892
var leftClickHandler: (() -> Void)? {
18931893
didSet {

0 commit comments

Comments
 (0)