KCD
Fork

Commit

NSZeroRectなどを.zeroに変更した

--- a/KCD/ExternalBrowserWindowController.swift

+++ b/KCD/ExternalBrowserWindowController.swift

		@@ -48,12 +48,12 @@ class ExternalBrowserWindowController: NSWindowController {
48	48	}
49	49	var windowContentSize: NSSize {
50	50	get {
51		- guard let window = window else { return NSZeroSize }
	51	+ guard let window = window else { return .zero }
52	52	return window.contentRect(forFrameRect: window.frame).size
53	53	}
54	54	set {
55	55	guard let window = window else { return }
56		- var contentRect: NSRect = NSZeroRect
	56	+ var contentRect: NSRect = .zero
57	57	contentRect.size = newValue
58	58	var newFrame = window.frameRect(forContentRect: contentRect)
59	59	let frame = window.frame

--- a/KCD/GameViewController.swift

+++ b/KCD/GameViewController.swift

		@@ -104,7 +104,7 @@ class GameViewController: NSViewController {
104	104	guard let rep = webView.bitmapImageRepForCachingDisplay(in: f) else { return }
105	105	webView.cacheDisplay(in: frame, to: rep)
106	106	let appDelegate = NSApplication.shared().delegate as! AppDelegate
107		- appDelegate.screenshotListWindowController.registerScreenshot(rep, fromOnScreen: NSZeroRect)
	107	+ appDelegate.screenshotListWindowController.registerScreenshot(rep, fromOnScreen: .zero)
108	108	}
109	109
110	110	override func validateMenuItem(_ menuItem: NSMenuItem) -> Bool {

--- a/KCD/ImageView.swift

+++ b/KCD/ImageView.swift

		@@ -42,7 +42,7 @@ class ImageView: NSView {
42	42	.forEach {
43	43	let offsetRect = NSOffsetRect(rect, offset * CGFloat($0.offset), offset * CGFloat($0.offset))
44	44	let drawRect = imageRect(with: offsetRect, imageSize: $0.element.size)
45		- $0.element.draw(in: drawRect, from: NSZeroRect, operation: NSCompositeSourceOver, fraction: CGFloat(alpha))
	45	+ $0.element.draw(in: drawRect, from: .zero, operation: NSCompositeSourceOver, fraction: CGFloat(alpha))
46	46	alpha /= alphaFactor
47	47	}
48	48	}

--- a/KCD/ScreenshotEditorViewController.swift

+++ b/KCD/ScreenshotEditorViewController.swift

		@@ -158,7 +158,7 @@ class ScreenshotEditorViewController: BridgeViewController {
158	158	guard let originalImage = NSImage(contentsOf: $0.url) else { return nil }
159	159	let trimedImage = NSImage(size: self.currentTrimInfo.rect.size)
160	160	trimedImage.lockFocus()
161		- originalImage.draw(at: NSZeroPoint, from: self.currentTrimInfo.rect, operation: NSCompositeCopy, fraction: 1.0)
	161	+ originalImage.draw(at: .zero, from: self.currentTrimInfo.rect, operation: NSCompositeCopy, fraction: 1.0)
162	162	trimedImage.unlockFocus()
163	163
164	164	return trimedImage

--- a/KCD/ScreenshotListWindowController.swift

+++ b/KCD/ScreenshotListWindowController.swift

		@@ -69,7 +69,7 @@ class ScreenshotListWindowController: NSWindowController {
69	69
70	70	func replaceView(_ view: NSView, viewController: NSViewController) {
71	71	viewController.view.frame = view.frame
72		- viewController.view.setFrameOrigin(NSZeroPoint)
	72	+ viewController.view.setFrameOrigin(.zero)
73	73	viewController.view.autoresizingMask = view.autoresizingMask
74	74	view.addSubview(viewController.view)
75	75	}

--- a/KCD/ShipDetailViewController.swift

+++ b/KCD/ShipDetailViewController.swift

		@@ -53,13 +53,13 @@ class ShipDetailViewController: NSViewController {
53	53	override func viewDidLoad() {
54	54	super.viewDidLoad()
55	55
56		- damageView.setFrameOrigin(NSZeroPoint)
	56	+ damageView.setFrameOrigin(.zero)
57	57	view.addSubview(damageView)
58	58	damageView.bind("damageType", to: shipController, withKeyPath: "selection.status", options: nil)
59	59
60	60	supply.bind("shipStatus", to: shipController, withKeyPath: "selection.self", options: nil)
61	61
62		- guardEscapedView.setFrameOrigin(NSZeroPoint)
	62	+ guardEscapedView.setFrameOrigin(.zero)
63	63	view.addSubview(guardEscapedView)
64	64	switch type {
65	65	case .medium, .minimum: