exyte/Macaw
1
1
Fork 0
mirror of https://github.com/exyte/Macaw.git synced 2024-09-11 13:15:35 +03:00
Code Issues Projects Releases Wiki Activity

Fix event samples for iOS and macOS

Browse Source
This commit is contained in:
Yuri Strot 2018-06-27 22:00:50 +07:00
parent 30dc952ea8
commit 4378c84ac3
2 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Example-macOS/Example-macOS/Examples/Events/EventsExampleController.swift
View File

@ -23,6 +23,7 @@ class EventsExampleController: NSViewController {
}
var selectedTool: PanelTool?
let stroke = Stroke(fill: Color.black, width: 1.0)
private func loadScene() -> Node {
@ -30,7 +31,7 @@ class EventsExampleController: NSViewController {
}
private func createPanel() -> Node {
let panel = Shape(form: Rect(x: 10.0, y: 10.0, w: 80.0, h: 120.0), fill: Color.clear, stroke: Stroke(fill: Color.black, width: 1.0))
let panel = Shape(form: Rect(x: 10.0, y: 10.0, w: 80.0, h: 120.0), fill: Color.clear, stroke: stroke)
let panelGroup = [panel, createTools()].group()
panelGroup.onPan { event in
@ -62,11 +63,11 @@ class EventsExampleController: NSViewController {
startPoint = loc
switch tool {
case .ellipse:
currentFigure = Shape(form: Ellipse(cx: startPoint.x, cy: startPoint.y, rx: 0.0, ry: 0.0))
currentFigure = Shape(form: Ellipse(cx: startPoint.x, cy: startPoint.y, rx: 0.0, ry: 0.0), stroke: self.stroke)
break
case .rectangle:
currentFigure = Shape(form: Rect(x: startPoint.x, y: startPoint.y, w: 0.0, h: 0.0))
currentFigure = Shape(form: Rect(x: startPoint.x, y: startPoint.y, w: 0.0, h: 0.0), stroke: self.stroke)
break
}
@ -114,22 +115,22 @@ class EventsExampleController: NSViewController {
private func createTools() -> Node {
let ellipseTool = Shape(form: Ellipse(cx: 50.0, cy: 50.0, rx: 25, ry: 15),
fill: Color.clear,
stroke: Stroke(fill: Color.black, width: 1.0))
stroke: stroke)
let rectTool = Shape(form: Rect(x: 25.0, y: 75.0, w: 50.0, h: 30.0),
fill: Color.clear,
stroke: Stroke(fill: Color.black, width: 1.0))
stroke: stroke)
ellipseTool.onTap { _ in
self.selectedTool = .ellipse
ellipseTool.stroke = Stroke(fill: Color.blue, width: 2.0)
rectTool.stroke = Stroke(fill: Color.black, width: 1.0)
rectTool.stroke = self.stroke
}
rectTool.onTap { _ in
self.selectedTool = .rectangle
rectTool.stroke = Stroke(fill: Color.blue, width: 2.0)
ellipseTool.stroke = Stroke(fill: Color.black, width: 1.0)
ellipseTool.stroke = self.stroke
}
return [ellipseTool, rectTool].group()

19
Example/Example/Examples/Events/EventsExampleController.swift
View File

@ -26,6 +26,7 @@ class EventsExampleController: UIViewController {
}
var selectedTool: PanelTool?
let stroke = Stroke(fill: Color.black, width: 1.0)
private func loadScene() -> Node {
return [
@ -35,7 +36,7 @@ class EventsExampleController: UIViewController {
}
private func createPanel() -> Node {
let panel = Shape(form: Rect(x: 10.0, y: 10.0, w: 80.0, h: 120.0), fill: Color.white, stroke: Stroke(fill: Color.black, width: 1.0))
let panel = Shape(form: Rect(x: 10.0, y: 10.0, w: 80.0, h: 120.0), fill: Color.white, stroke: stroke)
let panelGroup = [
@ -69,16 +70,14 @@ class EventsExampleController: UIViewController {
return
}
print("canvas pressed:\(loc.x) \(loc.y)")
startPoint = loc
switch tool {
case .ellipse:
currentFigure = Shape(form: Ellipse(cx: startPoint.x, cy: startPoint.y, rx: 0.0, ry: 0.0))
currentFigure = Shape(form: Ellipse(cx: startPoint.x, cy: startPoint.y, rx: 0.0, ry: 0.0), stroke: self.stroke)
break
case .rectangle:
currentFigure = Shape(form: Rect(x: startPoint.x, y: startPoint.y, w: 0.0, h: 0.0))
currentFigure = Shape(form: Rect(x: startPoint.x, y: startPoint.y, w: 0.0, h: 0.0), stroke: self.stroke)
break
}
@ -98,8 +97,6 @@ class EventsExampleController: UIViewController {
return
}
print("canvas moving \(loc.x) \(loc.y)")
let width = loc.x - startPoint.x
let height = loc.y - startPoint.y
@ -129,21 +126,21 @@ class EventsExampleController: UIViewController {
private func createTools() -> Node {
let ellipseTool = Shape(form: Ellipse(cx: 50.0, cy: 50.0, rx: 25, ry: 15),
fill: Color.white,
stroke: Stroke(fill: Color.black, width: 1.0))
stroke: stroke)
let rectTool = Shape(form: Rect(x: 25.0, y: 75.0, w: 50.0, h: 30.0),
fill: Color.white,
stroke: Stroke(fill: Color.black, width: 1.0))
stroke: stroke)
ellipseTool.onTap { _ in
self.selectedTool = .ellipse
ellipseTool.stroke = Stroke(fill: Color.blue, width: 2.0)
rectTool.stroke = Stroke(fill: Color.black, width: 1.0)
rectTool.stroke = self.stroke
}
rectTool.onTap { _ in
self.selectedTool = .rectangle
rectTool.stroke = Stroke(fill: Color.blue, width: 2.0)
ellipseTool.stroke = Stroke(fill: Color.black, width: 1.0)
ellipseTool.stroke = self.stroke
}
return [