Skip to content

Fix frame for compress keyboard translation type on X/XS/XS Max #168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix frame for compress keyboard translation type on X/XS/XS Max #168

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
acb687b
Fix frame for compress keyboard translation type on X/XS/XS Max
kkiermasz Feb 11, 2019
18f35f1
Update KeyboardTranslation.swift
kkiermasz Feb 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions Presentr/KeyboardTranslation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,19 @@ public enum KeyboardTranslationType {
return presentedFrame
case .compress:
if offset > 0.0 {
let y = max(presentedFrame.origin.y-offset, 20.0)
let newHeight = y != 20.0 ? presentedFrame.size.height : keyboardTop - 40.0
let frame = CGRect(x: presentedFrame.origin.x, y: y, width: presentedFrame.size.width, height: newHeight)
return frame
if #available(iOS 11.0, *) {
let topInsets = UIApplication.shared.keyWindow?.safeAreaInsets.top
var y = max(presentedFrame.origin.y-offset, 20.0)
let newHeight = y != 20.0 ? presentedFrame.size.height : keyboardTop - 40 - (topInsets ?? 0.0)
y += topInsets ?? 0.0
let frame = CGRect(x: presentedFrame.origin.x, y: y, width: presentedFrame.size.width, height: newHeight)
return frame
} else {
let y = max(presentedFrame.origin.y-offset, 20.0)
let newHeight = y != 20.0 ? presentedFrame.size.height : keyboardTop - 40
let frame = CGRect(x: presentedFrame.origin.x, y: y, width: presentedFrame.size.width, height: newHeight)
return frame
}
}
return presentedFrame
case .stickToTop:
Expand Down