ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-07-31 07:30:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify slide-over keyboard handling

Browse Source
This commit is contained in:
Peter 2019-10-19 16:18:13 +04:00
parent 2cfe56b204
commit 2efd77a27e
1 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
submodules/Display/Display/WindowContent.swift
View File

@ -485,6 +485,7 @@ public class Window1 {
let screenHeight: CGFloat let screenHeight: CGFloat
var inPopover = false var inPopover = false
if keyboardFrame.width.isEqual(to: UIScreen.main.bounds.width) { if keyboardFrame.width.isEqual(to: UIScreen.main.bounds.width) {
let screenSize = UIScreen.main.bounds.size
var portraitScreenSize = UIScreen.main.bounds.size var portraitScreenSize = UIScreen.main.bounds.size
if portraitScreenSize.width > portraitScreenSize.height { if portraitScreenSize.width > portraitScreenSize.height {
portraitScreenSize = CGSize(width: portraitScreenSize.height, height: portraitScreenSize.width) portraitScreenSize = CGSize(width: portraitScreenSize.height, height: portraitScreenSize.width)
@ -493,23 +494,35 @@ public class Window1 {
if portraitLayoutSize.width > portraitLayoutSize.height { if portraitLayoutSize.width > portraitLayoutSize.height {
portraitLayoutSize = CGSize(width: portraitLayoutSize.height, height: portraitLayoutSize.width) portraitLayoutSize = CGSize(width: portraitLayoutSize.height, height: portraitLayoutSize.width)
} }
if abs(strongSelf.windowLayout.size.height - UIScreen.main.bounds.height) > 41.0 {
if abs(portraitLayoutSize.height - portraitScreenSize.height) > 41.0 || abs(portraitLayoutSize.width - portraitScreenSize.width) > 41.0 { if strongSelf.windowLayout.size.height != screenSize.height {
popoverDelta = 48.0 let heightDelta = screenSize.height - strongSelf.windowLayout.size.height
let heightDeltaValid = heightDelta > 0.0 && heightDelta < 100.0
if heightDeltaValid {
inPopover = true inPopover = true
popoverDelta = heightDelta / 2.0
}
}
if #available(iOSApplicationExtension 13.0, iOS 13.0, *) {
screenHeight = UIScreen.main.bounds.height
} else {
screenHeight = strongSelf.windowLayout.size.height
}
/*if abs(strongSelf.windowLayout.size.height - UIScreen.main.bounds.height) > 41.0 {
if abs(portraitLayoutSize.height - portraitScreenSize.height) > 41.0 || abs(portraitLayoutSize.width - portraitScreenSize.width) > 41.0 {
screenHeight = strongSelf.windowLayout.size.height screenHeight = strongSelf.windowLayout.size.height
} else { } else {
screenHeight = UIScreen.main.bounds.height screenHeight = UIScreen.main.bounds.height
} }
} else if abs(strongSelf.windowLayout.size.height - UIScreen.main.bounds.height) > 39.0 { } else if abs(strongSelf.windowLayout.size.height - UIScreen.main.bounds.height) > 39.0 {
screenHeight = UIScreen.main.bounds.height screenHeight = UIScreen.main.bounds.height
if abs(portraitLayoutSize.height - portraitScreenSize.height) > 39.0 || abs(portraitLayoutSize.width - portraitScreenSize.width) > 39.0 {
popoverDelta = 40.0
inPopover = true
}
} else { } else {
screenHeight = strongSelf.windowLayout.size.height screenHeight = strongSelf.windowLayout.size.height
} }*/
} else { } else {
screenHeight = UIScreen.main.bounds.width screenHeight = UIScreen.main.bounds.width
} }
@ -519,11 +532,9 @@ public class Window1 {
keyboardHeight = 0.0 keyboardHeight = 0.0
} else { } else {
keyboardHeight = max(0.0, screenHeight - keyboardFrame.minY) keyboardHeight = max(0.0, screenHeight - keyboardFrame.minY)
if inPopover { if inPopover && !keyboardHeight.isZero {
if strongSelf.windowLayout.onScreenNavigationHeight != nil { if #available(iOSApplicationExtension 13.0, iOS 13.0, *) {
if !keyboardHeight.isZero { keyboardHeight = max(0.0, keyboardHeight - popoverDelta)
keyboardHeight = max(0.0, keyboardHeight + popoverDelta / 2.0)
}
} else { } else {
keyboardHeight = max(0.0, keyboardHeight - popoverDelta) keyboardHeight = max(0.0, keyboardHeight - popoverDelta)
} }