Changeset 267131 in webkit

Timestamp:

Sep 15, 2020 8:10:30 PM (4 years ago)

Author:

Aditya Keerthi

Message:

[macOS] Date pickers should respect the document's color scheme
​https://bugs.webkit.org/show_bug.cgi?id=216514
<rdar://problem/68889548>

Reviewed by Tim Horton.

Source/WebCore:

Added the useDarkAppearance property to DateTimeChooserParameters, which
is based on Document::useDarkAppearance and the associated element's
computed style.

• html/HTMLInputElement.cpp:

(WebCore::HTMLInputElement::setupDateTimeChooserParameters):

• platform/DateTimeChooserParameters.h:

(WebCore::DateTimeChooserParameters::encode const):
(WebCore::DateTimeChooserParameters::decode):

Source/WebKit:

Use the appearance property of NSWindow to ensure the appearance of the
contained NSDatePicker matches the value encoded in DateTimeChooserParameters.

• UIProcess/mac/WebDateTimePickerMac.mm:

(-[WKDateTimePicker initWithParams:inView:]):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/HTMLInputElement.cpp (modified) (1 diff)
• WebCore/platform/DateTimeChooserParameters.h (modified) (3 diffs)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/UIProcess/mac/WebDateTimePickerMac.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-09-15  Aditya Keerthi  <akeerthi@apple.com>
+
+        [macOS] Date pickers should respect the document's color scheme
+        https://bugs.webkit.org/show_bug.cgi?id=216514
+        <rdar://problem/68889548>
+
+        Reviewed by Tim Horton.
+
+        Added the useDarkAppearance property to DateTimeChooserParameters, which
+        is based on Document::useDarkAppearance and the associated element's
+        computed style.
+
+        * html/HTMLInputElement.cpp:
+        (WebCore::HTMLInputElement::setupDateTimeChooserParameters):
+        * platform/DateTimeChooserParameters.h:
+        (WebCore::DateTimeChooserParameters::encode const):
+        (WebCore::DateTimeChooserParameters::decode):
+
 2020-09-15  Yusuke Suzuki  <ysuzuki@apple.com>
 

trunk/Source/WebCore/html/HTMLInputElement.cpp

@@ -2137 +2137 @@
         parameters.anchorRectInRootView = IntRect();
     parameters.currentValue = value();
-    parameters.isAnchorElementRTL = computedStyle()->direction() == TextDirection::RTL;
+
+    auto* computedStyle = this->computedStyle();
+    parameters.isAnchorElementRTL = computedStyle->direction() == TextDirection::RTL;
+    parameters.useDarkAppearance = document().useDarkAppearance(computedStyle);
 
 #if ENABLE(DATALIST_ELEMENT)

trunk/Source/WebCore/platform/DateTimeChooserParameters.h

@@ -50 +50 @@
     bool required;
     bool isAnchorElementRTL;
+    bool useDarkAppearance;
 
     template<class Encoder> void encode(Encoder&) const;
@@ -71 +72 @@
     encoder << required;
     encoder << isAnchorElementRTL;
+    encoder << useDarkAppearance;
 }
 
@@ -128 +130 @@
         return WTF::nullopt;
 
-    return {{ WTFMove(type), anchorRectInRootView, WTFMove(locale), WTFMove(currentValue), WTFMove(suggestionValues), WTFMove(localizedSuggestionValues), WTFMove(suggestionLabels), minimum, maximum, step, stepBase, required, isAnchorElementRTL }};
+    bool useDarkAppearance;
+    if (!decoder.decode(useDarkAppearance))
+        return WTF::nullopt;
+
+    return {{ WTFMove(type), anchorRectInRootView, WTFMove(locale), WTFMove(currentValue), WTFMove(suggestionValues), WTFMove(localizedSuggestionValues), WTFMove(suggestionLabels), minimum, maximum, step, stepBase, required, isAnchorElementRTL, useDarkAppearance }};
 }
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-09-15  Aditya Keerthi  <akeerthi@apple.com>
+
+        [macOS] Date pickers should respect the document's color scheme
+        https://bugs.webkit.org/show_bug.cgi?id=216514
+        <rdar://problem/68889548>
+
+        Reviewed by Tim Horton.
+
+        Use the appearance property of NSWindow to ensure the appearance of the
+        contained NSDatePicker matches the value encoded in DateTimeChooserParameters.
+
+        * UIProcess/mac/WebDateTimePickerMac.mm:
+        (-[WKDateTimePicker initWithParams:inView:]):
+
 2020-09-15  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/UIProcess/mac/WebDateTimePickerMac.mm

@@ -249 +249 @@
     [_datePicker setMinDate:[NSDate dateWithTimeIntervalSince1970:_params.minimum / 1000.0]];
     [_datePicker setMaxDate:[NSDate dateWithTimeIntervalSince1970:_params.maximum / 1000.0]];
+
+    [_enclosingWindow setAppearance:[NSAppearance appearanceNamed:_params.useDarkAppearance ? NSAppearanceNameDarkAqua : NSAppearanceNameAqua]];
 }