Skip to content

Commit

Permalink
fix: ipad canvas width
Browse files Browse the repository at this point in the history
  • Loading branch information
dgwight committed May 6, 2022
1 parent 718c6bd commit f27628b
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 13 deletions.
Binary file not shown.
2 changes: 1 addition & 1 deletion MorphuApp/ColorKeyboardView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ class ColorKeyboardView: UIView, UIGestureRecognizerDelegate {
backgroundColor = UIColor(patternImage: R.image.clearPattern()!)

let selectorWidth = frame.width/11
let buttonSize = selectorWidth * 1.25
let buttonSize = [(selectorWidth * 1.25), 80.0].min()!

let colorButtonWrapper = UIView()
colorButtonWrapper.frame = CGRect(x: 0, y: buttonSize, width: frame.width, height: frame.height - buttonSize)
Expand Down
2 changes: 1 addition & 1 deletion MorphuApp/DrawingViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ class DrawingViewController: UIViewController, UIGestureRecognizerDelegate, UIPo
let keyboardHeight = self.view.frame.height / 5.55833333333333
let canvasHeight = self.view.frame.height - keyboardHeight - 60

let canvasFrame = CGRect(x:(self.view.frame.width - canvasHeight/1.3)/2, y: 60, width: canvasHeight/1.3, height: canvasHeight)
let canvasFrame = CGRect(x: 0, y: 60, width: view.frame.width, height: canvasHeight)

let canvas = CanvasView(frame: canvasFrame)
canvas.delegate = self
Expand Down
29 changes: 18 additions & 11 deletions R.generated.swift
Original file line number Diff line number Diff line change
Expand Up @@ -176,17 +176,6 @@ struct R: Rswift.Validatable {
}
#endif

/// This `R.entitlements` struct is generated, and contains static references to 2 properties.
struct entitlements {
static let comAppleDeveloperUbiquityKvstoreIdentifier = infoPlistString(path: [], key: "com.apple.developer.ubiquity-kvstore-identifier") ?? "$(TeamIdentifierPrefix)$(CFBundleIdentifier)"

struct comAppleDeveloperIcloudContainerIdentifiers {
fileprivate init() {}
}

fileprivate init() {}
}

/// This `R.file` struct is generated, and contains static references to 3 files.
struct file {
/// Resource file `GoogleService-Info.plist`.
Expand Down Expand Up @@ -716,6 +705,24 @@ struct R: Rswift.Validatable {
fileprivate init() {}
}

/// This `R.info` struct is generated, and contains static references to 1 properties.
struct info {
struct uiApplicationShortcutItems {
struct newDrawing {
static let _key = "NewDrawing"
static let uiApplicationShortcutItemIconType = infoPlistString(path: ["UIApplicationShortcutItems", "NewDrawing"], key: "UIApplicationShortcutItemIconType") ?? "UIApplicationShortcutIconTypeCompose"
static let uiApplicationShortcutItemTitle = infoPlistString(path: ["UIApplicationShortcutItems", "NewDrawing"], key: "UIApplicationShortcutItemTitle") ?? "New Drawing"
static let uiApplicationShortcutItemType = infoPlistString(path: ["UIApplicationShortcutItems", "NewDrawing"], key: "UIApplicationShortcutItemType") ?? "NewDrawing"

fileprivate init() {}
}

fileprivate init() {}
}

fileprivate init() {}
}

/// This `R.reuseIdentifier` struct is generated, and contains static references to 1 reuse identifiers.
struct reuseIdentifier {
/// Reuse identifier `drawingCell`.
Expand Down

0 comments on commit f27628b

Please sign in to comment.