joejulian/gio
1
0
Fork 1
mirror of https://git.sr.ht/~eliasnaur/gio synced 2026-07-06 01:45:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

ui/app: (iOS) use UIView's safeAreaInsets for window insets if available

Browse Source 
Unlike UIView's layoutMargins, safeAreaInsets only includes the space
actually taken up by system UI.

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2019-09-06 13:09:59 +02:00
parent 6ad154419b
commit b4433da21b
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/app/os_ios.m
+3 -1
View File
@@ -23,11 +23,12 @@ static void redraw(CFTypeRef viewRef, BOOL sync) {
// Use 163 as the standard ppi on iOS. // Use 163 as the standard ppi on iOS.
CGFloat dpi = 163*scale; CGFloat dpi = 163*scale;
CGFloat sdpi = dpi; CGFloat sdpi = dpi;
UIEdgeInsets insets = v.layoutMargins;
if (@available(iOS 11.0, tvOS 11.0, *)) { if (@available(iOS 11.0, tvOS 11.0, *)) {
UIFontMetrics *metrics = [UIFontMetrics defaultMetrics]; UIFontMetrics *metrics = [UIFontMetrics defaultMetrics];
sdpi = [metrics scaledValueForValue:sdpi]; sdpi = [metrics scaledValueForValue:sdpi];
insets = v.safeAreaInsets;
} }
UIEdgeInsets insets = v.layoutMargins;
onDraw(viewRef, dpi, sdpi, v.bounds.size.width*scale, v.bounds.size.height*scale, sync, onDraw(viewRef, dpi, sdpi, v.bounds.size.width*scale, v.bounds.size.height*scale, sync,
insets.top*scale, insets.right*scale, insets.bottom*scale, insets.left*scale); insets.top*scale, insets.right*scale, insets.bottom*scale, insets.left*scale);
} }
@@ -71,6 +72,7 @@ CGFloat _keyboardHeight;
- (void)loadView { - (void)loadView {
CGRect zeroFrame = CGRectMake(0, 0, 0, 0); CGRect zeroFrame = CGRectMake(0, 0, 0, 0);
self.view = [[UIView alloc] initWithFrame:zeroFrame]; self.view = [[UIView alloc] initWithFrame:zeroFrame];
self.view.layoutMargins = UIEdgeInsetsMake(0, 0, 0, 0);
UIView *drawView = [[GioView alloc] initWithFrame:zeroFrame]; UIView *drawView = [[GioView alloc] initWithFrame:zeroFrame];
[self.view addSubview: drawView]; [self.view addSubview: drawView];
#ifndef TARGET_OS_TV #ifndef TARGET_OS_TV