Changeset 259806 in webkit

Timestamp:

Apr 9, 2020, 10:54:54 AM (6 years ago)

Author:

Megan Gardner

Message:

[iOS] Date and time form controls are presented at the wrong size in some modes
​https://bugs.webkit.org/show_bug.cgi?id=210194
<rdar://problem/60385475>

Reviewed by Tim Horton.

Instead of relying on the default size for date/time controls, we should let the
UIDatePicker determine its own size given the configuration we're going to use.

• UIProcess/ios/forms/WKFormInputControl.mm:

(-[WKDateTimePicker initWithView:datePickerMode:]):
(-[WKDateTimePopover initWithView:datePickerMode:]):

• UIProcess/ios/forms/WKFormSelectPopover.mm:

(-[WKSelectPopover initWithView:hasGroups:]):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ios/forms/WKFormInputControl.mm (modified) (2 diffs)
• UIProcess/ios/forms/WKFormSelectPopover.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-04-09  Megan Gardner  <megan_gardner@apple.com>
+
+        [iOS] Date and time form controls are presented at the wrong size in some modes
+        https://bugs.webkit.org/show_bug.cgi?id=210194
+        <rdar://problem/60385475>
+
+        Reviewed by Tim Horton.
+
+        Instead of relying on the default size for date/time controls, we should let the
+        UIDatePicker determine its own size given the configuration we're going to use.
+
+        * UIProcess/ios/forms/WKFormInputControl.mm:
+        (-[WKDateTimePicker initWithView:datePickerMode:]):
+        (-[WKDateTimePopover initWithView:datePickerMode:]):
+        * UIProcess/ios/forms/WKFormSelectPopover.mm:
+        (-[WKSelectPopover initWithView:hasGroups:]):
+
 2020-04-08  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebKit/UIProcess/ios/forms/WKFormInputControl.mm

@@ -116 +116 @@
     default:
         break;
-   }
-
-    auto size = currentUserInterfaceIdiomIsPad() ? [UIPickerView defaultSizeForCurrentOrientation] : [UIKeyboard defaultSizeForInterfaceOrientation:view.interfaceOrientation];
-
-    _datePicker = adoptNS([[UIDatePicker alloc] initWithFrame:CGRectMake(0, 0, size.width, size.height)]);
+    }
+    
+    _datePicker = adoptNS([[UIDatePicker alloc] init]);
+
+    [_datePicker setDatePickerMode:mode];
+    [_datePicker setHidden:NO];
+    
 #if HAVE(UIDATEPICKER_STYLE)
     [_datePicker setPreferredDatePickerStyle:[self datePickerStyle]];
 #endif
-    _datePicker.get().datePickerMode = mode;
-    _datePicker.get().hidden = NO;
+    
+    auto size = [_datePicker sizeThatFits:CGSizeMake(view.frame.size.width, 0)];
+    [_datePicker setFrame:CGRectMake(0, 0, size.width, size.height)];
     
     if ([self shouldPresentGregorianCalendar:view.focusedElementInformation])
@@ -340 +343 @@
     _viewController = adoptNS([[WKDateTimePopoverViewController alloc] initWithView:view datePickerMode:mode]);
     UIDatePicker *datePicker = [(WKDateTimePicker *)_viewController.get().innerControl datePicker];
-    CGFloat popoverWidth = [datePicker _contentWidth];
-    CGFloat popoverHeight = _viewController.get().view.frame.size.height;
-    [_viewController setPreferredContentSize:CGSizeMake(popoverWidth, popoverHeight)];
+
+    if (view.focusedElementInformation.elementType == InputType::Month) {
+        CGFloat popoverWidth = [datePicker _contentWidth];
+        CGFloat popoverHeight = _viewController.get().view.frame.size.height;
+        [_viewController setPreferredContentSize:CGSizeMake(popoverWidth, popoverHeight)];
+    } else
+        [_viewController setPreferredContentSize:datePicker.frame.size];
+    
     [_viewController setEdgesForExtendedLayout:UIRectEdgeNone];
     [_viewController setTitle:_view.focusedElementInformation.title];

trunk/Source/WebKit/UIProcess/ios/forms/WKFormSelectPopover.mm

@@ -399 +399 @@
     if (!(self = [super initWithView:view]))
         return nil;
-    
-    CGRect frame;
-    frame.origin = CGPointZero;
-    frame.size = [UIKeyboard defaultSizeForInterfaceOrientation:view.interfaceOrientation];
 
     _tableViewController = adoptNS([[WKSelectTableViewController alloc] initWithView:view hasGroups:hasGroups]);