toxblh/MTMR
1
0
Fork 0
mirror of https://github.com/Toxblh/MTMR.git synced 2026-01-11 09:28:38 +00:00
Code Issues Releases Wiki Activity

parse align

Browse Source
This commit is contained in:
Serg 2018-04-14 00:23:19 +07:00
parent 9afa9d7470
commit 7b9f894bf3
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
MTMR/ItemsParsing.swift
View File

@ -42,7 +42,7 @@ struct BarItemDefinition: Decodable {
class SupportedTypesHolder { class SupportedTypesHolder {
typealias ParametersDecoder = (Decoder) throws ->(item: ItemType, action: ActionType, parameters: [GeneralParameter]) typealias ParametersDecoder = (Decoder) throws ->(item: ItemType, action: ActionType, parameters: [GeneralParameter])
private var supportedTypes: [String: ParametersDecoder] = [ private var supportedTypes: [String: ParametersDecoder] = [
"escape": { _ in return (item: .staticButton(title: "esc"), action: .keyPress(keycode: 53), parameters: []) }, "escape": { _ in return (item: .staticButton(title: "esc"), action: .keyPress(keycode: 53), parameters: [.align(.left)]) },
"brightnessUp": { _ in return (item: .staticButton(title: "🔆"), action: .keyPress(keycode: 113), parameters: []) }, "brightnessUp": { _ in return (item: .staticButton(title: "🔆"), action: .keyPress(keycode: 113), parameters: []) },
"brightnessDown": { _ in return (item: .staticButton(title: "🔅"), action: .keyPress(keycode: 107), parameters: []) }, "brightnessDown": { _ in return (item: .staticButton(title: "🔅"), action: .keyPress(keycode: 107), parameters: []) },
"volumeDown": { _ in "volumeDown": { _ in
@ -235,6 +235,7 @@ func ==(lhs: ActionType, rhs: ActionType) -> Bool {
enum GeneralParameter { enum GeneralParameter {
case width(_: CGFloat) case width(_: CGFloat)
case image(source: SourceProtocol) case image(source: SourceProtocol)
case align(_: Align)
} }
struct GeneralParameters: Decodable { struct GeneralParameters: Decodable {
@ -243,6 +244,7 @@ struct GeneralParameters: Decodable {
fileprivate enum CodingKeys: String, CodingKey { fileprivate enum CodingKeys: String, CodingKey {
case width case width
case image case image
case align
} }
init(from decoder: Decoder) throws { init(from decoder: Decoder) throws {
let container = try decoder.container(keyedBy: CodingKeys.self) let container = try decoder.container(keyedBy: CodingKeys.self)
@ -253,6 +255,8 @@ struct GeneralParameters: Decodable {
if let imageSource = try container.decodeIfPresent(Source.self, forKey: .image) { if let imageSource = try container.decodeIfPresent(Source.self, forKey: .image) {
result.append(.image(source: imageSource)) result.append(.image(source: imageSource))
} }
let align = try container.decodeIfPresent(Align.self, forKey: .align) ?? .center
result.append(.align(align))
parameters = result parameters = result
} }
} }
@ -323,3 +327,9 @@ extension Data {
return NSImage(data: self)?.resize(maxSize: NSSize(width: 24, height: 24)) return NSImage(data: self)?.resize(maxSize: NSSize(width: 24, height: 24))
} }
} }
enum Align: String, Decodable {
case left
case center
case right
}